| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index ea3fa00889a7752f6db34c02d25fcd63609ff7d7..50ff06c2f891e104af9f353011f57158eb5050e0 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -3042,12 +3042,7 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) {
|
|
|
| if (access.IsExternalMemory()) {
|
| Register result = ToRegister(instr->result());
|
| - MemOperand operand = MemOperand(object, offset);
|
| - if (access.representation().IsByte()) {
|
| - __ ldrb(result, operand);
|
| - } else {
|
| - __ ldr(result, operand);
|
| - }
|
| + __ ldr(result, MemOperand(object, offset));
|
| return;
|
| }
|
|
|
| @@ -3058,15 +3053,11 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) {
|
| }
|
|
|
| Register result = ToRegister(instr->result());
|
| - if (!access.IsInobject()) {
|
| - __ ldr(result, FieldMemOperand(object, JSObject::kPropertiesOffset));
|
| - object = result;
|
| - }
|
| - MemOperand operand = FieldMemOperand(object, offset);
|
| - if (access.representation().IsByte()) {
|
| - __ ldrb(result, operand);
|
| + if (access.IsInobject()) {
|
| + __ ldr(result, FieldMemOperand(object, offset));
|
| } else {
|
| - __ ldr(result, operand);
|
| + __ ldr(result, FieldMemOperand(object, JSObject::kPropertiesOffset));
|
| + __ ldr(result, FieldMemOperand(result, offset));
|
| }
|
| }
|
|
|
| @@ -4172,12 +4163,7 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
|
|
|
| if (access.IsExternalMemory()) {
|
| Register value = ToRegister(instr->value());
|
| - MemOperand operand = MemOperand(object, offset);
|
| - if (representation.IsByte()) {
|
| - __ strb(value, operand);
|
| - } else {
|
| - __ str(value, operand);
|
| - }
|
| + __ str(value, MemOperand(object, offset));
|
| return;
|
| }
|
|
|
| @@ -4222,12 +4208,7 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
|
| instr->hydrogen()->value()->IsHeapObject()
|
| ? OMIT_SMI_CHECK : INLINE_SMI_CHECK;
|
| if (access.IsInobject()) {
|
| - MemOperand operand = FieldMemOperand(object, offset);
|
| - if (representation.IsByte()) {
|
| - __ strb(value, operand);
|
| - } else {
|
| - __ str(value, operand);
|
| - }
|
| + __ str(value, FieldMemOperand(object, offset));
|
| if (instr->hydrogen()->NeedsWriteBarrier()) {
|
| // Update the write barrier for the object for in-object properties.
|
| __ RecordWriteField(object,
|
| @@ -4241,12 +4222,7 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
|
| }
|
| } else {
|
| __ ldr(scratch, FieldMemOperand(object, JSObject::kPropertiesOffset));
|
| - MemOperand operand = FieldMemOperand(scratch, offset);
|
| - if (representation.IsByte()) {
|
| - __ strb(value, operand);
|
| - } else {
|
| - __ str(value, operand);
|
| - }
|
| + __ str(value, FieldMemOperand(scratch, offset));
|
| if (instr->hydrogen()->NeedsWriteBarrier()) {
|
| // Update the write barrier for the properties array.
|
| // object is used as a scratch register.
|
|
|