Experimental: Merge 1395:1441 from bleeding_edge branch to the...

src/builtins.cc

Index: src/builtins.cc
===================================================================
--- src/builtins.cc	(revision 1441)
+++ src/builtins.cc	(working copy)
@@ -155,7 +155,7 @@
     Object* obj = BUILTIN_ARG(1);
     if (obj->IsSmi()) {
       int len = Smi::cast(obj)->value();
-      if (len >= 0 && len < JSObject::kMaxFastElementsLength) {
+      if (len >= 0 && len < JSObject::kInitialMaxFastElementArray) {
         Object* obj = Heap::AllocateFixedArrayWithHoles(len);
         if (obj->IsFailure()) return obj;
         array->SetContent(FixedArray::cast(obj));
@@ -699,10 +699,10 @@
       // Log the event and add the code to the builtins array.
       LOG(CodeCreateEvent("Builtin", Code::cast(code), functions[i].s_name));
       builtins_[i] = code;
-#ifdef DEBUG
+#ifdef ENABLE_DISASSEMBLER
       if (FLAG_print_builtin_code) {
         PrintF("Builtin: %s\n", functions[i].s_name);
-        code->Print();
+        Code::cast(code)->Disassemble(functions[i].s_name);
         PrintF("\n");
       }
 #endif