Index: src/mips/lithium-codegen-mips.cc |
diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc |
index f8d743eeb2796cd06670f9dc1ea80bb28068cb08..62ce03707ffd5ad29d2fa5288007a9cce1fa35a7 100644 |
--- a/src/mips/lithium-codegen-mips.cc |
+++ b/src/mips/lithium-codegen-mips.cc |
@@ -2439,10 +2439,10 @@ void LCodeGen::DoInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr) { |
// We use Factory::the_hole_value() on purpose instead of loading from the |
// root array to force relocation to be able to later patch with |
// the cached map. |
- Handle<JSGlobalPropertyCell> cell = |
- factory()->NewJSGlobalPropertyCell(factory()->the_hole_value()); |
+ Handle<PropertyCell> cell = |
+ factory()->NewPropertyCell(factory()->the_hole_value()); |
__ li(at, Operand(Handle<Object>(cell))); |
- __ lw(at, FieldMemOperand(at, JSGlobalPropertyCell::kValueOffset)); |
+ __ lw(at, FieldMemOperand(at, PropertyCell::kValueOffset)); |
__ Branch(&cache_miss, ne, map, Operand(at)); |
// We use Factory::the_hole_value() on purpose instead of loading from the |
// root array to force relocation to be able to later patch |
@@ -2596,7 +2596,7 @@ void LCodeGen::DoReturn(LReturn* instr) { |
void LCodeGen::DoLoadGlobalCell(LLoadGlobalCell* instr) { |
Register result = ToRegister(instr->result()); |
__ li(at, Operand(Handle<Object>(instr->hydrogen()->cell()))); |
- __ lw(result, FieldMemOperand(at, JSGlobalPropertyCell::kValueOffset)); |
+ __ lw(result, FieldMemOperand(at, PropertyCell::kValueOffset)); |
if (instr->hydrogen()->RequiresHoleCheck()) { |
__ LoadRoot(at, Heap::kTheHoleValueRootIndex); |
DeoptimizeIf(eq, instr->environment(), result, Operand(at)); |
@@ -2630,13 +2630,13 @@ void LCodeGen::DoStoreGlobalCell(LStoreGlobalCell* instr) { |
if (instr->hydrogen()->RequiresHoleCheck()) { |
// We use a temp to check the payload. |
Register payload = ToRegister(instr->temp()); |
- __ lw(payload, FieldMemOperand(cell, JSGlobalPropertyCell::kValueOffset)); |
+ __ lw(payload, FieldMemOperand(cell, PropertyCell::kValueOffset)); |
__ LoadRoot(at, Heap::kTheHoleValueRootIndex); |
DeoptimizeIf(eq, instr->environment(), payload, Operand(at)); |
} |
// Store the value. |
- __ sw(value, FieldMemOperand(cell, JSGlobalPropertyCell::kValueOffset)); |
+ __ sw(value, FieldMemOperand(cell, PropertyCell::kValueOffset)); |
// Cells are always rescanned, so no write barrier here. |
} |
@@ -5001,10 +5001,9 @@ void LCodeGen::DoCheckFunction(LCheckFunction* instr) { |
AllowDeferredHandleDereference smi_check; |
if (isolate()->heap()->InNewSpace(*target)) { |
Register reg = ToRegister(instr->value()); |
- Handle<JSGlobalPropertyCell> cell = |
- isolate()->factory()->NewJSGlobalPropertyCell(target); |
+ Handle<PropertyCell> cell = isolate()->factory()->NewPropertyCell(target); |
__ li(at, Operand(Handle<Object>(cell))); |
- __ lw(at, FieldMemOperand(at, JSGlobalPropertyCell::kValueOffset)); |
+ __ lw(at, FieldMemOperand(at, PropertyCell::kValueOffset)); |
DeoptimizeIf(ne, instr->environment(), reg, |
Operand(at)); |
} else { |