new classes: change semantics of super(...) call and add new.target to construct stub.

src/arm/builtins-arm.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #if V8_TARGET_ARCH_ARM
 
 #include "src/codegen.h"
 #include "src/debug.h"
@@ skipping 299 matching lines @@
 }
 
 
 static void Generate_JSConstructStubHelper(MacroAssembler* masm,
                                            bool is_api_function,
                                            bool create_memento) {
   // ----------- S t a t e -------------
   //  -- r0     : number of arguments
   //  -- r1     : constructor function
   //  -- r2     : allocation site or undefined
+  //  -- r3     : original constructor
   //  -- lr     : return address
   //  -- sp[...]: constructor arguments
   // -----------------------------------
 
   // Should never create mementos for api functions.
   DCHECK(!is_api_function || !create_memento);
 
   Isolate* isolate = masm->isolate();
 
   // Enter a construct frame.
   {
     FrameAndConstantPoolScope scope(masm, StackFrame::CONSTRUCT);
 
     if (create_memento) {
-      __ AssertUndefinedOrAllocationSite(r2, r3);
+      __ AssertUndefinedOrAllocationSite(r2, r4);
       __ push(r2);
     }
 
     // Preserve the two incoming parameters on the stack.
     __ SmiTag(r0);
     __ push(r0);  // Smi-tagged arguments count.
     __ push(r1);  // Constructor function.
 
+    Label rt_call, allocated, normal_new, count_incremented;
+    __ cmp(r1, r3);
+    __ b(eq, &normal_new);
+
+    // Original constructor and function are different.
+    {
+      if (create_memento) {
+        // Get the cell or allocation site.
+        __ ldr(r2, MemOperand(sp, 2 * kPointerSize));
+        __ push(r2);
+      }
+
+      __ push(r1);  // argument for Runtime_NewObject
+      __ push(r3);  // original constructor
+      if (create_memento) {
+        __ CallRuntime(Runtime::kNewObjectWithAllocationSite, 3);
+      } else {
+        __ CallRuntime(Runtime::kNewObject, 2);
+      }
+      __ mov(r4, r0);
+
+      // If we ended up using the runtime, and we want a memento, then the
+      // runtime call made it for us, and we shouldn't do create count
+      // increment.
+      if (create_memento) {
+        __ jmp(&count_incremented);
+      } else {
+        __ jmp(&allocated);
+      }
+    }
+    __ bind(&normal_new);
+
     // Try to allocate the object without transitioning into C code. If any of
     // the preconditions is not met, the code bails out to the runtime call.
-    Label rt_call, allocated;
     if (FLAG_inline_new) {
       Label undo_allocation;
       ExternalReference debug_step_in_fp =
           ExternalReference::debug_step_in_fp_address(isolate);
       __ mov(r2, Operand(debug_step_in_fp));
       __ ldr(r2, MemOperand(r2));
       __ tst(r2, r2);
       __ b(ne, &rt_call);
 
       // Load the initial map and verify that it is in fact a map.
@@ skipping 213 matching lines @@
     // Allocate the new receiver object using the runtime call.
     // r1: constructor function
     __ bind(&rt_call);
     if (create_memento) {
       // Get the cell or allocation site.
       __ ldr(r2, MemOperand(sp, 2 * kPointerSize));
       __ push(r2);
     }
 
     __ push(r1);  // argument for Runtime_NewObject
+    __ push(r1);  // original constructor
     if (create_memento) {
-      __ CallRuntime(Runtime::kNewObjectWithAllocationSite, 2);
+      __ CallRuntime(Runtime::kNewObjectWithAllocationSite, 3);
     } else {
-      __ CallRuntime(Runtime::kNewObject, 1);
+      __ CallRuntime(Runtime::kNewObject, 2);
     }
     __ mov(r4, r0);
 
     // If we ended up using the runtime, and we want a memento, then the
     // runtime call made it for us, and we shouldn't do create count
     // increment.
-    Label count_incremented;
     if (create_memento) {
       __ jmp(&count_incremented);
     }
 
     // Receiver for constructor call allocated.
     // r4: JSObject
     __ bind(&allocated);
 
     if (create_memento) {
       __ ldr(r2, MemOperand(sp, kPointerSize * 2));
@@ skipping 944 matching lines @@
     __ bkpt(0);
   }
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM