Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Unified Diff: src/x64/code-stubs-x64.cc

Issue 1418623007: [runtime] Fix ES6 9.2.1 [[Call]] when encountering a classConstructor. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Do not use kNear jump on x64 Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/x64/builtins-x64.cc ('k') | src/x64/macro-assembler-x64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/x64/code-stubs-x64.cc
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
index e26ceab567049f96a95ea6534e1cbc82b058ced1..85529453569dbc2125e16d4d95b572448630d70c 100644
--- a/src/x64/code-stubs-x64.cc
+++ b/src/x64/code-stubs-x64.cc
@@ -1876,15 +1876,18 @@ static void GenerateRecordCallTarget(MacroAssembler* masm, bool is_super) {
static void EmitContinueIfStrictOrNative(MacroAssembler* masm, Label* cont) {
+ // ----------- S t a t e -------------
+ // -- rdi : the function to call
+ // -- rdx : the function's shared function info
+ // -----------------------------------
+ // Assume that SharedFunctionInfo is already loaded into rdx.
// Do not transform the receiver for strict mode functions.
- __ movp(rcx, FieldOperand(rdi, JSFunction::kSharedFunctionInfoOffset));
- __ testb(FieldOperand(rcx, SharedFunctionInfo::kStrictModeByteOffset),
+ __ testb(FieldOperand(rdx, SharedFunctionInfo::kStrictModeByteOffset),
Immediate(1 << SharedFunctionInfo::kStrictModeBitWithinByte));
__ j(not_equal, cont);
// Do not transform the receiver for natives.
- // SharedFunctionInfo is already loaded into rcx.
- __ testb(FieldOperand(rcx, SharedFunctionInfo::kNativeByteOffset),
+ __ testb(FieldOperand(rdx, SharedFunctionInfo::kNativeByteOffset),
Immediate(1 << SharedFunctionInfo::kNativeBitWithinByte));
__ j(not_equal, cont);
}
@@ -1912,10 +1915,30 @@ static void EmitWrapCase(MacroAssembler* masm,
}
+static void EmitClassConstructorCallCheck(MacroAssembler* masm) {
+ // ----------- S t a t e -------------
+ // -- rdi : the function to call
+ // -- rdx : the function's shared function info
+ // -----------------------------------
+ // ClassConstructor Check: ES6 section 9.2.1 [[Call]]
+ Label non_class_constructor;
+ // Check whether the current function is a classConstructor
+ __ testb(FieldOperand(rdx, SharedFunctionInfo::kFunctionKindByteOffset),
+ Immediate(SharedFunctionInfo::kClassConstructorBitsWithinByte));
+ __ j(zero, &non_class_constructor, Label::kNear);
+ // If we call a classConstructor Function throw a TypeError
+ // indirectly via the CallFunction builtin.
+ __ Jump(masm->isolate()->builtins()->CallFunction(), RelocInfo::CODE_TARGET);
+ __ bind(&non_class_constructor);
+}
+
+
static void CallFunctionNoFeedback(MacroAssembler* masm,
int argc, bool needs_checks,
bool call_as_method) {
- // rdi : the function to call
+ // ----------- S t a t e -------------
+ // -- rdi : the function to call
+ // -----------------------------------
// wrap_and_call can only be true if we are compiling a monomorphic method.
Label slow, wrap, cont;
@@ -1930,6 +1953,9 @@ static void CallFunctionNoFeedback(MacroAssembler* masm,
__ j(not_equal, &slow);
}
+ __ movp(rdx, FieldOperand(rdi, JSFunction::kSharedFunctionInfoOffset));
+ EmitClassConstructorCallCheck(masm);
+
// Fast-case: Just invoke the function.
ParameterCount actual(argc);
@@ -2047,9 +2073,11 @@ void CallICStub::HandleArrayCase(MacroAssembler* masm, Label* miss) {
void CallICStub::Generate(MacroAssembler* masm) {
- // rdi - function
- // rdx - slot id
- // rbx - vector
+ // ----------- S t a t e -------------
+ // -- rdi - function
+ // -- rdx - slot id
+ // -- rbx - vector
+ // -----------------------------------
Isolate* isolate = masm->isolate();
const int with_types_offset =
FixedArray::OffsetOfElementAt(TypeFeedbackVector::kWithTypesIndex);
@@ -2094,6 +2122,10 @@ void CallICStub::Generate(MacroAssembler* masm) {
Smi::FromInt(CallICNexus::kCallCountIncrement));
__ bind(&have_js_function);
+
+ __ movp(rdx, FieldOperand(rdi, JSFunction::kSharedFunctionInfoOffset));
+ EmitClassConstructorCallCheck(masm);
+
if (CallAsMethod()) {
EmitContinueIfStrictOrNative(masm, &cont);
« no previous file with comments | « src/x64/builtins-x64.cc ('k') | src/x64/macro-assembler-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698