Remove support for "loads and stores to global vars through property cell shortcuts inst…

src/crankshaft/hydrogen.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/crankshaft/hydrogen.h"
 
 #include <sstream>
 
 #include "src/allocation-site-scopes.h"
 #include "src/ast-numbering.h"
@@ skipping 5698 matching lines @@
           if (field_maps == nullptr) {
             instr = New<HLoadNamedField>(cell_constant, nullptr, access);
           } else {
             instr = New<HLoadNamedField>(cell_constant, nullptr, access,
                                          field_maps, HType::HeapObject());
           }
           instr->ClearDependsOnFlag(kInobjectFields);
           instr->SetDependsOnFlag(kGlobalVars);
           return ast_context()->ReturnInstruction(instr, expr->id());
         }
-      } else if (variable->IsGlobalSlot()) {
-        DCHECK(variable->index() > 0);
-        DCHECK(variable->IsStaticGlobalObjectProperty());
-        int slot_index = variable->index();
-        int depth = scope()->ContextChainLength(variable->scope());
-
-        HLoadGlobalViaContext* instr =
-            New<HLoadGlobalViaContext>(depth, slot_index);
-        return ast_context()->ReturnInstruction(instr, expr->id());
-
       } else {
         HValue* global_object = Add<HLoadNamedField>(
             context(), nullptr,
             HObjectAccess::ForContextSlot(Context::GLOBAL_OBJECT_INDEX));
         HLoadGlobalGeneric* instr = New<HLoadGlobalGeneric>(
             global_object, variable->name(), ast_context()->typeof_mode());
         instr->SetVectorAndSlot(handle(current_feedback_vector(), isolate()),
                                 expr->VariableFeedbackSlot());
         return ast_context()->ReturnInstruction(instr, expr->id());
       }
@@ skipping 1195 matching lines @@
           break;
         }
       }
     }
     HInstruction* instr = Add<HStoreNamedField>(cell_constant, access, value);
     instr->ClearChangesFlag(kInobjectFields);
     instr->SetChangesFlag(kGlobalVars);
     if (instr->HasObservableSideEffects()) {
       Add<HSimulate>(ast_id, REMOVABLE_SIMULATE);
     }
-  } else if (var->IsGlobalSlot()) {
-    DCHECK(var->index() > 0);
-    DCHECK(var->IsStaticGlobalObjectProperty());
-    int slot_index = var->index();
-    int depth = scope()->ContextChainLength(var->scope());
-
-    HStoreGlobalViaContext* instr = Add<HStoreGlobalViaContext>(
-        value, depth, slot_index, function_language_mode());
-    USE(instr);
-    DCHECK(instr->HasObservableSideEffects());
-    Add<HSimulate>(ast_id, REMOVABLE_SIMULATE);
-
   } else {
     HValue* global_object = Add<HLoadNamedField>(
         context(), nullptr,
         HObjectAccess::ForContextSlot(Context::GLOBAL_OBJECT_INDEX));
     HStoreNamedGeneric* instr =
         Add<HStoreNamedGeneric>(global_object, var->name(), value,
                                 function_language_mode(), PREMONOMORPHIC);
     if (FLAG_vector_stores) {
       Handle<TypeFeedbackVector> vector =
           handle(current_feedback_vector(), isolate());
@@ skipping 6734 matching lines @@
     isolate()->GetHTracer()->TraceHydrogen(name(), graph_);
   }
 
 #ifdef DEBUG
   graph_->Verify(false);  // No full verify.
 #endif
 }
 
 }  // namespace internal
 }  // namespace v8