Rename original constructor to new target

src/arm64/builtins-arm64.cc

 // Copyright 2013 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_ARM64
 
 #include "src/arm64/frames-arm64.h"
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
@@ skipping 189 matching lines @@
     __ TailCallRuntime(Runtime::kSymbolDescriptiveString, 1, 1);
   }
 }
 
 
 // static
 void Builtins::Generate_StringConstructor_ConstructStub(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- x0                     : number of arguments
   //  -- x1                     : constructor function
-  //  -- x3                     : original constructor
+  //  -- x3                     : new target
   //  -- lr                     : return address
   //  -- sp[(argc - n - 1) * 8] : arg[n] (zero based)
   //  -- sp[argc * 8]           : receiver
   // -----------------------------------
   ASM_LOCATION("Builtins::Generate_StringConstructor_ConstructStub");
 
   // 1. Load the first argument into x2 and get rid of the rest (including the
   // receiver).
   {
     Label no_arguments, done;
@@ skipping 19 matching lines @@
       ToStringStub stub(masm->isolate());
       __ Push(x1, x3);
       __ Move(x0, x2);
       __ CallStub(&stub);
       __ Move(x2, x0);
       __ Pop(x1, x3);
     }
     __ Bind(&done_convert);
   }
 
-  // 3. Check if original constructor and constructor differ.
+  // 3. Check if new target and constructor differ.
   Label new_object;
   __ Cmp(x1, x3);
   __ B(ne, &new_object);
 
   // 4. Allocate a JSValue wrapper for the string.
   {
     // ----------- S t a t e -------------
     //  -- x2 : the first argument
     //  -- x1 : constructor function
-    //  -- x3 : original constructor
+    //  -- x3 : new target
     //  -- lr : return address
     // -----------------------------------
     __ Allocate(JSValue::kSize, x0, x4, x5, &new_object, TAG_OBJECT);
 
     // Initialize the JSValue in eax.
     __ LoadGlobalFunctionInitialMap(x1, x3, x4);
     __ Str(x3, FieldMemOperand(x0, HeapObject::kMapOffset));
     __ LoadRoot(x3, Heap::kEmptyFixedArrayRootIndex);
     __ Str(x3, FieldMemOperand(x0, JSObject::kPropertiesOffset));
     __ Str(x3, FieldMemOperand(x0, JSObject::kElementsOffset));
     __ Str(x2, FieldMemOperand(x0, JSValue::kValueOffset));
     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(x2, x1);  // first argument, constructor
-    __ Push(x1, x3);  // constructor, original constructor
+    __ Push(x1, x3);  // constructor, new target
     __ CallRuntime(Runtime::kNewObject, 2);
     __ Pop(x1, x2);
   }
   __ Str(x2, FieldMemOperand(x0, JSValue::kValueOffset));
   __ Ret();
 }
 
 
 static void CallRuntimePassFunction(MacroAssembler* masm,
                                     Runtime::FunctionId function_id) {
@@ skipping 40 matching lines @@
   GenerateTailCallToSharedCode(masm);
 }
 
 
 static void Generate_JSConstructStubHelper(MacroAssembler* masm,
                                            bool is_api_function) {
   // ----------- S t a t e -------------
   //  -- x0     : number of arguments
   //  -- x1     : constructor function
   //  -- x2     : allocation site or undefined
-  //  -- x3     : original constructor
+  //  -- x3     : new target
   //  -- lr     : return address
   //  -- sp[...]: constructor arguments
   // -----------------------------------
 
   ASM_LOCATION("Builtins::Generate_JSConstructStubHelper");
 
   Isolate* isolate = masm->isolate();
 
   // Enter a construct frame.
   {
     FrameScope scope(masm, StackFrame::CONSTRUCT);
 
     // Preserve the four incoming parameters on the stack.
     Register argc = x0;
     Register constructor = x1;
     Register allocation_site = x2;
-    Register original_constructor = x3;
+    Register new_target = x3;
 
     // Preserve the incoming parameters on the stack.
     __ AssertUndefinedOrAllocationSite(allocation_site, x10);
     __ SmiTag(argc);
-    __ Push(allocation_site, argc, constructor, original_constructor);
+    __ Push(allocation_site, argc, constructor, new_target);
     // sp[0]: new.target
     // sp[1]: Constructor function.
     // sp[2]: number of arguments (smi-tagged)
     // sp[3]: allocation site
 
     // 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(isolate);
       __ Mov(x2, Operand(debug_step_in_fp));
       __ Ldr(x2, MemOperand(x2));
       __ Cbnz(x2, &rt_call);
 
-      // Verify that the original constructor is a JSFunction.
-      __ JumpIfNotObjectType(original_constructor, x10, x11, JS_FUNCTION_TYPE,
-                             &rt_call);
+      // Verify that the new target is a JSFunction.
+      __ JumpIfNotObjectType(new_target, x10, x11, JS_FUNCTION_TYPE, &rt_call);
 
       // Load the initial map and verify that it is in fact a map.
       Register init_map = x2;
       __ Ldr(init_map,
-             FieldMemOperand(original_constructor,
+             FieldMemOperand(new_target,
                              JSFunction::kPrototypeOrInitialMapOffset));
       __ JumpIfSmi(init_map, &rt_call);
       __ JumpIfNotObjectType(init_map, x10, x11, MAP_TYPE, &rt_call);
 
       // Fall back to runtime if the expected base constructor and base
       // constructor differ.
       __ Ldr(x10,
              FieldMemOperand(init_map, Map::kConstructorOrBackPointerOffset));
       __ Cmp(constructor, x10);
       __ B(ne, &rt_call);
@@ skipping 111 matching lines @@
       first_prop = NoReg;
       prop_fields = NoReg;
 
       // Add the object tag to make the JSObject real, so that we can continue
       // and jump into the continuation code at any time from now on.
       __ Add(new_obj, new_obj, kHeapObjectTag);
 
       // Continue with JSObject being successfully allocated.
       __ B(&allocated);
 
-      // Reload the original constructor and fall-through.
+      // Reload the new target and fall-through.
       __ Bind(&rt_call_reload_new_target);
       __ Peek(x3, 0 * kXRegSize);
     }
 
     // Allocate the new receiver object using the runtime call.
     // x1: constructor function
-    // x3: original constructor
+    // x3: new target
     __ Bind(&rt_call);
-    __ Push(constructor, original_constructor);  // arguments 1-2
+    __ Push(constructor, new_target);  // arguments 1-2
     __ CallRuntime(Runtime::kNewObject, 2);
     __ Mov(x4, x0);
 
     // Receiver for constructor call allocated.
     // x4: JSObject
     __ Bind(&allocated);
 
     // Restore the parameters.
-    __ Pop(original_constructor);
+    __ Pop(new_target);
     __ Pop(constructor);
 
     // Reload the number of arguments from the stack.
     // Set it up in x0 for the function call below.
     // jssp[0]: number of arguments (smi-tagged)
     __ Peek(argc, 0);  // Load number of arguments.
     __ SmiUntag(argc);
 
-    __ Push(original_constructor, x4, x4);
+    __ Push(new_target, x4, x4);
 
     // Set up pointer to last argument.
     __ Add(x2, fp, StandardFrameConstants::kCallerSPOffset);
 
     // Copy arguments and receiver to the expression stack.
     // Copy 2 values every loop to use ldp/stp.
     // x0: number of arguments
     // x1: constructor function
     // x2: address of last argument (caller sp)
     // jssp[0]: receiver
@@ skipping 59 matching lines @@
     // Throw away the result of the constructor invocation and use the
     // on-stack receiver as the result.
     __ Bind(&use_receiver);
     __ Peek(x0, 0);
 
     // Remove the receiver from the stack, remove caller arguments, and
     // return.
     __ Bind(&exit);
     // x0: result
     // jssp[0]: receiver (newly allocated object)
-    // jssp[1]: new.target (original constructor)
+    // jssp[1]: new target
     // jssp[2]: number of arguments (smi-tagged)
     __ Peek(x1, 2 * kXRegSize);
 
     // Leave construct frame.
   }
 
   __ DropBySMI(x1);
   __ Drop(1);
   __ IncrementCounter(isolate->counters()->constructed_objects(), 1, x1, x2);
   __ Ret();
 }
 
 
 void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) {
   Generate_JSConstructStubHelper(masm, false);
 }
 
 
 void Builtins::Generate_JSConstructStubApi(MacroAssembler* masm) {
   Generate_JSConstructStubHelper(masm, true);
 }
 
 
 void Builtins::Generate_JSConstructStubForDerived(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- x0     : number of arguments
   //  -- x1     : constructor function
   //  -- x2     : allocation site or undefined
-  //  -- x3    : original constructor
+  //  -- x3     : new target
   //  -- lr     : return address
   //  -- sp[...]: constructor arguments
   // -----------------------------------
   ASM_LOCATION("Builtins::Generate_JSConstructStubForDerived");
 
   {
     FrameScope frame_scope(masm, StackFrame::CONSTRUCT);
 
     __ AssertUndefinedOrAllocationSite(x2, x10);
     __ Mov(x4, x0);
@@ skipping 1030 matching lines @@
     __ CallRuntime(Runtime::kThrowCalledNonCallable, 1);
   }
 }
 
 
 // static
 void Builtins::Generate_ConstructFunction(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- x0 : the number of arguments (not including the receiver)
   //  -- x1 : the constructor to call (checked to be a JSFunction)
-  //  -- x3 : the original constructor (checked to be a JSFunction)
+  //  -- x3 : the new target (checked to be a JSFunction)
   // -----------------------------------
   __ AssertFunction(x1);
   __ AssertFunction(x3);
 
   // Calling convention for function specific ConstructStubs require
   // x2 to contain either an AllocationSite or undefined.
   __ LoadRoot(x2, Heap::kUndefinedValueRootIndex);
 
   // Tail call to the function-specific construct stub (still in the caller
   // context at this point).
   __ Ldr(x4, FieldMemOperand(x1, JSFunction::kSharedFunctionInfoOffset));
   __ Ldr(x4, FieldMemOperand(x4, SharedFunctionInfo::kConstructStubOffset));
   __ Add(x4, x4, Code::kHeaderSize - kHeapObjectTag);
   __ Br(x4);
 }
 
 
 // static
 void Builtins::Generate_ConstructProxy(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- x0 : the number of arguments (not including the receiver)
   //  -- x1 : the constructor to call (checked to be a JSFunctionProxy)
-  //  -- x3 : the original constructor (either the same as the constructor or
+  //  -- x3 : the new target (either the same as the constructor or
   //          the JSFunction on which new was invoked initially)
   // -----------------------------------
 
   // TODO(neis): This doesn't match the ES6 spec for [[Construct]] on proxies.
   __ Ldr(x1, FieldMemOperand(x1, JSFunctionProxy::kConstructTrapOffset));
   __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET);
 }
 
 
 // static
 void Builtins::Generate_Construct(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- x0 : the number of arguments (not including the receiver)
   //  -- x1 : the constructor to call (can be any Object)
-  //  -- x3 : the original constructor (either the same as the constructor or
+  //  -- x3 : the new target (either the same as the constructor or
   //          the JSFunction on which new was invoked initially)
   // -----------------------------------
 
   // Check if target has a [[Construct]] internal method.
   Label non_constructor;
   __ JumpIfSmi(x1, &non_constructor);
   __ Ldr(x4, FieldMemOperand(x1, HeapObject::kMapOffset));
   __ Ldrb(x2, FieldMemOperand(x4, Map::kBitFieldOffset));
   __ TestAndBranchIfAllClear(x2, 1 << Map::kIsConstructor, &non_constructor);
 
@@ skipping 56 matching lines @@
 
   // Call the target.
   __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET);
 }
 
 
 // static
 void Builtins::Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   // -- x0 : argument count (not including receiver)
-  // -- x3 : original constructor
+  // -- x3 : new target
   // -- x1 : constructor to call
   // -- x2 : address of the first argument
   // -----------------------------------
 
   // Find the address of the last argument.
   __ add(x5, x0, Operand(1));  // Add one for receiver (to be constructed).
   __ lsl(x5, x5, kPointerSizeLog2);
 
   // Set stack pointer and where to stop.
   __ Mov(x6, jssp);
@@ skipping 187 matching lines @@
   }
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM