| Index: src/ppc/builtins-ppc.cc
|
| diff --git a/src/ppc/builtins-ppc.cc b/src/ppc/builtins-ppc.cc
|
| index 64a47cadccaf43a616e698bf2561b4eace157232..c07bd4d7a5953d6ccc480ac3e6eebce489ded195 100644
|
| --- a/src/ppc/builtins-ppc.cc
|
| +++ b/src/ppc/builtins-ppc.cc
|
| @@ -222,7 +222,7 @@ void Builtins::Generate_StringConstructor_ConstructStub(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| // -- r3 : number of arguments
|
| // -- r4 : constructor function
|
| - // -- r6 : original constructor
|
| + // -- r6 : new target
|
| // -- lr : return address
|
| // -- sp[(argc - n - 1) * 4] : arg[n] (zero based)
|
| // -- sp[argc * 4] : receiver
|
| @@ -264,7 +264,7 @@ void Builtins::Generate_StringConstructor_ConstructStub(MacroAssembler* masm) {
|
| __ bind(&done_convert);
|
| }
|
|
|
| - // 3. Check if original constructor and constructor differ.
|
| + // 3. Check if new target and constructor differ.
|
| Label new_object;
|
| __ cmp(r4, r6);
|
| __ bne(&new_object);
|
| @@ -274,7 +274,7 @@ void Builtins::Generate_StringConstructor_ConstructStub(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| // -- r5 : the first argument
|
| // -- r4 : constructor function
|
| - // -- r6 : original constructor
|
| + // -- r6 : new target
|
| // -- lr : return address
|
| // -----------------------------------
|
| __ Allocate(JSValue::kSize, r3, r7, r8, &new_object, TAG_OBJECT);
|
| @@ -294,7 +294,7 @@ void Builtins::Generate_StringConstructor_ConstructStub(MacroAssembler* masm) {
|
| __ bind(&new_object);
|
| {
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| - __ Push(r5, r4, r6); // first argument, constructor, original constructor
|
| + __ Push(r5, r4, r6); // first argument, constructor, new target
|
| __ CallRuntime(Runtime::kNewObject, 2);
|
| __ Pop(r5);
|
| }
|
| @@ -355,7 +355,7 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| // -- r3 : number of arguments
|
| // -- r4 : constructor function
|
| // -- r5 : allocation site or undefined
|
| - // -- r6 : original constructor
|
| + // -- r6 : new target
|
| // -- lr : return address
|
| // -- sp[...]: constructor arguments
|
| // -----------------------------------
|
| @@ -382,12 +382,12 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| __ cmpi(r5, Operand::Zero());
|
| __ bne(&rt_call);
|
|
|
| - // Verify that the original constructor is a JSFunction.
|
| + // Verify that the new target is a JSFunction.
|
| __ CompareObjectType(r6, r8, r7, JS_FUNCTION_TYPE);
|
| __ bne(&rt_call);
|
|
|
| // Load the initial map and verify that it is in fact a map.
|
| - // r6: original constructor
|
| + // r6: new target
|
| __ LoadP(r5,
|
| FieldMemOperand(r6, JSFunction::kPrototypeOrInitialMapOffset));
|
| __ JumpIfSmi(r5, &rt_call);
|
| @@ -509,16 +509,16 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| // r7: JSObject
|
| __ b(&allocated);
|
|
|
| - // Reload the original constructor and fall-through.
|
| + // Reload the new target and fall-through.
|
| __ bind(&rt_call_reload_new_target);
|
| __ LoadP(r6, MemOperand(sp, 0 * kPointerSize));
|
| }
|
|
|
| // Allocate the new receiver object using the runtime call.
|
| // r4: constructor function
|
| - // r6: original constructor
|
| + // r6: new target
|
| __ bind(&rt_call);
|
| - __ Push(r4, r6); // constructor function, original constructor
|
| + __ Push(r4, r6); // constructor function, new target
|
| __ CallRuntime(Runtime::kNewObject, 2);
|
| __ mr(r7, r3);
|
|
|
| @@ -611,7 +611,7 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| __ bind(&exit);
|
| // r3: result
|
| // sp[0]: receiver (newly allocated object)
|
| - // sp[1]: new.target (original constructor)
|
| + // sp[1]: new.target (new target)
|
| // sp[2]: number of arguments (smi-tagged)
|
| __ LoadP(r4, MemOperand(sp, 2 * kPointerSize));
|
|
|
| @@ -641,7 +641,7 @@ void Builtins::Generate_JSConstructStubForDerived(MacroAssembler* masm) {
|
| // -- r3 : number of arguments
|
| // -- r4 : constructor function
|
| // -- r5 : allocation site or undefined
|
| - // -- r6 : original constructor
|
| + // -- r6 : new target
|
| // -- lr : return address
|
| // -- sp[...]: constructor arguments
|
| // -----------------------------------
|
| @@ -1011,7 +1011,7 @@ void Builtins::Generate_InterpreterPushArgsAndCall(MacroAssembler* masm) {
|
| void Builtins::Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| // -- r3 : argument count (not including receiver)
|
| - // -- r6 : original constructor
|
| + // -- r6 : new target
|
| // -- r4 : constructor to call
|
| // -- r5 : address of the first argument
|
| // -----------------------------------
|
| @@ -1732,7 +1732,7 @@ void Builtins::Generate_ConstructFunction(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| // -- r3 : the number of arguments (not including the receiver)
|
| // -- r4 : the constructor to call (checked to be a JSFunction)
|
| - // -- r6 : the original constructor (checked to be a JSFunction)
|
| + // -- r6 : the new target (checked to be a JSFunction)
|
| // -----------------------------------
|
| __ AssertFunction(r4);
|
| __ AssertFunction(r6);
|
| @@ -1755,7 +1755,7 @@ void Builtins::Generate_ConstructProxy(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| // -- r3 : the number of arguments (not including the receiver)
|
| // -- r4 : the constructor to call (checked to be a JSFunctionProxy)
|
| - // -- r6 : the original constructor (either the same as the constructor or
|
| + // -- r6 : the new target (either the same as the constructor or
|
| // the JSFunction on which new was invoked initially)
|
| // -----------------------------------
|
|
|
| @@ -1770,7 +1770,7 @@ void Builtins::Generate_Construct(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| // -- r3 : the number of arguments (not including the receiver)
|
| // -- r4 : the constructor to call (can be any Object)
|
| - // -- r6 : the original constructor (either the same as the constructor or
|
| + // -- r6 : the new target (either the same as the constructor or
|
| // the JSFunction on which new was invoked initially)
|
| // -----------------------------------
|
|
|
|
|