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

src/ia32/builtins-ia32.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_IA32
 
 #include "src/code-factory.h"
 #include "src/codegen.h"
@@ skipping 89 matching lines @@
 }
 
 
 static void Generate_JSConstructStubHelper(MacroAssembler* masm,
                                            bool is_api_function,
                                            bool create_memento) {
   // ----------- S t a t e -------------
   //  -- eax: number of arguments
   //  -- edi: constructor function
   //  -- ebx: allocation site or undefined
+  //  -- edx: original constructor
   // -----------------------------------
 
   // Should never create mementos for api functions.
   DCHECK(!is_api_function || !create_memento);
 
   // Enter a construct frame.
   {
     FrameScope scope(masm, StackFrame::CONSTRUCT);
 
     if (create_memento) {
       __ AssertUndefinedOrAllocationSite(ebx);
       __ push(ebx);
     }
 
     // Store a smi-tagged arguments count on the stack.
     __ SmiTag(eax);
     __ push(eax);
 
     // Push the function to invoke on the stack.
     __ push(edi);
 
+    __ cmp(edx, edi);
+    Label normal_new;
+    Label count_incremented;
+    Label allocated;
+    __ j(equal, &normal_new);
+
+    // Original constructor and function are different.
+    {
+      int offset = 0;
+      if (create_memento) {
+        // Get the cell or allocation site.
+        __ mov(edi, Operand(esp, kPointerSize * 2));
+        __ push(edi);
+        offset = kPointerSize;
+      }
+
+      // Must restore esi (context) and edi (constructor) before calling
+      // runtime.
+      __ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
+      __ mov(edi, Operand(esp, offset));
+      __ push(edx);
+      __ push(edi);
+      if (create_memento) {
+        __ CallRuntime(Runtime::kNewObjectWithAllocationSite, 3);
+      } else {
+        __ CallRuntime(Runtime::kNewObject, 2);
+      }
+      __ mov(ebx, eax);  // store result in ebx
+
+      // 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

[arv (Not doing code reviews), 2015/01/21 19:18:55]

this sentence could use some polish

[Dmitry Lomov (no reviews), 2015/01/22 11:59:00]

Done, also removed code duplication.

+      // 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;
+    Label rt_call;
     if (FLAG_inline_new) {
       Label undo_allocation;
       ExternalReference debug_step_in_fp =
           ExternalReference::debug_step_in_fp_address(masm->isolate());
       __ cmp(Operand::StaticVariable(debug_step_in_fp), Immediate(0));
       __ j(not_equal, &rt_call);
 
       // Verified that the constructor is a JSFunction.
       // Load the initial map and verify that it is in fact a map.
       // edi: constructor
@@ skipping 204 matching lines @@
     if (create_memento) {
       // Get the cell or allocation site.
       __ mov(edi, Operand(esp, kPointerSize * 2));
       __ push(edi);
       offset = kPointerSize;
     }
 
     // Must restore esi (context) and edi (constructor) before calling runtime.
     __ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
     __ mov(edi, Operand(esp, offset));
+    __ push(edi);
     // edi: function (constructor)
     __ push(edi);
     if (create_memento) {
-      __ CallRuntime(Runtime::kNewObjectWithAllocationSite, 2);
+      __ CallRuntime(Runtime::kNewObjectWithAllocationSite, 3);
     } else {
-      __ CallRuntime(Runtime::kNewObject, 1);
+      __ CallRuntime(Runtime::kNewObject, 2);
     }
     __ mov(ebx, eax);  // store result in ebx
 
     // 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);
     }
 
     // New object allocated.
     // ebx: newly allocated object
     __ bind(&allocated);
 
     if (create_memento) {
       __ mov(ecx, Operand(esp, kPointerSize * 2));
@@ skipping 1071 matching lines @@
 
   __ bind(&ok);
   __ ret(0);
 }
 
 #undef __
 }
 }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32