Index: src/arm64/builtins-arm64.cc |
diff --git a/src/arm64/builtins-arm64.cc b/src/arm64/builtins-arm64.cc |
index b6bae4ad0edc308cfb6d09b3628a05efdadec06f..9c50471b7cc92ea5e877084b61b421f7eba791fa 100644 |
--- a/src/arm64/builtins-arm64.cc |
+++ b/src/arm64/builtins-arm64.cc |
@@ -418,7 +418,8 @@ void Builtins::Generate_InOptimizationQueue(MacroAssembler* masm) { |
static void Generate_JSConstructStubHelper(MacroAssembler* masm, |
bool is_api_function, |
- bool create_implicit_receiver) { |
+ bool create_implicit_receiver, |
+ bool check_derived_construct) { |
// ----------- S t a t e ------------- |
// -- x0 : number of arguments |
// -- x1 : constructor function |
@@ -697,6 +698,19 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm, |
// Leave construct frame. |
} |
+ // ES6 9.2.2. Step 13+ |
+ // Check that the result is not a Smi, indicating that the constructor result |
+ // from a derived class is neither undefined nor an Object. |
+ if (check_derived_construct) { |
+ Label dont_throw; |
+ __ JumpIfNotSmi(x0, &dont_throw); |
+ { |
+ FrameScope scope(masm, StackFrame::INTERNAL); |
+ __ CallRuntime(Runtime::kThrowDerivedConstructorReturnedNonObject); |
+ } |
+ __ Bind(&dont_throw); |
+ } |
+ |
__ DropBySMI(x1); |
__ Drop(1); |
if (create_implicit_receiver) { |
@@ -707,17 +721,23 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm, |
void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) { |
- Generate_JSConstructStubHelper(masm, false, true); |
+ Generate_JSConstructStubHelper(masm, false, true, false); |
} |
void Builtins::Generate_JSConstructStubApi(MacroAssembler* masm) { |
- Generate_JSConstructStubHelper(masm, true, true); |
+ Generate_JSConstructStubHelper(masm, true, true, false); |
} |
void Builtins::Generate_JSBuiltinsConstructStub(MacroAssembler* masm) { |
- Generate_JSConstructStubHelper(masm, false, false); |
+ Generate_JSConstructStubHelper(masm, false, false, false); |
+} |
+ |
+ |
+void Builtins::Generate_JSBuiltinsConstructStubForDerived( |
+ MacroAssembler* masm) { |
+ Generate_JSConstructStubHelper(masm, false, false, true); |
} |