Allocation Info Tracking, continued.

src/arm/builtins-arm.cc

Index: src/arm/builtins-arm.cc
diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc
index e0367da9d88eb9c903f870d596f20268f25520cd..eac9ce2cb9863a0fd7f55ed03db93d3f65e322c0 100644
--- a/src/arm/builtins-arm.cc
+++ b/src/arm/builtins-arm.cc
@@ -551,7 +551,6 @@ void Builtins::Generate_ArrayConstructCode(MacroAssembler* masm) {
     // The array construct code is only set for the builtin and internal
     // Array functions which always have a map.
     // Initial map for the builtin Array function should be a map.
-    __ stop("oh god");
     __ ldr(r3, FieldMemOperand(r1, JSFunction::kPrototypeOrInitialMapOffset));
     __ tst(r3, Operand(kSmiTagMask));
     __ Assert(ne, "Unexpected initial map for Array function");
@@ -561,7 +560,7 @@ void Builtins::Generate_ArrayConstructCode(MacroAssembler* masm) {
     // We should either have undefined in r2 or a valid jsglobalpropertycell
     Label okay_here;
     Handle<Object> undefined_sentinel(
-        masm->isolate()->heap()->undefined_value());
+        masm->isolate()->heap()->undefined_value(), masm->isolate());
     Handle<Map> global_property_cell_map(
         masm->isolate()->heap()->global_property_cell_map());
     __ cmp(r2, Operand(undefined_sentinel));
@@ -603,38 +602,6 @@ void Builtins::Generate_ArrayConstructCode(MacroAssembler* masm) {
 }
 
 
-void Builtins::Generate_InternalArrayConstructCode(MacroAssembler* masm) {
-  // ----------- S t a t e -------------
-  //  -- r0     : number of arguments
-  //  -- r1     : constructor function
-  //  -- lr     : return address
-  //  -- sp[...]: constructor arguments
-  // -----------------------------------
-  Label generic_constructor;
-
-  if (FLAG_debug_code) {
-    // The array construct code is only set for the builtin and internal
-    // Array functions which always have a map.
-    // Initial map for the builtin Array function should be a map.
-    __ ldr(r2, FieldMemOperand(r1, JSFunction::kPrototypeOrInitialMapOffset));
-    __ tst(r2, Operand(kSmiTagMask));
-    __ Assert(ne, "Unexpected initial map for Array function");
-    __ CompareObjectType(r2, r3, r4, MAP_TYPE);
-    __ Assert(eq, "Unexpected initial map for Array function");
-  }
-
-  // Run the native code for the Array function called as a constructor.
-  ArrayNativeCode(masm, &generic_constructor);
-
-  // Jump to the generic construct code in case the specialized code cannot
-  // handle the construction.
-  __ bind(&generic_constructor);
-  Handle<Code> generic_construct_stub =
-      masm->isolate()->builtins()->JSConstructStubGeneric();
-  __ Jump(generic_construct_stub, RelocInfo::CODE_TARGET);
-}
-
-
 void Builtins::Generate_StringConstructCode(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r0                     : number of arguments
@@ -1208,7 +1175,7 @@ static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
     if (is_construct) {
       // No type feedback cell is available
       Handle<Object> undefined_sentinel(
-          masm->isolate()->heap()->undefined_value());
+          masm->isolate()->heap()->undefined_value(), masm->isolate());
       __ mov(r2, Operand(undefined_sentinel));
       CallConstructStub stub(NO_CALL_FUNCTION_FLAGS);
       __ CallStub(&stub);