Rename original constructor to new target

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.
 
 #if V8_TARGET_ARCH_ARM
 
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 193 matching lines @@
     __ TailCallRuntime(Runtime::kSymbolDescriptiveString, 1, 1);
   }
 }
 
 
 // static
 void Builtins::Generate_StringConstructor_ConstructStub(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r0                     : number of arguments
   //  -- r1                     : constructor function
-  //  -- r3                     : original constructor
+  //  -- r3                     : new target
   //  -- lr                     : return address
   //  -- sp[(argc - n - 1) * 4] : arg[n] (zero based)
   //  -- sp[argc * 4]           : receiver
   // -----------------------------------
 
   // 1. Load the first argument into r2 and get rid of the rest (including the
   // receiver).
   {
     Label no_arguments, done;
     __ sub(r0, r0, Operand(1), SetCC);
@@ skipping 19 matching lines @@
       ToStringStub stub(masm->isolate());
       __ Push(r1, r3);
       __ Move(r0, r2);
       __ CallStub(&stub);
       __ Move(r2, r0);
       __ Pop(r1, r3);
     }
     __ bind(&done_convert);
   }
 
-  // 3. Check if original constructor and constructor differ.
+  // 3. Check if new target and constructor differ.
   Label new_object;
   __ cmp(r1, r3);
   __ b(ne, &new_object);
 
   // 4. Allocate a JSValue wrapper for the string.
   {
     // ----------- S t a t e -------------
     //  -- r2 : the first argument
     //  -- r1 : constructor function
-    //  -- r3 : original constructor
+    //  -- r3 : new target
     //  -- lr : return address
     // -----------------------------------
     __ Allocate(JSValue::kSize, r0, r4, r5, &new_object, TAG_OBJECT);
 
     // Initialize the JSValue in r0.
     __ LoadGlobalFunctionInitialMap(r1, r3, r4);
     __ str(r3, FieldMemOperand(r0, HeapObject::kMapOffset));
     __ LoadRoot(r3, Heap::kEmptyFixedArrayRootIndex);
     __ str(r3, FieldMemOperand(r0, JSObject::kPropertiesOffset));
     __ str(r3, FieldMemOperand(r0, JSObject::kElementsOffset));
     __ str(r2, FieldMemOperand(r0, JSValue::kValueOffset));
     STATIC_ASSERT(JSValue::kSize == 4 * kPointerSize);
     __ Ret();
   }
 
   // 5. Fallback to the runtime to create new object.
   __ bind(&new_object);
   {
     FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
-    __ Push(r2, r1, r3);  // first argument, constructor, original constructor
+    __ Push(r2, r1, r3);  // first argument, constructor, new target
     __ CallRuntime(Runtime::kNewObject, 2);
     __ Pop(r2);
   }
   __ str(r2, FieldMemOperand(r0, JSValue::kValueOffset));
   __ Ret();
 }
 
 
 static void CallRuntimePassFunction(
     MacroAssembler* masm, Runtime::FunctionId function_id) {
@@ skipping 41 matching lines @@
   GenerateTailCallToSharedCode(masm);
 }
 
 
 static void Generate_JSConstructStubHelper(MacroAssembler* masm,
                                            bool is_api_function) {
   // ----------- S t a t e -------------
   //  -- r0     : number of arguments
   //  -- r1     : constructor function
   //  -- r2     : allocation site or undefined
-  //  -- r3     : original constructor
+  //  -- r3     : new target
   //  -- lr     : return address
   //  -- sp[...]: constructor arguments
   // -----------------------------------
 
   Isolate* isolate = masm->isolate();
 
   // Enter a construct frame.
   {
     FrameAndConstantPoolScope scope(masm, StackFrame::CONSTRUCT);
 
     // Preserve the incoming parameters on the stack.
     __ AssertUndefinedOrAllocationSite(r2, r4);
     __ push(r2);
     __ SmiTag(r0);
     __ push(r0);
     __ push(r1);
     __ push(r3);
 
     // 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(r2, Operand(debug_step_in_fp));
       __ ldr(r2, MemOperand(r2));
       __ tst(r2, r2);
       __ b(ne, &rt_call);
 
-      // Verify that the original constructor is a JSFunction.
+      // Verify that the new target is a JSFunction.
       __ CompareObjectType(r3, r5, r4, JS_FUNCTION_TYPE);
       __ b(ne, &rt_call);
 
       // Load the initial map and verify that it is in fact a map.
-      // r3: original constructor
+      // r3: new target
       __ ldr(r2, FieldMemOperand(r3, JSFunction::kPrototypeOrInitialMapOffset));
       __ JumpIfSmi(r2, &rt_call);
       __ CompareObjectType(r2, r5, r4, MAP_TYPE);
       __ b(ne, &rt_call);
 
       // Fall back to runtime if the expected base constructor and base
       // constructor differ.
       __ ldr(r5, FieldMemOperand(r2, Map::kConstructorOrBackPointerOffset));
       __ cmp(r1, r5);
       __ b(ne, &rt_call);
@@ skipping 100 matching lines @@
       __ InitializeFieldsWithFiller(r5, r0, r6);
 
       // 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(r4, r4, Operand(kHeapObjectTag));
 
       // Continue with JSObject being successfully allocated
       // r4: JSObject
       __ jmp(&allocated);
 
-      // Reload the original constructor and fall-through.
+      // Reload the new target and fall-through.
       __ bind(&rt_call_reload_new_target);
       __ ldr(r3, MemOperand(sp, 0 * kPointerSize));
     }
 
     // Allocate the new receiver object using the runtime call.
     // r1: constructor function
-    // r3: original constructor
+    // r3: new target
     __ bind(&rt_call);
 
     __ push(r1);  // constructor function
-    __ push(r3);  // original constructor
+    __ push(r3);  // new target
     __ CallRuntime(Runtime::kNewObject, 2);
     __ mov(r4, r0);
 
     // Receiver for constructor call allocated.
     // r4: JSObject
     __ bind(&allocated);
 
     // Restore the parameters.
     __ pop(r3);
     __ pop(r1);
@@ skipping 75 matching lines @@
     // Throw away the result of the constructor invocation and use the
     // on-stack receiver as the result.
     __ bind(&use_receiver);
     __ ldr(r0, MemOperand(sp));
 
     // Remove receiver from the stack, remove caller arguments, and
     // return.
     __ bind(&exit);
     // r0: result
     // sp[0]: receiver (newly allocated object)
-    // sp[1]: new.target (original constructor)
+    // sp[1]: new target
     // sp[2]: number of arguments (smi-tagged)
     __ ldr(r1, MemOperand(sp, 2 * kPointerSize));
 
     // Leave construct frame.
   }
 
   __ add(sp, sp, Operand(r1, LSL, kPointerSizeLog2 - 1));
   __ add(sp, sp, Operand(kPointerSize));
   __ IncrementCounter(isolate->counters()->constructed_objects(), 1, r1, r2);
   __ Jump(lr);
 }
 
 
 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 -------------
   //  -- r0     : number of arguments
   //  -- r1     : constructor function
   //  -- r2     : allocation site or undefined
-  //  -- r3     : original constructor
+  //  -- r3     : new target
   //  -- lr     : return address
   //  -- sp[...]: constructor arguments
   // -----------------------------------
 
   {
     FrameScope frame_scope(masm, StackFrame::CONSTRUCT);
 
     __ AssertUndefinedOrAllocationSite(r2, r4);
     __ push(r2);
 
@@ skipping 357 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 -------------
   // -- r0 : argument count (not including receiver)
-  // -- r3 : original constructor
+  // -- r3 : new target
   // -- r1 : constructor to call
   // -- r2 : address of the first argument
   // -----------------------------------
 
   // Find the address of the last argument.
   __ mov(r4, Operand(r0, LSL, kPointerSizeLog2));
   __ sub(r4, r2, r4);
 
   // Push a slot for the receiver to be constructed.
   __ push(r0);
@@ skipping 672 matching lines @@
     __ CallRuntime(Runtime::kThrowCalledNonCallable, 1);
   }
 }
 
 
 // static
 void Builtins::Generate_ConstructFunction(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r0 : the number of arguments (not including the receiver)
   //  -- r1 : the constructor to call (checked to be a JSFunction)
-  //  -- r3 : the original constructor (checked to be a JSFunction)
+  //  -- r3 : the new target (checked to be a JSFunction)
   // -----------------------------------
   __ AssertFunction(r1);
   __ AssertFunction(r3);
 
   // Calling convention for function specific ConstructStubs require
   // r2 to contain either an AllocationSite or undefined.
   __ LoadRoot(r2, Heap::kUndefinedValueRootIndex);
 
   // Tail call to the function-specific construct stub (still in the caller
   // context at this point).
   __ ldr(r4, FieldMemOperand(r1, JSFunction::kSharedFunctionInfoOffset));
   __ ldr(r4, FieldMemOperand(r4, SharedFunctionInfo::kConstructStubOffset));
   __ add(pc, r4, Operand(Code::kHeaderSize - kHeapObjectTag));
 }
 
 
 // static
 void Builtins::Generate_ConstructProxy(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r0 : the number of arguments (not including the receiver)
   //  -- r1 : the constructor to call (checked to be a JSFunctionProxy)
-  //  -- r3 : the original constructor (either the same as the constructor or
+  //  -- r3 : 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(r1, FieldMemOperand(r1, JSFunctionProxy::kConstructTrapOffset));
   __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET);
 }
 
 
 // static
 void Builtins::Generate_Construct(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r0 : the number of arguments (not including the receiver)
   //  -- r1 : the constructor to call (can be any Object)
-  //  -- r3 : the original constructor (either the same as the constructor or
+  //  -- r3 : 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(r1, &non_constructor);
   __ ldr(r4, FieldMemOperand(r1, HeapObject::kMapOffset));
   __ ldrb(r2, FieldMemOperand(r4, Map::kBitFieldOffset));
   __ tst(r2, Operand(1 << Map::kIsConstructor));
   __ b(eq, &non_constructor);
@@ skipping 170 matching lines @@
   }
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM