| Index: src/ia32/lithium-codegen-ia32.cc
|
| diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc
|
| index bba3acaa9a55ac059287d801acc552a7f6f70d69..8b295bd71bc44c3c7f78d3905becbe679bb33e06 100644
|
| --- a/src/ia32/lithium-codegen-ia32.cc
|
| +++ b/src/ia32/lithium-codegen-ia32.cc
|
| @@ -3292,10 +3292,6 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) {
|
| }
|
|
|
| Register result = ToRegister(instr->result());
|
| - if (!access.IsInobject()) {
|
| - __ mov(result, FieldOperand(object, JSObject::kPropertiesOffset));
|
| - object = result;
|
| - }
|
| __ Load(result, FieldOperand(object, offset), access.representation());
|
| }
|
|
|
| @@ -4394,7 +4390,6 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
|
| }
|
|
|
| Register object = ToRegister(instr->object());
|
| - Handle<Map> transition = instr->transition();
|
|
|
| if (FLAG_track_fields && representation.IsSmi()) {
|
| if (instr->value()->IsConstantOperand()) {
|
| @@ -4417,7 +4412,6 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
|
| }
|
| }
|
| } else if (FLAG_track_double_fields && representation.IsDouble()) {
|
| - ASSERT(transition.is_null());
|
| ASSERT(access.IsInobject());
|
| ASSERT(!instr->hydrogen()->NeedsWriteBarrier());
|
| if (CpuFeatures::IsSupported(SSE2)) {
|
| @@ -4431,37 +4425,12 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
|
| return;
|
| }
|
|
|
| - if (!transition.is_null()) {
|
| - if (!instr->hydrogen()->NeedsWriteBarrierForMap()) {
|
| - __ mov(FieldOperand(object, HeapObject::kMapOffset), transition);
|
| - } else {
|
| - Register temp = ToRegister(instr->temp());
|
| - Register temp_map = ToRegister(instr->temp_map());
|
| - __ mov(temp_map, transition);
|
| - __ mov(FieldOperand(object, HeapObject::kMapOffset), temp_map);
|
| - // Update the write barrier for the map field.
|
| - __ RecordWriteField(object,
|
| - HeapObject::kMapOffset,
|
| - temp_map,
|
| - temp,
|
| - GetSaveFPRegsMode(),
|
| - OMIT_REMEMBERED_SET,
|
| - OMIT_SMI_CHECK);
|
| - }
|
| - }
|
| -
|
| // Do the store.
|
| SmiCheck check_needed =
|
| instr->hydrogen()->value()->IsHeapObject()
|
| ? OMIT_SMI_CHECK : INLINE_SMI_CHECK;
|
|
|
| - Register write_register = object;
|
| - if (!access.IsInobject()) {
|
| - write_register = ToRegister(instr->temp());
|
| - __ mov(write_register, FieldOperand(object, JSObject::kPropertiesOffset));
|
| - }
|
| -
|
| - MemOperand operand = FieldOperand(write_register, offset);
|
| + MemOperand operand = FieldOperand(object, offset);
|
| if (instr->value()->IsConstantOperand()) {
|
| LConstantOperand* operand_value = LConstantOperand::cast(instr->value());
|
| if (operand_value->IsRegister()) {
|
| @@ -4483,9 +4452,9 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
|
|
|
| if (instr->hydrogen()->NeedsWriteBarrier()) {
|
| Register value = ToRegister(instr->value());
|
| - Register temp = access.IsInobject() ? ToRegister(instr->temp()) : object;
|
| + Register temp = ToRegister(instr->temp());
|
| // Update the write barrier for the object for in-object properties.
|
| - __ RecordWriteField(write_register,
|
| + __ RecordWriteField(object,
|
| offset,
|
| value,
|
| temp,
|
|
|