[stubs] Simplify the non-function case of CallConstructStub.

src/x64/code-stubs-x64.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_X64
 
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
 #include "src/ic/handler-compiler.h"
@@ skipping 2023 matching lines @@
   Register jmp_reg = rcx;
   __ movp(jmp_reg, FieldOperand(rdi, JSFunction::kSharedFunctionInfoOffset));
   __ movp(jmp_reg, FieldOperand(jmp_reg,
                                 SharedFunctionInfo::kConstructStubOffset));
   __ leap(jmp_reg, FieldOperand(jmp_reg, Code::kHeaderSize));
   __ jmp(jmp_reg);
 
   // rdi: called object
   // rax: number of arguments
   // r11: object map
-  Label do_call;
   __ bind(&slow);
-  __ CmpInstanceType(r11, JS_FUNCTION_PROXY_TYPE);
-  __ j(not_equal, &non_function_call);
-  __ GetBuiltinEntry(rdx,
-                     Context::CALL_FUNCTION_PROXY_AS_CONSTRUCTOR_BUILTIN_INDEX);
-  __ jmp(&do_call);
+  {
+    __ CmpInstanceType(r11, JS_FUNCTION_PROXY_TYPE);
+    __ j(not_equal, &non_function_call, Label::kNear);
 
-  __ bind(&non_function_call);
-  __ GetBuiltinEntry(rdx,
-                     Context::CALL_NON_FUNCTION_AS_CONSTRUCTOR_BUILTIN_INDEX);
-  __ bind(&do_call);
-  // Set expected number of arguments to zero (not changing rax).
-  __ Set(rbx, 0);
-  __ Jump(isolate()->builtins()->ArgumentsAdaptorTrampoline(),
-          RelocInfo::CODE_TARGET);
+    // TODO(neis): This doesn't match the ES6 spec for [[Construct]] on proxies.
+    __ movp(rdi, FieldOperand(rdi, JSFunctionProxy::kConstructTrapOffset));
+    __ Jump(isolate()->builtins()->Call(), RelocInfo::CODE_TARGET);
+
+    __ bind(&non_function_call);
+    {
+      // Determine the delegate for the target (if any).
+      FrameScope scope(masm, StackFrame::INTERNAL);
+      __ Integer32ToSmi(rax, rax);
+      __ Push(rax);
+      __ Push(rdi);
+      __ CallRuntime(Runtime::kGetConstructorDelegate, 1);
+      __ movp(rdi, rax);
+      __ Pop(rax);
+      __ SmiToInteger32(rax, rax);
+    }
+    // The delegate is always a regular function.
+    __ AssertFunction(rdi);
+    __ Jump(isolate()->builtins()->CallFunction(), RelocInfo::CODE_TARGET);
+  }
 }
 
 
 static void EmitLoadTypeFeedbackVector(MacroAssembler* masm, Register vector) {
   __ movp(vector, Operand(rbp, JavaScriptFrameConstants::kFunctionOffset));
   __ movp(vector, FieldOperand(vector, JSFunction::kSharedFunctionInfoOffset));
   __ movp(vector, FieldOperand(vector,
                                SharedFunctionInfo::kFeedbackVectorOffset));
 }
 
@@ skipping 3504 matching lines @@
                            kStackSpace, nullptr, return_value_operand, NULL);
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64