Changeset 194435 in webkit for trunk/Source/JavaScriptCore/bytecode/ExecutableInfo.h

Timestamp:

Dec 29, 2015, 3:49:35 AM (10 years ago)

Author:

Yusuke Suzuki

Message:

[ES6][ES7] Drop Constructability of generator function
​https://bugs.webkit.org/show_bug.cgi?id=152383

Reviewed by Saam Barati.

We drop the constructability of generator functions.
This functionality is already landed in ES 2016 draft[1].
And this simplifies the existing JSC's generator implementation;
dropping GeneratorThisMode flag.

[1]: ​https://github.com/tc39/ecma262/releases/tag/es2016-draft-20151201

• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
• JavaScriptCore.xcodeproj/project.pbxproj:
• builtins/BuiltinExecutables.cpp:

(JSC::createExecutableInternal):

• bytecode/ExecutableInfo.h:

(JSC::ExecutableInfo::ExecutableInfo):
(JSC::ExecutableInfo::generatorThisMode): Deleted.

• bytecode/UnlinkedCodeBlock.cpp:

(JSC::UnlinkedCodeBlock::UnlinkedCodeBlock): Deleted.

• bytecode/UnlinkedCodeBlock.h:

(JSC::UnlinkedCodeBlock::generatorThisMode): Deleted.

• bytecode/UnlinkedFunctionExecutable.cpp:

(JSC::generateUnlinkedFunctionCodeBlock):
(JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):

• bytecode/UnlinkedFunctionExecutable.h:
• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator): Deleted.

• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::makeFunction):
(JSC::BytecodeGenerator::generatorThisMode): Deleted.

• bytecompiler/NodesCodegen.cpp:

(JSC::ThisNode::emitBytecode):

• interpreter/Interpreter.cpp:

(JSC::eval): Deleted.

• runtime/CodeCache.cpp:

(JSC::CodeCache::getFunctionExecutableFromGlobalCode):

• runtime/Executable.h:
• runtime/GeneratorThisMode.h: Removed.
• tests/stress/generator-eval-this.js:

(shouldThrow):

• tests/stress/generator-is-not-constructible.js: Added.

(shouldThrow):
(A.staticGen):
(A.prototype.gen):
(A):
(TypeError):

• tests/stress/generator-this.js:

(shouldBe.g.next):

• tests/stress/generator-with-new-target.js:

(shouldThrow):

File:

• trunk/Source/JavaScriptCore/bytecode/ExecutableInfo.h (modified) (6 diffs)

trunk/Source/JavaScriptCore/bytecode/ExecutableInfo.h

@@ -27 +27 @@
 #define ExecutableInfo_h
 
-#include "GeneratorThisMode.h"
 #include "ParserModes.h"
 
@@ -35 +34 @@
 // https://bugs.webkit.org/show_bug.cgi?id=151547
 struct ExecutableInfo {
-    ExecutableInfo(bool needsActivation, bool usesEval, bool isStrictMode, bool isConstructor, bool isBuiltinFunction, ConstructorKind constructorKind, GeneratorThisMode generatorThisMode, SuperBinding superBinding, SourceParseMode parseMode, bool isDerivedConstructorContext, bool isArrowFunctionContext)
+    ExecutableInfo(bool needsActivation, bool usesEval, bool isStrictMode, bool isConstructor, bool isBuiltinFunction, ConstructorKind constructorKind, SuperBinding superBinding, SourceParseMode parseMode, bool isDerivedConstructorContext, bool isArrowFunctionContext)
         : m_needsActivation(needsActivation)
         , m_usesEval(usesEval)
@@ -41 +40 @@
         , m_isConstructor(isConstructor)
         , m_isBuiltinFunction(isBuiltinFunction)
-        , m_generatorThisMode(static_cast<unsigned>(generatorThisMode))
         , m_constructorKind(static_cast<unsigned>(constructorKind))
         , m_superBinding(static_cast<unsigned>(superBinding))
@@ -50 +48 @@
         ASSERT(m_constructorKind == static_cast<unsigned>(constructorKind));
         ASSERT(m_superBinding == static_cast<unsigned>(superBinding));
-        ASSERT(m_generatorThisMode == static_cast<unsigned>(generatorThisMode));
     }
 
@@ -58 +55 @@
     bool isConstructor() const { return m_isConstructor; }
     bool isBuiltinFunction() const { return m_isBuiltinFunction; }
-    GeneratorThisMode generatorThisMode() const { return static_cast<GeneratorThisMode>(m_generatorThisMode); }
     ConstructorKind constructorKind() const { return static_cast<ConstructorKind>(m_constructorKind); }
     SuperBinding superBinding() const { return static_cast<SuperBinding>(m_superBinding); }
@@ -71 +67 @@
     unsigned m_isConstructor : 1;
     unsigned m_isBuiltinFunction : 1;
-    unsigned m_generatorThisMode : 1;
     unsigned m_constructorKind : 2;
     unsigned m_superBinding : 1;