Reverted 3130-3131 since they don't work on mac.

src/code-stubs.cc

 // Copyright 2006-2008 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 18 matching lines @@
 
 #include "bootstrapper.h"
 #include "code-stubs.h"
 #include "factory.h"
 #include "macro-assembler.h"
 
 namespace v8 {
 namespace internal {
 
 Handle<Code> CodeStub::GetCode() {
-  bool custom_cache = has_custom_cache();
-
-  int index = 0;
-  uint32_t key = 0;
-  if (custom_cache) {
-    Code* cached;
-    if (GetCustomCache(&cached)) {
-      return Handle<Code>(cached);
-    } else {
-      index = NumberDictionary::kNotFound;
-    }
-  } else {
-    key = GetKey();
-    index = Heap::code_stubs()->FindEntry(key);
-    if (index != NumberDictionary::kNotFound)
-      return Handle<Code>(Code::cast(Heap::code_stubs()->ValueAt(index)));
-  }
-
-  Code* result;
-  {
-    v8::HandleScope scope;
+  uint32_t key = GetKey();
+  int index = Heap::code_stubs()->FindEntry(key);
+  if (index == NumberDictionary::kNotFound) {
+    HandleScope scope;
 
     // Update the static counter each time a new code stub is generated.
     Counters::code_stubs.Increment();
 
     // Generate the new code.
     MacroAssembler masm(NULL, 256);
 
     // Nested stubs are not allowed for leafs.
     masm.set_allow_stub_calls(AllowsStubCalls());
 
@@ skipping 19 matching lines @@
 #ifdef ENABLE_DISASSEMBLER
     if (FLAG_print_code_stubs) {
 #ifdef DEBUG
       Print();
 #endif
       code->Disassemble(GetName());
       PrintF("\n");
     }
 #endif
 
-    if (custom_cache) {
-      SetCustomCache(*code);
-    } else {
-      // Update the dictionary and the root in Heap.
-      Handle<NumberDictionary> dict =
-          Factory::DictionaryAtNumberPut(
-              Handle<NumberDictionary>(Heap::code_stubs()),
-              key,
-              code);
-      Heap::public_set_code_stubs(*dict);
-    }
-    result = *code;
+    // Update the dictionary and the root in Heap.
+    Handle<NumberDictionary> dict =
+        Factory::DictionaryAtNumberPut(
+            Handle<NumberDictionary>(Heap::code_stubs()),
+            key,
+            code);
+    Heap::public_set_code_stubs(*dict);
+    index = Heap::code_stubs()->FindEntry(key);
   }
+  ASSERT(index != NumberDictionary::kNotFound);
 
-  return Handle<Code>(result);
+  return Handle<Code>(Code::cast(Heap::code_stubs()->ValueAt(index)));
 }
 
 
 const char* CodeStub::MajorName(CodeStub::Major major_key) {
   switch (major_key) {
 #define DEF_CASE(name) case name: return #name;
     CODE_STUB_LIST_ALL(DEF_CASE)
 #undef DEF_CASE
     default:
       UNREACHABLE();
       return NULL;
   }
 }
 
 
 } }  // namespace v8::internal