VectorICs: recent changes broke cases with --novector-ics

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/v8.h"
 
 #include "src/ic/ic.h"
 #include "src/ic/ic-state.h"
 #include "src/objects.h"
 #include "src/type-feedback-vector-inl.h"
@@ skipping 121 matching lines @@
     Isolate* isolate, Handle<TypeFeedbackVector> vector) {
   Handle<TypeFeedbackVector> result;
   result = Handle<TypeFeedbackVector>::cast(
       isolate->factory()->CopyFixedArray(Handle<FixedArray>::cast(vector)));
   return result;
 }
 
 
 bool TypeFeedbackVector::SpecDiffersFrom(
     const ZoneFeedbackVectorSpec* other_spec) const {
+  if (!FLAG_vector_ics) return false;
+
   if (other_spec->slots() != Slots() || other_spec->ic_slots() != ICSlots()) {
     return true;
   }
 
   int ic_slots = ICSlots();
   for (int i = 0; i < ic_slots; i++) {
     if (GetKind(FeedbackVectorICSlot(i)) != other_spec->GetKind(i)) {
       return true;
     }
   }
@@ skipping 400 matching lines @@
 
 Name* KeyedLoadICNexus::FindFirstName() const {
   Object* feedback = GetFeedback();
   if (feedback->IsString()) {
     return Name::cast(feedback);
   }
   return NULL;
 }
 }
 }  // namespace v8::internal