Split up HLoadNamedField and HStoreNamedField.

src/ia32/lithium-ia32.cc

Index: src/ia32/lithium-ia32.cc
diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc
index aca9bdf9f7ce8290c536a60c10424235b2e1adce..f45395c2edaa3ef8c54cd6ecfc0c51796cf01a12 100644
--- a/src/ia32/lithium-ia32.cc
+++ b/src/ia32/lithium-ia32.cc
@@ -2416,27 +2416,19 @@ LInstruction* LChunkBuilder::DoTrapAllocationMemento(
 
 
 LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) {
-  bool is_in_object = instr->access().IsInobject();
   bool is_external_location = instr->access().IsExternalMemory() &&
       instr->access().offset() == 0;
   bool needs_write_barrier = instr->NeedsWriteBarrier();
-  bool needs_write_barrier_for_map = instr->has_transition() &&
-      instr->NeedsWriteBarrierForMap();
 
   LOperand* obj;
   if (needs_write_barrier) {
-    obj = is_in_object
-        ? UseRegister(instr->object())
-        : UseTempRegister(instr->object());
+    obj = UseRegister(instr->object());
   } else if (is_external_location) {
-    ASSERT(!is_in_object);
+    ASSERT(!instr->access().IsInobject());
     ASSERT(!needs_write_barrier);
-    ASSERT(!needs_write_barrier_for_map);
     obj = UseRegisterOrConstant(instr->object());
   } else {
-    obj = needs_write_barrier_for_map
-        ? UseRegister(instr->object())
-        : UseRegisterAtStart(instr->object());
+    obj = UseRegisterAtStart(instr->object());
   }
 
   bool can_be_constant = instr->value()->IsConstant() &&
@@ -2464,14 +2456,10 @@ LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) {
 
   // We only need a scratch register if we have a write barrier or we
   // have a store into the properties array (not in-object-property).
-  LOperand* temp = (!is_in_object || needs_write_barrier ||
-                    needs_write_barrier_for_map) ? TempRegister() : NULL;
-
-  // We need a temporary register for write barrier of the map field.
-  LOperand* temp_map = needs_write_barrier_for_map ? TempRegister() : NULL;
+  LOperand* temp = needs_write_barrier ? TempRegister() : NULL;
 
   LStoreNamedField* result =
-      new(zone()) LStoreNamedField(obj, val, temp, temp_map);
+      new(zone()) LStoreNamedField(obj, val, temp);
   if (FLAG_track_heap_object_fields &&
       instr->field_representation().IsHeapObject()) {
     if (!instr->value()->type().IsHeapObject()) {