Split up HLoadNamedField and HStoreNamedField.

src/hydrogen-instructions.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1524 matching lines @@
     case IS_INTERNALIZED_STRING:
       *mask = kIsNotStringMask | kIsNotInternalizedMask;
       *tag = kInternalizedTag;
       return;
     default:
       UNREACHABLE();
   }
 }
 
 
+static bool IsMapAccess(HObjectAccess access) {
+  return access.IsInobject() && access.offset() == JSObject::kMapOffset;
+}
+
+
 void HCheckMaps::HandleSideEffectDominator(GVNFlag side_effect,
                                            HValue* dominator) {
   ASSERT(side_effect == kChangesMaps);
   // TODO(mstarzinger): For now we specialize on HStoreNamedField, but once
   // type information is rich enough we should generalize this to any HType
   // for which the map is known.
   if (HasNoUses() && dominator->IsStoreNamedField()) {
     HStoreNamedField* store = HStoreNamedField::cast(dominator);
-    if (!store->has_transition() || store->object() != value()) return;
-    HConstant* transition = HConstant::cast(store->transition());
+    if (!IsMapAccess(store->access()) ||
+        store->object() != value() ||
+        !store->value()->IsConstant()) {
+      return;
+    }
+    HConstant* transition = HConstant::cast(store->value());
     if (map_set_.Contains(transition->GetUnique())) {
       DeleteAndReplaceWith(NULL);
       return;
     }
   }
 }
 
 
 void HCheckMaps::PrintDataTo(StringStream* stream) {
   value()->PrintNameTo(stream);
@@ skipping 1686 matching lines @@
 
 
 void HStoreNamedField::PrintDataTo(StringStream* stream) {
   object()->PrintNameTo(stream);
   access_.PrintTo(stream);
   stream->Add(" = ");
   value()->PrintNameTo(stream);
   if (NeedsWriteBarrier()) {
     stream->Add(" (write-barrier)");
   }
-  if (has_transition()) {
-    stream->Add(" (transition map %p)", *transition_map());
-  }
 }
 
 
 void HStoreKeyed::PrintDataTo(StringStream* stream) {
   if (!is_external()) {
     elements()->PrintNameTo(stream);
   } else {
     elements()->PrintNameTo(stream);
     stream->Add(".");
     stream->Add(ElementsKindToString(elements_kind()));
@@ skipping 1019 matching lines @@
     portion = kElementsPointer;
   } else if (offset == JSArray::kLengthOffset) {
     portion = kArrayLengths;
   } else if (offset == JSObject::kMapOffset) {
     portion = kMaps;
   }
   return HObjectAccess(portion, offset);
 }
 
 
+HObjectAccess HObjectAccess::ForBackingStore() {
+  return HObjectAccess(kBackingStorePointer, JSObject::kPropertiesOffset);
+}
+
+
 HObjectAccess HObjectAccess::ForBackingStoreOffset(int offset,
     Representation representation) {
   ASSERT(offset >= 0);
   return HObjectAccess(kBackingStore, offset, representation);
 }
 
 
 HObjectAccess HObjectAccess::ForField(Handle<Map> map,
     LookupResult *lookup, Handle<String> name) {
   ASSERT(lookup->IsField() || lookup->IsTransitionToField(*map));
@@ skipping 57 matching lines @@
           ? kChangesInobjectFields : kDependsOnInobjectFields);
       break;
     case kDouble:
       instr->SetGVNFlag(is_store
           ? kChangesDoubleFields : kDependsOnDoubleFields);
       break;
     case kBackingStore:
       instr->SetGVNFlag(is_store
           ? kChangesBackingStoreFields : kDependsOnBackingStoreFields);
       break;
+    case kBackingStorePointer:
+      instr->SetGVNFlag(is_store
+          ? kChangesBackingStore : kDependsOnBackingStore);
+      break;
     case kElementsPointer:
       instr->SetGVNFlag(is_store
           ? kChangesElementsPointer : kDependsOnElementsPointer);
       break;
     case kMaps:
       instr->SetGVNFlag(is_store
           ? kChangesMaps : kDependsOnMaps);
       break;
     case kExternalMemory:
       instr->SetGVNFlag(is_store
@@ skipping 23 matching lines @@
         stream->Add(String::cast(*name_)->ToCString().get());
       }
       stream->Add("[in-object]");
       break;
     case kBackingStore:
       if (!name_.is_null()) {
         stream->Add(String::cast(*name_)->ToCString().get());
       }
       stream->Add("[backing-store]");
       break;
+    case kBackingStorePointer:
+      if (!name_.is_null()) {
+        stream->Add(String::cast(*name_)->ToCString().get());
+      }
+      stream->Add("[backing-store-pointer]");
+      break;
     case kExternalMemory:
       stream->Add("[external-memory]");
       break;
   }
 
   stream->Add("@%d", offset());
 }
 
 } }  // namespace v8::internal