Do not add extra argument for new.target

src/arm64/full-codegen-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.
 
 #include "src/v8.h"
 
 #if V8_TARGET_ARCH_ARM64
 
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
@@ skipping 232 matching lines @@
   // derived constructors with super calls.
   Variable* this_function_var = scope()->this_function_var();
   if (this_function_var != nullptr) {
     Comment cmnt(masm_, "[ This function");
     SetVar(this_function_var, x1, x0, x2);
   }
 
   Variable* new_target_var = scope()->new_target_var();
   if (new_target_var != nullptr) {
     Comment cmnt(masm_, "[ new.target");
+    // Get the frame pointer for the calling frame.
+    __ Ldr(x2, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
+
+    Label check_frame_marker;
+    __ Ldr(x1, MemOperand(x2, StandardFrameConstants::kContextOffset));
+    __ Cmp(x1, Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
+    __ B(ne, &check_frame_marker);
+    __ Ldr(x2, MemOperand(x2, StandardFrameConstants::kCallerFPOffset));
+    __ Bind(&check_frame_marker);
+    __ Ldr(x1, MemOperand(x2, StandardFrameConstants::kMarkerOffset));
+    __ Cmp(x1, Smi::FromInt(StackFrame::CONSTRUCT));
+
+    Label non_construct_frame, done;
+
+    __ B(ne, &non_construct_frame);
+    __ Ldr(x0, MemOperand(x2, StandardFrameConstants::kExpressionsOffset -
+                                  2 * kPointerSize));
+    __ B(&done);
+
+    __ Bind(&non_construct_frame);
+    __ LoadRoot(x0, Heap::kUndefinedValueRootIndex);
+
+    __ Bind(&done);
     // new.target is parameter -2.
-    int offset =
-        2 * kXRegSize + (info_->scope()->num_parameters() + 1) * kPointerSize;
-    __ Ldr(x0, MemOperand(fp, offset));
     SetVar(new_target_var, x0, x2, x3);
   }
 
-  ArgumentsAccessStub::HasNewTarget has_new_target =
-      IsSubclassConstructor(info->function()->kind())
-          ? ArgumentsAccessStub::HAS_NEW_TARGET
-          : ArgumentsAccessStub::NO_NEW_TARGET;
-
   // Possibly allocate RestParameters
   int rest_index;
   Variable* rest_param = scope()->rest_parameter(&rest_index);
   if (rest_param) {
     Comment cmnt(masm_, "[ Allocate rest parameter array");
 
     int num_parameters = info->scope()->num_parameters();
     int offset = num_parameters * kPointerSize;
-    if (has_new_target == ArgumentsAccessStub::HAS_NEW_TARGET) {
-      --num_parameters;
-      ++rest_index;
-    }
 
     __ Add(x3, fp, StandardFrameConstants::kCallerSPOffset + offset);
     __ Mov(x2, Smi::FromInt(num_parameters));
     __ Mov(x1, Smi::FromInt(rest_index));
     __ Mov(x0, Smi::FromInt(language_mode()));
     __ Push(x3, x2, x1, x0);
 
     RestParamAccessStub stub(isolate());
     __ CallStub(&stub);
 
@@ skipping 22 matching lines @@
     // The stub will rewrite receiver and parameter count if the previous
     // stack frame was an arguments adapter frame.
     ArgumentsAccessStub::Type type;
     if (is_strict(language_mode()) || !is_simple_parameter_list()) {
       type = ArgumentsAccessStub::NEW_STRICT;
     } else if (function()->has_duplicate_parameters()) {
       type = ArgumentsAccessStub::NEW_SLOPPY_SLOW;
     } else {
       type = ArgumentsAccessStub::NEW_SLOPPY_FAST;
     }
-    ArgumentsAccessStub stub(isolate(), type, has_new_target);
+    ArgumentsAccessStub stub(isolate(), type);
     __ CallStub(&stub);
 
     SetVar(arguments, x0, x1, x2);
   }
 
   if (FLAG_trace) {
     __ CallRuntime(Runtime::kTraceEnter, 0);
   }
 
   // Visit the declarations and body unless there is an illegal
@@ skipping 165 matching lines @@
       int no_frame_start = masm_->pc_offset();
       __ ldp(fp, lr, MemOperand(current_sp, 2 * kXRegSize, PostIndex));
       // Drop the arguments and receiver and return.
       // TODO(all): This implementation is overkill as it supports 2**31+1
       // arguments, consider how to improve it without creating a security
       // hole.
       __ ldr_pcrel(ip0, (3 * kInstructionSize) >> kLoadLiteralScaleLog2);
       __ add(current_sp, current_sp, ip0);
       __ ret();
       int32_t arg_count = info_->scope()->num_parameters() + 1;
-      if (IsSubclassConstructor(info_->function()->kind())) {
-        arg_count++;
-      }
       __ dc64(kXRegSize * arg_count);
       info_->AddNoFrameRange(no_frame_start, masm_->pc_offset());
     }
   }
 }
 
 
 void FullCodeGenerator::EffectContext::Plug(Variable* var) const {
   DCHECK(var->IsStackAllocated() || var->IsContextSlot());
 }
@@ skipping 3463 matching lines @@
   // default constructor has no arguments, so no adaptor frame means no args.
   __ Mov(x0, Operand(0));
   __ B(&args_set_up);
 
   // Copy arguments from adaptor frame.
   {
     __ bind(&adaptor_frame);
     __ Ldr(x1, MemOperand(x11, ArgumentsAdaptorFrameConstants::kLengthOffset));
     __ SmiUntag(x1, x1);
 
-    // Subtract 1 from arguments count, for new.target.
-    __ Sub(x1, x1, Operand(1));
     __ Mov(x0, x1);
 
     // Get arguments pointer in x11.
     __ Add(x11, x11, Operand(x1, LSL, kPointerSizeLog2));
     __ Add(x11, x11, StandardFrameConstants::kCallerSPOffset);
     Label loop;
     __ bind(&loop);
     // Pre-decrement x11 with kPointerSize on each iteration.
     // Pre-decrement in order to skip receiver.
     __ Ldr(x10, MemOperand(x11, -kPointerSize, PreIndex));
@@ skipping 1575 matching lines @@
   }
 
   return INTERRUPT;
 }
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64