Revert 10216 Optimize the equality check case of ICCompare stubs.

src/code-stubs.cc

 // Copyright 2011 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 83 matching lines @@
 int CodeStub::GetCodeKind() {
   return Code::STUB;
 }
 
 
 Handle<Code> CodeStub::GetCode() {
   Isolate* isolate = Isolate::Current();
   Factory* factory = isolate->factory();
   Heap* heap = isolate->heap();
   Code* code;
-  if (UseSpecialCache()
-      ? FindCodeInSpecialCache(&code)
-      : FindCodeInCache(&code)) {
-    ASSERT(IsPregenerated() == code->is_pregenerated());
-    return Handle<Code>(code);
-  }
-
-  {
+  if (!FindCodeInCache(&code)) {
     HandleScope scope(isolate);
 
     // Generate the new code.
     MacroAssembler masm(isolate, NULL, 256);
     GenerateCode(&masm);
 
     // Create the code object.
     CodeDesc desc;
     masm.GetCode(&desc);
 
     // Copy the generated code into a heap object.
     Code::Flags flags = Code::ComputeFlags(
         static_cast<Code::Kind>(GetCodeKind()),
         GetICState());
     Handle<Code> new_object = factory->NewCode(
         desc, flags, masm.CodeObject(), NeedsImmovableCode());
     RecordCodeGeneration(*new_object, &masm);
     FinishCode(new_object);
 
-    if (UseSpecialCache()) {
-      AddToSpecialCache(new_object);
-    } else {
-      // Update the dictionary and the root in Heap.
-      Handle<NumberDictionary> dict =
-          factory->DictionaryAtNumberPut(
-              Handle<NumberDictionary>(heap->code_stubs()),
-              GetKey(),
-              new_object);
-      heap->public_set_code_stubs(*dict);
-    }
+    // Update the dictionary and the root in Heap.
+    Handle<NumberDictionary> dict =
+        factory->DictionaryAtNumberPut(
+            Handle<NumberDictionary>(heap->code_stubs()),
+            GetKey(),
+            new_object);
+    heap->public_set_code_stubs(*dict);
     code = *new_object;
+    Activate(code);
+  } else {
+    CHECK(IsPregenerated() == code->is_pregenerated());
   }
 
-  Activate(code);
   ASSERT(!NeedsImmovableCode() || heap->lo_space()->Contains(code));
   return Handle<Code>(code, isolate);
 }
 
 
 const char* CodeStub::MajorName(CodeStub::Major major_key,
                                 bool allow_unknown_keys) {
   switch (major_key) {
 #define DEF_CASE(name) case name: return #name "Stub";
     CODE_STUB_LIST(DEF_CASE)
 #undef DEF_CASE
     default:
       if (!allow_unknown_keys) {
         UNREACHABLE();
       }
       return NULL;
   }
 }
 
 
 void CodeStub::PrintName(StringStream* stream) {
   stream->Add("%s", MajorName(MajorKey(), false));
 }
 
 
-void ICCompareStub::AddToSpecialCache(Handle<Code> new_object) {
-  ASSERT(*known_map_ != NULL);
-  Isolate* isolate = new_object->GetIsolate();
-  Factory* factory = isolate->factory();
-  return Map::UpdateCodeCache(known_map_,
-                              factory->compare_ic_symbol(),
-                              new_object);
-}
-
-
-bool ICCompareStub::FindCodeInSpecialCache(Code** code_out) {
-  Isolate* isolate = known_map_->GetIsolate();
-  Factory* factory = isolate->factory();
-  Code::Flags flags = Code::ComputeFlags(
-      static_cast<Code::Kind>(GetCodeKind()),
-      UNINITIALIZED);
-  Handle<Object> probe(
-      known_map_->FindInCodeCache(*factory->compare_ic_symbol(), flags));
-  if (probe->IsCode()) {
-    *code_out = Code::cast(*probe);
-    return true;
-  }
-  return false;
-}
-
-
 int ICCompareStub::MinorKey() {
   return OpField::encode(op_ - Token::EQ) | StateField::encode(state_);
 }
 
 
 void ICCompareStub::Generate(MacroAssembler* masm) {
   switch (state_) {
     case CompareIC::UNINITIALIZED:
       GenerateMiss(masm);
       break;
     case CompareIC::SMIS:
       GenerateSmis(masm);
       break;
     case CompareIC::HEAP_NUMBERS:
       GenerateHeapNumbers(masm);
       break;
     case CompareIC::STRINGS:
       GenerateStrings(masm);
       break;
     case CompareIC::SYMBOLS:
       GenerateSymbols(masm);
       break;
     case CompareIC::OBJECTS:
       GenerateObjects(masm);
       break;
-    case CompareIC::KNOWN_OBJECTS:
-      ASSERT(*known_map_ != NULL);
-      GenerateKnownObjects(masm);
-      break;
     default:
       UNREACHABLE();
   }
 }
 
 
 void InstanceofStub::PrintName(StringStream* stream) {
   const char* args = "";
   if (HasArgsInRegisters()) {
     args = "_REGS";
@@ skipping 204 matching lines @@
       KeyedStoreStubCompiler::GenerateStoreFastDoubleElement(masm, is_jsarray_);
     } else {
       UNREACHABLE();
     }
   }
   masm->bind(&fail);
   KeyedStoreIC::GenerateRuntimeSetProperty(masm, strict_mode_);
 }
 
 } }  // namespace v8::internal