Fixed arm/mac errors and presubmitting 2324.

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 19 matching lines @@
 #include "bootstrapper.h"
 #include "code-stubs.h"
 #include "factory.h"
 #include "macro-assembler.h"
 
 namespace v8 {
 namespace internal {
 
 Handle<Code> CodeStub::GetCode() {
   uint32_t key = GetKey();
-  int index = Heap::code_stubs()->FindNumberEntry(key);
-  if (index == -1) {
+  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 21 matching lines @@
     if (FLAG_print_code_stubs) {
 #ifdef DEBUG
       Print();
 #endif
       code->Disassemble(GetName());
       PrintF("\n");
     }
 #endif
 
     // Update the dictionary and the root in Heap.
-    Handle<Dictionary> dict =
-        Factory::DictionaryAtNumberPut(Handle<Dictionary>(Heap::code_stubs()),
-                                       key,
-                                       code);
+    Handle<NumberDictionary> dict =
+        Factory::DictionaryAtNumberPut(
+            Handle<NumberDictionary>(Heap::code_stubs()),
+            key,
+            code);
     Heap::set_code_stubs(*dict);
-    index = Heap::code_stubs()->FindNumberEntry(key);
+    index = Heap::code_stubs()->FindEntry(key);
   }
-  ASSERT(index != -1);
+  ASSERT(index != NumberDictionary::kNotFound);
 
   return Handle<Code>(Code::cast(Heap::code_stubs()->ValueAt(index)));
 }
 
 
 const char* CodeStub::MajorName(CodeStub::Major major_key) {
   switch (major_key) {
     case CallFunction:
       return "CallFunction";
     case GenericBinaryOp:
@@ skipping 37 matching lines @@
     case WriteInt32ToHeapNumber:
       return "WriteInt32ToHeapNumber";
     default:
       UNREACHABLE();
       return NULL;
   }
 }
 
 
 } }  // namespace v8::internal