| Index: src/mips/lithium-codegen-mips.cc
|
| diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc
|
| index 1cdea12adef1f70e6a292c5e6f8e3a1d7277f8b7..db216ddbeeac0db1c821ed3b534a580109b3d05e 100644
|
| --- a/src/mips/lithium-codegen-mips.cc
|
| +++ b/src/mips/lithium-codegen-mips.cc
|
| @@ -2710,7 +2710,8 @@ void LCodeGen::DoStoreContextSlot(LStoreContextSlot* instr) {
|
|
|
|
|
| void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) {
|
| - int offset = instr->hydrogen()->offset();
|
| + HObjectAccess access = instr->hydrogen()->access();
|
| + int offset = access.offset();
|
| Register object = ToRegister(instr->object());
|
| if (instr->hydrogen()->representation().IsDouble()) {
|
| DoubleRegister result = ToDoubleRegister(instr->result());
|
| @@ -2719,7 +2720,7 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) {
|
| }
|
|
|
| Register result = ToRegister(instr->result());
|
| - if (instr->hydrogen()->is_in_object()) {
|
| + if (access.IsInobject()) {
|
| __ lw(result, FieldMemOperand(object, offset));
|
| } else {
|
| __ lw(result, FieldMemOperand(object, JSObject::kPropertiesOffset));
|
| @@ -3921,7 +3922,8 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
|
|
|
| Register object = ToRegister(instr->object());
|
| Register scratch = scratch0();
|
| - int offset = instr->offset();
|
| + HObjectAccess access = instr->hydrogen()->access();
|
| + int offset = access.offset();
|
|
|
| Handle<Map> transition = instr->transition();
|
|
|
| @@ -3933,7 +3935,7 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
|
| }
|
| } else if (FLAG_track_double_fields && representation.IsDouble()) {
|
| ASSERT(transition.is_null());
|
| - ASSERT(instr->is_in_object());
|
| + ASSERT(access.IsInobject());
|
| ASSERT(!instr->hydrogen()->NeedsWriteBarrier());
|
| DoubleRegister value = ToDoubleRegister(instr->value());
|
| __ sdc1(value, FieldMemOperand(object, offset));
|
| @@ -3966,7 +3968,7 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
|
| HType type = instr->hydrogen()->value()->type();
|
| SmiCheck check_needed =
|
| type.IsHeapObject() ? OMIT_SMI_CHECK : INLINE_SMI_CHECK;
|
| - if (instr->is_in_object()) {
|
| + if (access.IsInobject()) {
|
| __ sw(value, FieldMemOperand(object, offset));
|
| if (instr->hydrogen()->NeedsWriteBarrier()) {
|
| // Update the write barrier for the object for in-object properties.
|
|
|