[ic] Remove --new-load-global-ic switch.

src/type-feedback-vector.cc

 // Copyright 2014 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/type-feedback-vector.h"
 
 #include "src/code-stubs.h"
 #include "src/ic/ic.h"
 #include "src/ic/ic-state.h"
 #include "src/objects.h"
@@ skipping 168 matching lines @@
   // Ensure we can skip the write barrier
   Handle<Object> uninitialized_sentinel = UninitializedSentinel(isolate);
   DCHECK_EQ(*factory->uninitialized_symbol(), *uninitialized_sentinel);
   for (int i = 0; i < slot_count;) {
     FeedbackVectorSlot slot(i);
     FeedbackVectorSlotKind kind = metadata->GetKind(slot);
     int index = TypeFeedbackVector::GetIndex(slot);
     int entry_size = TypeFeedbackMetadata::GetSlotSize(kind);
 
     Object* value;
-    if (FLAG_new_load_global_ic &&
-        kind == FeedbackVectorSlotKind::LOAD_GLOBAL_IC) {
+    if (kind == FeedbackVectorSlotKind::LOAD_GLOBAL_IC) {
       value = *factory->empty_weak_cell();
     } else {
       value = *uninitialized_sentinel;
     }
     array->set(index, value, SKIP_WRITE_BARRIER);
     for (int j = 1; j < entry_size; j++) {
       array->set(index + j, *uninitialized_sentinel, SKIP_WRITE_BARRIER);
     }
     i += entry_size;
   }
@@ skipping 255 matching lines @@
     return MONOMORPHIC;
   }
 
   return UNINITIALIZED;
 }
 
 InlineCacheState LoadGlobalICNexus::StateFromFeedback() const {
   Isolate* isolate = GetIsolate();
   Object* feedback = GetFeedback();
 
-  if (FLAG_new_load_global_ic) {
-    Object* extra = GetFeedbackExtra();
-    if (!WeakCell::cast(feedback)->cleared() ||
-        extra != *TypeFeedbackVector::UninitializedSentinel(isolate)) {
-      return MONOMORPHIC;
-    }
-
-  } else {
-    if (feedback == *TypeFeedbackVector::UninitializedSentinel(isolate)) {
-      return UNINITIALIZED;
-    } else if (feedback == *TypeFeedbackVector::MegamorphicSentinel(isolate)) {
-      return MEGAMORPHIC;
-    } else if (feedback ==
-               *TypeFeedbackVector::PremonomorphicSentinel(isolate)) {
-      return PREMONOMORPHIC;
-    } else if (feedback->IsFixedArray()) {
-      // Determine state purely by our structure, don't check if the maps are
-      // cleared.
-      return POLYMORPHIC;
-    } else if (feedback->IsWeakCell()) {
-      // Don't check if the map is cleared.
-      return MONOMORPHIC;
-    }
+  Object* extra = GetFeedbackExtra();
+  if (!WeakCell::cast(feedback)->cleared() ||
+      extra != *TypeFeedbackVector::UninitializedSentinel(isolate)) {
+    return MONOMORPHIC;
   }
   return UNINITIALIZED;
 }
 
 InlineCacheState KeyedLoadICNexus::StateFromFeedback() const {
   Isolate* isolate = GetIsolate();
   Object* feedback = GetFeedback();
 
   if (feedback == *TypeFeedbackVector::UninitializedSentinel(isolate)) {
     return UNINITIALIZED;
@@ skipping 129 matching lines @@
 }
 
 
 void LoadICNexus::ConfigureMonomorphic(Handle<Map> receiver_map,
                                        Handle<Code> handler) {
   Handle<WeakCell> cell = Map::WeakCellForMap(receiver_map);
   SetFeedback(*cell);
   SetFeedbackExtra(*handler);
 }
 
-void LoadGlobalICNexus::ConfigureMonomorphic(Handle<Map> receiver_map,
-                                             Handle<Code> handler) {
-  Handle<WeakCell> cell = Map::WeakCellForMap(receiver_map);
-  SetFeedback(*cell);
-  SetFeedbackExtra(*handler);
-}
-
 void LoadGlobalICNexus::ConfigureUninitialized() {
   Isolate* isolate = GetIsolate();
   SetFeedback(isolate->heap()->empty_weak_cell(), SKIP_WRITE_BARRIER);
   SetFeedbackExtra(*TypeFeedbackVector::UninitializedSentinel(isolate),
                    SKIP_WRITE_BARRIER);
 }
 
 void LoadGlobalICNexus::ConfigurePropertyCellMode(Handle<PropertyCell> cell) {
   Isolate* isolate = GetIsolate();
   SetFeedback(*isolate->factory()->NewWeakCell(cell));
@@ skipping 324 matching lines @@
 
 IcCheckType KeyedStoreICNexus::GetKeyType() const {
   Object* feedback = GetFeedback();
   if (feedback == *TypeFeedbackVector::MegamorphicSentinel(GetIsolate())) {
     return static_cast<IcCheckType>(Smi::cast(GetFeedbackExtra())->value());
   }
   return IsPropertyNameFeedback(feedback) ? PROPERTY : ELEMENT;
 }
 }  // namespace internal
 }  // namespace v8