Changeset 198324 in webkit for trunk/Source/JavaScriptCore/runtime/CodeCache.cpp

Timestamp:

Mar 17, 2016, 2:46:07 AM (9 years ago)

Author:

[email protected]

Message:

Invoking super()/super inside of the eval should not lead to SyntaxError
​https://bugs.webkit.org/show_bug.cgi?id=153864

Reviewed by Saam Barati.

Source/JavaScriptCore:

Added support of the invoking super/super() inside of the eval within class.
Also support cases when eval is invoked in constructor, class method directly
or via arrow function. Access to the new.target in eval is not part of this patch
and will be implemented in ​https://bugs.webkit.org/show_bug.cgi?id=155545

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::emitLoadArrowFunctionLexicalEnvironment):
(JSC::BytecodeGenerator::isThisUsedInInnerArrowFunction):
(JSC::BytecodeGenerator::isNewTargetUsedInInnerArrowFunction):
(JSC::BytecodeGenerator::isSuperUsedInInnerArrowFunction):
(JSC::BytecodeGenerator::isSuperCallUsedInInnerArrowFunction):
(JSC::BytecodeGenerator::emitPutThisToArrowFunctionContextScope):

• interpreter/Interpreter.cpp:

(JSC::eval):

• parser/Parser.cpp:

(JSC::Parser<LexerType>::Parser):
(JSC::Parser<LexerType>::parseFunctionInfo):
(JSC::Parser<LexerType>::parseMemberExpression):

• parser/Parser.h:

(JSC::Scope::Scope):
(JSC::Scope::isEvalContext):
(JSC::Scope::setIsEvalContext):
(JSC::parse):

• runtime/CodeCache.cpp:

(JSC::CodeCache::getGlobalCodeBlock):

• tests/stress/arrowfunction-lexical-bind-supercall-4.js:
• tests/stress/arrowfunction-lexical-bind-superproperty.js:
• tests/stress/class-syntax-super-in-eval.js: Added.
• tests/stress/generator-with-super.js:

LayoutTests:

• js/class-syntax-super-expected.txt:
• js/script-tests/class-syntax-super.js:

File:

• trunk/Source/JavaScriptCore/runtime/CodeCache.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/CodeCache.cpp

@@ -101 +101 @@
         return unlinkedCodeBlock;
     }
-
     typedef typename CacheTypes<UnlinkedCodeBlockType>::RootNode RootNode;
+    DerivedContextType derivedContextType = executable->derivedContextType();
     std::unique_ptr<RootNode> rootNode = parse<RootNode>(
-        &vm, source, Identifier(), builtinMode, strictMode,
-        CacheTypes<UnlinkedCodeBlockType>::parseMode, SuperBinding::NotNeeded, error, nullptr, ConstructorKind::None, thisTDZMode);
+        &vm, source, Identifier(), builtinMode, strictMode, CacheTypes<UnlinkedCodeBlockType>::parseMode, SuperBinding::NotNeeded, error, nullptr, ConstructorKind::None, thisTDZMode, derivedContextType);
     if (!rootNode)
         return nullptr;