Revert "Improve inobject field tracking during GVN."

src/hydrogen-load-elimination.cc

 // Copyright 2013 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 81 matching lines @@
                s->value()->id()));
         HValue* result = store(s);
         if (result == NULL) {
           // The store is redundant. Remove it.
           TRACE(("  remove S%d\n", instr->id()));
           instr->DeleteAndReplaceWith(NULL);
         }
         break;
       }
       default: {
-        if (instr->CheckChangesFlag(kInobjectFields)) {
+        if (instr->CheckGVNFlag(kChangesInobjectFields)) {
           TRACE((" kill-all i%d\n", instr->id()));
           Kill();
           break;
         }
-        if (instr->CheckChangesFlag(kMaps)) {
+        if (instr->CheckGVNFlag(kChangesMaps)) {
           TRACE((" kill-maps i%d\n", instr->id()));
           KillOffset(JSObject::kMapOffset);
         }
-        if (instr->CheckChangesFlag(kElementsKind)) {
+        if (instr->CheckGVNFlag(kChangesElementsKind)) {
           TRACE((" kill-elements-kind i%d\n", instr->id()));
           KillOffset(JSObject::kMapOffset);
           KillOffset(JSObject::kElementsOffset);
         }
-        if (instr->CheckChangesFlag(kElementsPointer)) {
+        if (instr->CheckGVNFlag(kChangesElementsPointer)) {
           TRACE((" kill-elements i%d\n", instr->id()));
           KillOffset(JSObject::kElementsOffset);
         }
-        if (instr->CheckChangesFlag(kOsrEntries)) {
+        if (instr->CheckGVNFlag(kChangesOsrEntries)) {
           TRACE((" kill-osr i%d\n", instr->id()));
           Kill();
         }
       }
       // Improvements possible:
       // - learn from HCheckMaps for field 0
       // - remove unobservable stores (write-after-write)
       // - track cells
       // - track globals
       // - track roots
@@ skipping 316 matching lines @@
         stores_.Add(HStoreNamedField::cast(instr), zone_);
         break;
       }
       case HValue::kOsrEntry: {
         // Kill everything. Loads must not be hoisted past the OSR entry.
         maps_stored_ = true;
         fields_stored_ = true;
         elements_stored_ = true;
       }
       default: {
-        fields_stored_ |= instr->CheckChangesFlag(kInobjectFields);
-        maps_stored_ |= instr->CheckChangesFlag(kMaps);
-        maps_stored_ |= instr->CheckChangesFlag(kElementsKind);
-        elements_stored_ |= instr->CheckChangesFlag(kElementsKind);
-        elements_stored_ |= instr->CheckChangesFlag(kElementsPointer);
+        fields_stored_ |= instr->CheckGVNFlag(kChangesInobjectFields);
+        maps_stored_ |= instr->CheckGVNFlag(kChangesMaps);
+        maps_stored_ |= instr->CheckGVNFlag(kChangesElementsKind);
+        elements_stored_ |= instr->CheckGVNFlag(kChangesElementsKind);
+        elements_stored_ |= instr->CheckGVNFlag(kChangesElementsPointer);
       }
     }
   }
 
   // Apply these effects to the given load elimination table.
   void Apply(HLoadEliminationTable* table) {
     if (fields_stored_) {
       table->Kill();
       return;
     }
@@ skipping 44 matching lines @@
   } else {
     // Perform only local analysis.
     for (int i = 0; i < graph()->blocks()->length(); i++) {
       table->Kill();
       engine.AnalyzeOneBlock(graph()->blocks()->at(i), table);
     }
   }
 }
 
 } }  // namespace v8::internal