| Index: src/mips/lithium-codegen-mips.cc
|
| diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc
|
| index fd7af9f0f50a9f2f69a24097e875f7015ccf780a..937245e557e485f096da49ff503dc16645900ab5 100644
|
| --- a/src/mips/lithium-codegen-mips.cc
|
| +++ b/src/mips/lithium-codegen-mips.cc
|
| @@ -4637,32 +4637,32 @@ void LCodeGen::DoCheckFunction(LCheckFunction* instr) {
|
| }
|
|
|
|
|
| -void LCodeGen::DoCheckMapCommon(Register reg,
|
| - Register scratch,
|
| +void LCodeGen::DoCheckMapCommon(Register map_reg,
|
| Handle<Map> map,
|
| CompareMapMode mode,
|
| LEnvironment* env) {
|
| Label success;
|
| - __ CompareMapAndBranch(reg, scratch, map, &success, eq, &success, mode);
|
| + __ CompareMapAndBranch(map_reg, map, &success, eq, &success, mode);
|
| DeoptimizeIf(al, env);
|
| __ bind(&success);
|
| }
|
|
|
|
|
| void LCodeGen::DoCheckMaps(LCheckMaps* instr) {
|
| - Register scratch = scratch0();
|
| + Register map_reg = scratch0();
|
| LOperand* input = instr->value();
|
| ASSERT(input->IsRegister());
|
| Register reg = ToRegister(input);
|
| Label success;
|
| SmallMapList* map_set = instr->hydrogen()->map_set();
|
| + __ lw(map_reg, FieldMemOperand(reg, HeapObject::kMapOffset));
|
| for (int i = 0; i < map_set->length() - 1; i++) {
|
| Handle<Map> map = map_set->at(i);
|
| __ CompareMapAndBranch(
|
| - reg, scratch, map, &success, eq, &success, REQUIRE_EXACT_MAP);
|
| + map_reg, map, &success, eq, &success, REQUIRE_EXACT_MAP);
|
| }
|
| Handle<Map> map = map_set->last();
|
| - DoCheckMapCommon(reg, scratch, map, REQUIRE_EXACT_MAP, instr->environment());
|
| + DoCheckMapCommon(map_reg, map, REQUIRE_EXACT_MAP, instr->environment());
|
| __ bind(&success);
|
| }
|
|
|
| @@ -4719,28 +4719,30 @@ void LCodeGen::DoClampTToUint8(LClampTToUint8* instr) {
|
|
|
| void LCodeGen::DoCheckPrototypeMaps(LCheckPrototypeMaps* instr) {
|
| ASSERT(instr->temp()->Equals(instr->result()));
|
| - Register temp1 = ToRegister(instr->temp());
|
| - Register temp2 = ToRegister(instr->temp2());
|
| + Register prototype_reg = ToRegister(instr->temp());
|
| + Register map_reg = ToRegister(instr->temp2());
|
|
|
| Handle<JSObject> holder = instr->holder();
|
| Handle<JSObject> current_prototype = instr->prototype();
|
|
|
| // Load prototype object.
|
| - __ LoadHeapObject(temp1, current_prototype);
|
| + __ LoadHeapObject(prototype_reg, current_prototype);
|
|
|
| // Check prototype maps up to the holder.
|
| while (!current_prototype.is_identical_to(holder)) {
|
| - DoCheckMapCommon(temp1, temp2,
|
| + __ lw(map_reg, FieldMemOperand(prototype_reg, HeapObject::kMapOffset));
|
| + DoCheckMapCommon(map_reg,
|
| Handle<Map>(current_prototype->map()),
|
| ALLOW_ELEMENT_TRANSITION_MAPS, instr->environment());
|
| current_prototype =
|
| Handle<JSObject>(JSObject::cast(current_prototype->GetPrototype()));
|
| // Load next prototype object.
|
| - __ LoadHeapObject(temp1, current_prototype);
|
| + __ LoadHeapObject(prototype_reg, current_prototype);
|
| }
|
|
|
| // Check the holder map.
|
| - DoCheckMapCommon(temp1, temp2,
|
| + __ lw(map_reg, FieldMemOperand(prototype_reg, HeapObject::kMapOffset));
|
| + DoCheckMapCommon(map_reg,
|
| Handle<Map>(current_prototype->map()),
|
| ALLOW_ELEMENT_TRANSITION_MAPS, instr->environment());
|
| }
|
|
|