Remove PropertyCell space

src/hydrogen-gvn.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/hydrogen.h"
 #include "src/hydrogen-gvn.h"
 #include "src/v8.h"
 
 namespace v8 {
 namespace internal {
@@ skipping 328 matching lines @@
       data_[i] = instr;
     }
   }
 }
 
 
 SideEffects SideEffectsTracker::ComputeChanges(HInstruction* instr) {
   int index;
   SideEffects result(instr->ChangesFlags());
   if (result.ContainsFlag(kGlobalVars)) {
-    if (instr->IsStoreGlobalCell() &&
-        ComputeGlobalVar(HStoreGlobalCell::cast(instr)->cell(), &index)) {
-      result.RemoveFlag(kGlobalVars);
-      result.AddSpecial(GlobalVar(index));
-    } else {
-      for (index = 0; index < kNumberOfGlobalVars; ++index) {
+    if (instr->IsStoreNamedField()) {
+      HStoreNamedField* store = HStoreNamedField::cast(instr);
+      HConstant* target = HConstant::cast(store->object());
+      if (ComputeGlobalVar(Unique<PropertyCell>::cast(target->GetUnique()),
+                           &index)) {
+        result.RemoveFlag(kGlobalVars);
         result.AddSpecial(GlobalVar(index));
+        return result;
       }
     }
-  }
-  if (result.ContainsFlag(kInobjectFields)) {
+    for (index = 0; index < kNumberOfGlobalVars; ++index) {
+      result.AddSpecial(GlobalVar(index));
+    }
+  } else if (result.ContainsFlag(kInobjectFields)) {
     if (instr->IsStoreNamedField() &&
         ComputeInobjectField(HStoreNamedField::cast(instr)->access(), &index)) {
       result.RemoveFlag(kInobjectFields);
       result.AddSpecial(InobjectField(index));
     } else {
       for (index = 0; index < kNumberOfInobjectFields; ++index) {
         result.AddSpecial(InobjectField(index));
       }
     }
   }
   return result;
 }
 
 
 SideEffects SideEffectsTracker::ComputeDependsOn(HInstruction* instr) {
   int index;
   SideEffects result(instr->DependsOnFlags());
   if (result.ContainsFlag(kGlobalVars)) {
-    if (instr->IsLoadGlobalCell() &&
-        ComputeGlobalVar(HLoadGlobalCell::cast(instr)->cell(), &index)) {
-      result.RemoveFlag(kGlobalVars);
-      result.AddSpecial(GlobalVar(index));
-    } else {
-      for (index = 0; index < kNumberOfGlobalVars; ++index) {
+    if (instr->IsLoadNamedField()) {
+      HLoadNamedField* load = HLoadNamedField::cast(instr);
+      HConstant* target = HConstant::cast(load->object());
+      if (ComputeGlobalVar(Unique<PropertyCell>::cast(target->GetUnique()),
+                           &index)) {
+        result.RemoveFlag(kGlobalVars);
         result.AddSpecial(GlobalVar(index));
+        return result;
       }
     }
-  }
-  if (result.ContainsFlag(kInobjectFields)) {
+    for (index = 0; index < kNumberOfGlobalVars; ++index) {
+      result.AddSpecial(GlobalVar(index));
+    }
+  } else if (result.ContainsFlag(kInobjectFields)) {
     if (instr->IsLoadNamedField() &&
         ComputeInobjectField(HLoadNamedField::cast(instr)->access(), &index)) {
       result.RemoveFlag(kInobjectFields);
       result.AddSpecial(InobjectField(index));
     } else {
       for (index = 0; index < kNumberOfInobjectFields; ++index) {
         result.AddSpecial(InobjectField(index));
       }
     }
   }
@@ skipping 33 matching lines @@
     if (te.effects.ContainsSpecial(t->InobjectField(index))) {
       os << separator << t->inobject_fields_[index];
       separator = ", ";
     }
   }
   os << "]";
   return os;
 }
 
 
-bool SideEffectsTracker::ComputeGlobalVar(Unique<Cell> cell, int* index) {
+bool SideEffectsTracker::ComputeGlobalVar(Unique<PropertyCell> cell,
+                                          int* index) {
   for (int i = 0; i < num_global_vars_; ++i) {
     if (cell == global_vars_[i]) {
       *index = i;
       return true;
     }
   }
   if (num_global_vars_ < kNumberOfGlobalVars) {
     if (FLAG_trace_gvn) {
       OFStream os(stdout);
       os << "Tracking global var [" << *cell.handle() << "] "
@@ skipping 428 matching lines @@
                                                       dominated);
         successor_map->Kill(side_effects_on_all_paths);
         successor_dominators->Kill(side_effects_on_all_paths);
       }
     }
     current = next;
   }
 }
 
 } }  // namespace v8::internal