X87: Rename original constructor to new target.

src/x87/builtins-x87.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.
 
 #if V8_TARGET_ARCH_X87
 
 #include "src/code-factory.h"
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 109 matching lines @@
   GenerateTailCallToSharedCode(masm);
 }
 
 
 static void Generate_JSConstructStubHelper(MacroAssembler* masm,
                                            bool is_api_function) {
   // ----------- S t a t e -------------
   //  -- eax: number of arguments
   //  -- edi: constructor function
   //  -- ebx: allocation site or undefined
-  //  -- edx: original constructor
+  //  -- edx: new target
   // -----------------------------------
 
   // Enter a construct frame.
   {
     FrameScope scope(masm, StackFrame::CONSTRUCT);
 
     // Preserve the incoming parameters on the stack.
     __ AssertUndefinedOrAllocationSite(ebx);
     __ push(ebx);
     __ SmiTag(eax);
     __ push(eax);
     __ push(edi);
     __ push(edx);
 
     // 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) {
       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);
 
-      // Verify that the original constructor is a JSFunction.
+      // Verify that the new target is a JSFunction.
       __ CmpObjectType(edx, JS_FUNCTION_TYPE, ebx);
       __ j(not_equal, &rt_call);
 
       // Load the initial map and verify that it is in fact a map.
-      // edx: original constructor
+      // edx: new target
       __ mov(eax, FieldOperand(edx, JSFunction::kPrototypeOrInitialMapOffset));
       // Will both indicate a NULL and a Smi
       __ JumpIfSmi(eax, &rt_call);
       // edi: constructor
       // eax: initial map (if proven valid below)
       __ CmpObjectType(eax, MAP_TYPE, ebx);
       __ j(not_equal, &rt_call);
 
       // Fall back to runtime if the expected base constructor and base
       // constructor differ.
@@ skipping 99 matching lines @@
       // and jump into the continuation code at any time from now on.
       // ebx: JSObject (untagged)
       __ or_(ebx, Immediate(kHeapObjectTag));
 
       // Continue with JSObject being successfully allocated
       // ebx: JSObject (tagged)
       __ jmp(&allocated);
     }
 
     // Allocate the new receiver object using the runtime call.
-    // edx: original constructor
+    // edx: new target
     __ bind(&rt_call);
     int 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);  // constructor function
-    __ push(edx);  // original constructor
+    __ push(edx);  // new target
     __ CallRuntime(Runtime::kNewObject, 2);
     __ mov(ebx, eax);  // store result in ebx
 
     // New object allocated.
     // ebx: newly allocated object
     __ bind(&allocated);
 
     // Restore the parameters.
     __ pop(edx);  // new.target
     __ pop(edi);  // Constructor function.
@@ skipping 89 matching lines @@
 void Builtins::Generate_JSConstructStubApi(MacroAssembler* masm) {
   Generate_JSConstructStubHelper(masm, true);
 }
 
 
 void Builtins::Generate_JSConstructStubForDerived(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- eax: number of arguments
   //  -- edi: constructor function
   //  -- ebx: allocation site or undefined
-  //  -- edx: original constructor
+  //  -- edx: new target
   // -----------------------------------
 
   {
     FrameScope frame_scope(masm, StackFrame::CONSTRUCT);
 
     // Preserve allocation site.
     __ AssertUndefinedOrAllocationSite(ebx);
     __ push(ebx);
 
     // Preserve actual arguments count.
@@ skipping 350 matching lines @@
   // Call the target.
   __ Push(edx);  // Re-push return address.
   __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET);
 }
 
 
 // static
 void Builtins::Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- eax : the number of arguments (not including the receiver)
-  //  -- edx : the original constructor
+  //  -- edx : the new target
   //  -- edi : the constructor
   //  -- ebx : the address of the first argument to be pushed. Subsequent
   //           arguments should be consecutive above this, in the same order as
   //           they are to be pushed onto the stack.
   // -----------------------------------
 
   // Save number of arguments on the stack below where arguments are going
   // to be pushed.
   __ mov(ecx, eax);
   __ neg(ecx);
@@ skipping 370 matching lines @@
 }
 
 
 // Used by ReflectConstruct
 static void Generate_ConstructHelper(MacroAssembler* masm) {
   const int kFormalParameters = 3;
   const int kStackSize = kFormalParameters + 1;
 
   // Stack at entry:
   // esp     : return address
-  // esp[4]  : original constructor (new.target)
+  // esp[4]  : new target
   // esp[8]  : arguments
   // esp[16] : constructor
   {
     FrameScope frame_scope(masm, StackFrame::INTERNAL);
     // Stack frame:
     // ebp     : Old base pointer
     // ebp[4]  : return address
-    // ebp[8]  : original constructor (new.target)
+    // ebp[8]  : new target
     // ebp[12] : arguments
     // ebp[16] : constructor
     static const int kNewTargetOffset = kFPOnStackSize + kPCOnStackSize;
     static const int kArgumentsOffset = kNewTargetOffset + kPointerSize;
     static const int kFunctionOffset = kArgumentsOffset + kPointerSize;
     static const int kVectorOffset =
         InternalFrameConstants::kCodeOffset - 1 * kPointerSize;
 
     // Push the vector.
     __ mov(edi, FieldOperand(edi, JSFunction::kSharedFunctionInfoOffset));
@@ skipping 178 matching lines @@
     __ TailCallRuntime(Runtime::kSymbolDescriptiveString, 1, 1);
   }
 }
 
 
 // static
 void Builtins::Generate_StringConstructor_ConstructStub(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- eax                 : number of arguments
   //  -- edi                 : constructor function
-  //  -- edx                 : original constructor
+  //  -- edx                 : new target
   //  -- esp[0]              : return address
   //  -- esp[(argc - n) * 4] : arg[n] (zero-based)
   //  -- esp[(argc + 1) * 4] : receiver
   // -----------------------------------
 
   // 1. Load the first argument into ebx and get rid of the rest (including the
   // receiver).
   {
     Label no_arguments, done;
     __ test(eax, eax);
@@ skipping 22 matching lines @@
       __ Push(edx);
       __ Move(eax, ebx);
       __ CallStub(&stub);
       __ Move(ebx, eax);
       __ Pop(edx);
       __ Pop(edi);
     }
     __ bind(&done_convert);
   }
 
-  // 3. Check if original constructor and constructor differ.
+  // 3. Check if new target and constructor differ.
   Label new_object;
   __ cmp(edx, edi);
   __ j(not_equal, &new_object);
 
   // 4. Allocate a JSValue wrapper for the string.
   {
     // ----------- S t a t e -------------
     //  -- ebx : the first argument
     //  -- edi : constructor function
-    //  -- edx : original constructor
+    //  -- edx : new target
     // -----------------------------------
     __ Allocate(JSValue::kSize, eax, ecx, no_reg, &new_object, TAG_OBJECT);
 
     // Initialize the JSValue in eax.
     __ LoadGlobalFunctionInitialMap(edi, ecx);
     __ mov(FieldOperand(eax, HeapObject::kMapOffset), ecx);
     __ mov(FieldOperand(eax, JSObject::kPropertiesOffset),
            masm->isolate()->factory()->empty_fixed_array());
     __ mov(FieldOperand(eax, JSObject::kElementsOffset),
            masm->isolate()->factory()->empty_fixed_array());
     __ mov(FieldOperand(eax, JSValue::kValueOffset), ebx);
     STATIC_ASSERT(JSValue::kSize == 4 * kPointerSize);
     __ Ret();
   }
 
   // 5. Fallback to the runtime to create new object.
   __ bind(&new_object);
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
     __ Push(ebx);  // the first argument
     __ Push(edi);  // constructor function
-    __ Push(edx);  // original constructor
+    __ Push(edx);  // new target
     __ CallRuntime(Runtime::kNewObject, 2);
     __ Pop(FieldOperand(eax, JSValue::kValueOffset));
   }
   __ Ret();
 }
 
 
 static void ArgumentsAdaptorStackCheck(MacroAssembler* masm,
                                        Label* stack_overflow) {
   // ----------- S t a t e -------------
@@ skipping 206 matching lines @@
     __ Push(edi);
     __ CallRuntime(Runtime::kThrowCalledNonCallable, 1);
   }
 }
 
 
 // static
 void Builtins::Generate_ConstructFunction(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- eax : the number of arguments (not including the receiver)
-  //  -- edx : the original constructor (checked to be a JSFunction)
+  //  -- edx : the new target (checked to be a JSFunction)
   //  -- edi : the constructor to call (checked to be a JSFunction)
   // -----------------------------------
   __ AssertFunction(edx);
   __ AssertFunction(edi);
 
   // Calling convention for function specific ConstructStubs require
   // ebx to contain either an AllocationSite or undefined.
   __ LoadRoot(ebx, Heap::kUndefinedValueRootIndex);
 
   // Tail call to the function-specific construct stub (still in the caller
   // context at this point).
   __ mov(ecx, FieldOperand(edi, JSFunction::kSharedFunctionInfoOffset));
   __ mov(ecx, FieldOperand(ecx, SharedFunctionInfo::kConstructStubOffset));
   __ lea(ecx, FieldOperand(ecx, Code::kHeaderSize));
   __ jmp(ecx);
 }
 
 
 // static
 void Builtins::Generate_ConstructProxy(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- eax : the number of arguments (not including the receiver)
-  //  -- edx : the original constructor (either the same as the constructor or
+  //  -- edx : the new target (either the same as the constructor or
   //           the JSFunction on which new was invoked initially)
   //  -- edi : the constructor to call (checked to be a JSFunctionProxy)
   // -----------------------------------
 
   // TODO(neis): This doesn't match the ES6 spec for [[Construct]] on proxies.
   __ mov(edi, FieldOperand(edi, JSFunctionProxy::kConstructTrapOffset));
   __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET);
 }
 
 
 // static
 void Builtins::Generate_Construct(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- eax : the number of arguments (not including the receiver)
-  //  -- edx : the original constructor (either the same as the constructor or
+  //  -- edx : the new target (either the same as the constructor or
   //           the JSFunction on which new was invoked initially)
   //  -- edi : the constructor to call (can be any Object)
   // -----------------------------------
 
   // Check if target has a [[Construct]] internal method.
   Label non_constructor;
   __ JumpIfSmi(edi, &non_constructor, Label::kNear);
   __ mov(ecx, FieldOperand(edi, HeapObject::kMapOffset));
   __ test_b(FieldOperand(ecx, Map::kBitFieldOffset), 1 << Map::kIsConstructor);
   __ j(zero, &non_constructor, Label::kNear);
@@ skipping 208 matching lines @@
 
   __ bind(&ok);
   __ ret(0);
 }
 
 #undef __
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87