Changeset 221080 in webkit


Ignore:
Timestamp:
Aug 23, 2017, 10:05:33 AM (8 years ago)
Author:
gskachkov@gmail.com
Message:

[ESNext] Async iteration - Implement Async Generator - runtime
​https://bugs.webkit.org/show_bug.cgi?id=175240

Reviewed by Yusuke Suzuki.

JSTests:

  • stress/async-iteration-async-from-sync.js: Added.

(assert):
(const.Logger):
(this.fullfilled):
(this.fullfilledDone):
(this.rejected):
(this.catched):
(this.isFinal):
(_assertLogger):
(const.assertLogger):
(const.getPromise.promiseHolder.return.new.Promise):
(foo):
(async.boo):
(bar):
(async.baz):
(async.goo):

  • stress/async-iteration-basic.js: Added.

(assert):
(const.Logger):
(this.fullfilled):
(this.fullfilledDone):
(this.rejected):
(this.catched):
(this.isFinal):
(_assertLogger):
(const.assertLogger):
(const.getPromise.promiseHolder.return.new.Promise):
(async.generator):
(iterator.next.then):
(async.baz):
(async.boo):
(async.foo):
(async.goo):
(A.prototype.async.foo):
(A.prototype.async.boo):
(A):
(asyncGenExp.async):
(async.joo):
(j.next.then):
(then):
(async.koo):
(async.loo):
(async.moo):
(async.noo):
(async.ooo):
(async.roo):
(async.poo):
(async.soo):
(async.too):

  • stress/async-iteration-evaluation.js: Added.

(assert):
(async.foo):
(catch):

  • stress/async-iteration-syntax.js:
  • stress/async-iteration-yield-promise.js: Added.

(assert):
(const.Logger):
(this.fullfilled):
(this.fullfilledDone):
(this.rejected):
(this.catched):
(this.isFinal):
(_assertLogger):
(const.assertLogger):
(const.getPromise.promiseHolder.return.new.Promise):
(async.foo):
(async.boo):
(async.bar):

  • stress/async-iteration-yield-star-interface.js: Added.

(assert):
(const.getPromise.promiseHolder.return.new.Promise):
(const.Logger):
(this.fullfilled):
(this.fullfilledDone):
(this.rejected):
(this.catched):
(this.custom):
(this.isFinal):
(_assertLogger):
(const.assertLogger):
(let.asyncIter.Symbol.asyncIterator):
(let.asyncIter.next):
(let.asyncIter.throw):
(let.asyncIter.return):
(async.foo):
(asyncIter.Symbol.asyncIterator):
(asyncIter.next):
(async.boo):
(asyncIter.return):
(async.bar):
(async.baz):
(async.foobar):

  • stress/async-iteration-yield-star.js: Added.

(assert):
(const.Logger):
(this.fullfilled):
(this.fullfilledDone):
(this.rejected):
(this.catched):
(this.custom):
(this.isFinal):
(_assertLogger):
(const.assertLogger):
(const.getPromise.promiseHolder.return.new.Promise):
(async.foo):
(async.boo):
(async.bar):
(async.baz):
(async.joo):
(async.goo):
(async.koo):
(async.loo):
(let.asyncIter.Symbol.asyncIterator):
(let.asyncIter.next):
(let.asyncIter.throw):
(let.asyncIter.return):
(async.moo):
(async.noo):

  • test262.yaml:

Source/JavaScriptCore:

Current implementation is draft version of Async Iteration.
Link to spec ​https://tc39.github.io/proposal-async-iteration/

To implement async generator added new states that show reason why async generator was suspended:

The main difference between async function and async generator is that,
async function returns promise but async generator returns
object with methods (next, throw and return) that return promise that
can be resolved with pair of properties value and done.
Async generator functions are similar to generator functions, with the following differences:
whose methods (next, throw, and return) return promises for { value, done },
instead of directly returning { value, done }.
This automatically makes the returned async generator objects async iterators.

delegation to sync and async iterables

  • CMakeLists.txt:
  • DerivedSources.make:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • builtins/AsyncFromSyncIteratorPrototype.js: Added.

(next.try):
(next):
(return.try):
(return):
(throw.try):
(throw):
(globalPrivate.createAsyncFromSyncIterator):
(globalPrivate.AsyncFromSyncIteratorConstructor):

  • builtins/AsyncGeneratorPrototype.js: Added.

(globalPrivate.createAsyncGeneratorQueue):
(globalPrivate.asyncGeneratorQueueIsEmpty):
(globalPrivate.asyncGeneratorQueueCreateItem):
(globalPrivate.asyncGeneratorQueueEnqueue):
(globalPrivate.asyncGeneratorQueueDequeue):
(globalPrivate.asyncGeneratorQueueGetFirstValue):
(globalPrivate.asyncGeneratorDequeue):
(globalPrivate.isExecutionState):
(globalPrivate.isSuspendYieldState):
(globalPrivate.asyncGeneratorReject):
(globalPrivate.asyncGeneratorResolve):
(asyncGeneratorYieldAwaited):
(globalPrivate.asyncGeneratorYield):
(const.onRejected):
(globalPrivate.awaitValue):
(const.onFulfilled):
(globalPrivate.doAsyncGeneratorBodyCall):
(globalPrivate.asyncGeneratorResumeNext.):
(globalPrivate.asyncGeneratorResumeNext):
(globalPrivate.asyncGeneratorEnqueue):
(next):
(return):
(throw):

  • builtins/AsyncIteratorPrototype.js: Added.

(symbolAsyncIteratorGetter):

  • builtins/BuiltinNames.h:
  • bytecode/BytecodeDumper.cpp:

(JSC::BytecodeDumper<Block>::dumpBytecode):

  • bytecode/BytecodeIntrinsicRegistry.cpp:

(JSC::BytecodeIntrinsicRegistry::BytecodeIntrinsicRegistry):

  • bytecode/BytecodeIntrinsicRegistry.h:
  • bytecode/BytecodeList.json:
  • bytecode/BytecodeUseDef.h:

(JSC::computeUsesForBytecodeOffset):
(JSC::computeDefsForBytecodeOffset):

  • bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::emitCreateAsyncGeneratorQueue):
(JSC::BytecodeGenerator::emitPutAsyncGeneratorFields):
(JSC::BytecodeGenerator::emitNewFunctionExpressionCommon):
(JSC::BytecodeGenerator::emitNewFunction):
(JSC::BytecodeGenerator::emitIteratorNextWithValue):
(JSC::BytecodeGenerator::emitIteratorClose):
(JSC::BytecodeGenerator::emitYieldPoint):
(JSC::BytecodeGenerator::emitYield):
(JSC::BytecodeGenerator::emitCallIterator):
(JSC::BytecodeGenerator::emitAwait):
(JSC::BytecodeGenerator::emitGetIterator):
(JSC::BytecodeGenerator::emitGetAsyncIterator):
(JSC::BytecodeGenerator::emitDelegateYield):

  • bytecompiler/BytecodeGenerator.h:
  • bytecompiler/NodesCodegen.cpp:

(JSC::ReturnNode::emitBytecode):
(JSC::FunctionNode::emitBytecode):
(JSC::YieldExprNode::emitBytecode):
(JSC::AwaitExprNode::emitBytecode):

  • dfg/DFGAbstractInterpreterInlines.h:

(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):

  • dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::parseBlock):

  • dfg/DFGCapabilities.cpp:

(JSC::DFG::capabilityLevel):

  • dfg/DFGClobberize.h:

(JSC::DFG::clobberize):

  • dfg/DFGClobbersExitState.cpp:

(JSC::DFG::clobbersExitState):

  • dfg/DFGDoesGC.cpp:

(JSC::DFG::doesGC):

  • dfg/DFGFixupPhase.cpp:

(JSC::DFG::FixupPhase::fixupNode):

  • dfg/DFGMayExit.cpp:
  • dfg/DFGNode.h:

(JSC::DFG::Node::convertToPhantomNewFunction):
(JSC::DFG::Node::convertToPhantomNewAsyncGeneratorFunction):
(JSC::DFG::Node::hasCellOperand):
(JSC::DFG::Node::isFunctionAllocation):
(JSC::DFG::Node::isPhantomFunctionAllocation):
(JSC::DFG::Node::isPhantomAllocation):

  • dfg/DFGNodeType.h:
  • dfg/DFGObjectAllocationSinkingPhase.cpp:
  • dfg/DFGPredictionPropagationPhase.cpp:
  • dfg/DFGSafeToExecute.h:

(JSC::DFG::safeToExecute):

  • dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileNewFunction):

  • dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

  • dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

  • dfg/DFGStoreBarrierInsertionPhase.cpp:
  • dfg/DFGValidate.cpp:
  • ftl/FTLCapabilities.cpp:

(JSC::FTL::canCompile):

  • ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::compileNode):
(JSC::FTL::DFG::LowerDFGToB3::compileNewFunction):

  • ftl/FTLOperations.cpp:

(JSC::FTL::operationPopulateObjectInOSR):
(JSC::FTL::operationMaterializeObjectInOSR):

  • jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):

  • jit/JIT.h:
  • jit/JITOpcodes.cpp:

(JSC::JIT::emitNewFuncCommon):
(JSC::JIT::emit_op_new_async_generator_func):
(JSC::JIT::emit_op_new_async_func):
(JSC::JIT::emitNewFuncExprCommon):
(JSC::JIT::emit_op_new_async_generator_func_exp):

  • jit/JITOperations.cpp:
  • jit/JITOperations.h:
  • llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

  • llint/LLIntSlowPaths.h:
  • llint/LowLevelInterpreter.asm:
  • parser/ASTBuilder.h:

(JSC::ASTBuilder::createFunctionMetadata):

  • runtime/AsyncFromSyncIteratorPrototype.cpp: Added.

(JSC::AsyncFromSyncIteratorPrototype::AsyncFromSyncIteratorPrototype):
(JSC::AsyncFromSyncIteratorPrototype::finishCreation):
(JSC::AsyncFromSyncIteratorPrototype::create):

  • runtime/AsyncFromSyncIteratorPrototype.h: Added.

(JSC::AsyncFromSyncIteratorPrototype::createStructure):

  • runtime/AsyncGeneratorFunctionConstructor.cpp: Added.

(JSC::AsyncGeneratorFunctionConstructor::AsyncGeneratorFunctionConstructor):
(JSC::AsyncGeneratorFunctionConstructor::finishCreation):
(JSC::callAsyncGeneratorFunctionConstructor):
(JSC::constructAsyncGeneratorFunctionConstructor):
(JSC::AsyncGeneratorFunctionConstructor::getCallData):
(JSC::AsyncGeneratorFunctionConstructor::getConstructData):

  • runtime/AsyncGeneratorFunctionConstructor.h: Added.

(JSC::AsyncGeneratorFunctionConstructor::create):
(JSC::AsyncGeneratorFunctionConstructor::createStructure):

  • runtime/AsyncGeneratorFunctionPrototype.cpp: Added.

(JSC::AsyncGeneratorFunctionPrototype::AsyncGeneratorFunctionPrototype):
(JSC::AsyncGeneratorFunctionPrototype::finishCreation):

  • runtime/AsyncGeneratorFunctionPrototype.h: Added.

(JSC::AsyncGeneratorFunctionPrototype::create):
(JSC::AsyncGeneratorFunctionPrototype::createStructure):

  • runtime/AsyncGeneratorPrototype.cpp: Added.

(JSC::AsyncGeneratorPrototype::finishCreation):

  • runtime/AsyncGeneratorPrototype.h: Added.

(JSC::AsyncGeneratorPrototype::create):
(JSC::AsyncGeneratorPrototype::createStructure):
(JSC::AsyncGeneratorPrototype::AsyncGeneratorPrototype):

  • runtime/AsyncIteratorPrototype.cpp: Added.

(JSC::AsyncIteratorPrototype::finishCreation):

  • runtime/AsyncIteratorPrototype.h: Added.

(JSC::AsyncIteratorPrototype::create):
(JSC::AsyncIteratorPrototype::createStructure):
(JSC::AsyncIteratorPrototype::AsyncIteratorPrototype):

  • runtime/CommonIdentifiers.h:
  • runtime/FunctionConstructor.cpp:

(JSC::constructFunctionSkippingEvalEnabledCheck):

  • runtime/FunctionConstructor.h:
  • runtime/FunctionExecutable.h:
  • runtime/JSAsyncGeneratorFunction.cpp: Added.

(JSC::JSAsyncGeneratorFunction::JSAsyncGeneratorFunction):
(JSC::JSAsyncGeneratorFunction::createImpl):
(JSC::JSAsyncGeneratorFunction::create):
(JSC::JSAsyncGeneratorFunction::createWithInvalidatedReallocationWatchpoint):

  • runtime/JSAsyncGeneratorFunction.h: Added.

(JSC::JSAsyncGeneratorFunction::allocationSize):
(JSC::JSAsyncGeneratorFunction::createStructure):

  • runtime/JSFunction.cpp:

(JSC::JSFunction::getOwnPropertySlot):

  • runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::init):
(JSC::JSGlobalObject::visitChildren):

  • runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::asyncIteratorPrototype const):
(JSC::JSGlobalObject::asyncGeneratorPrototype const):
(JSC::JSGlobalObject::asyncGeneratorFunctionPrototype const):
(JSC::JSGlobalObject::asyncGeneratorFunctionStructure const):

  • runtime/Options.h:

LayoutTests:

  • js/Object-getOwnPropertyNames-expected.txt:
  • js/script-tests/Object-getOwnPropertyNames.js:
Location:
trunk
Files:
21 added
57 edited

Legend:

Unmodified
Added
Removed

  • trunk/JSTests/ChangeLog

    r221078 r221080  
     12017-08-23  Skachkov Oleksandr  <gskachkov@gmail.com>
     2
     3        [ESNext] Async iteration - Implement Async Generator - runtime
     4        https://bugs.webkit.org/show_bug.cgi?id=175240
     5
     6        Reviewed by Yusuke Suzuki.
     7
     8        * stress/async-iteration-async-from-sync.js: Added.
     9        (assert):
     10        (const.Logger):
     11        (this.fullfilled):
     12        (this.fullfilledDone):
     13        (this.rejected):
     14        (this.catched):
     15        (this.isFinal):
     16        (_assertLogger):
     17        (const.assertLogger):
     18        (const.getPromise.promiseHolder.return.new.Promise):
     19        (foo):
     20        (async.boo):
     21        (bar):
     22        (async.baz):
     23        (async.goo):
     24        * stress/async-iteration-basic.js: Added.
     25        (assert):
     26        (const.Logger):
     27        (this.fullfilled):
     28        (this.fullfilledDone):
     29        (this.rejected):
     30        (this.catched):
     31        (this.isFinal):
     32        (_assertLogger):
     33        (const.assertLogger):
     34        (const.getPromise.promiseHolder.return.new.Promise):
     35        (async.generator):
     36        (iterator.next.then):
     37        (async.baz):
     38        (async.boo):
     39        (async.foo):
     40        (async.goo):
     41        (A.prototype.async.foo):
     42        (A.prototype.async.boo):
     43        (A):
     44        (asyncGenExp.async):
     45        (async.joo):
     46        (j.next.then):
     47        (then):
     48        (async.koo):
     49        (async.loo):
     50        (async.moo):
     51        (async.noo):
     52        (async.ooo):
     53        (async.roo):
     54        (async.poo):
     55        (async.soo):
     56        (async.too):
     57        * stress/async-iteration-evaluation.js: Added.
     58        (assert):
     59        (async.foo):
     60        (catch):
     61        * stress/async-iteration-syntax.js:
     62        * stress/async-iteration-yield-promise.js: Added.
     63        (assert):
     64        (const.Logger):
     65        (this.fullfilled):
     66        (this.fullfilledDone):
     67        (this.rejected):
     68        (this.catched):
     69        (this.isFinal):
     70        (_assertLogger):
     71        (const.assertLogger):
     72        (const.getPromise.promiseHolder.return.new.Promise):
     73        (async.foo):
     74        (async.boo):
     75        (async.bar):
     76        * stress/async-iteration-yield-star-interface.js: Added.
     77        (assert):
     78        (const.getPromise.promiseHolder.return.new.Promise):
     79        (const.Logger):
     80        (this.fullfilled):
     81        (this.fullfilledDone):
     82        (this.rejected):
     83        (this.catched):
     84        (this.custom):
     85        (this.isFinal):
     86        (_assertLogger):
     87        (const.assertLogger):
     88        (let.asyncIter.Symbol.asyncIterator):
     89        (let.asyncIter.next):
     90        (let.asyncIter.throw):
     91        (let.asyncIter.return):
     92        (async.foo):
     93        (asyncIter.Symbol.asyncIterator):
     94        (asyncIter.next):
     95        (async.boo):
     96        (asyncIter.return):
     97        (async.bar):
     98        (async.baz):
     99        (async.foobar):
     100        * stress/async-iteration-yield-star.js: Added.
     101        (assert):
     102        (const.Logger):
     103        (this.fullfilled):
     104        (this.fullfilledDone):
     105        (this.rejected):
     106        (this.catched):
     107        (this.custom):
     108        (this.isFinal):
     109        (_assertLogger):
     110        (const.assertLogger):
     111        (const.getPromise.promiseHolder.return.new.Promise):
     112        (async.foo):
     113        (async.boo):
     114        (async.bar):
     115        (async.baz):
     116        (async.joo):
     117        (async.goo):
     118        (async.koo):
     119        (async.loo):
     120        (let.asyncIter.Symbol.asyncIterator):
     121        (let.asyncIter.next):
     122        (let.asyncIter.throw):
     123        (let.asyncIter.return):
     124        (async.moo):
     125        (async.noo):
     126        * test262.yaml:
     127
    11282017-08-23  JF Bastien  <jfbastien@apple.com>
    2129

  • trunk/JSTests/stress/async-iteration-syntax.js

    r220449 r221080  
    1 // This test requires enableAsyncIterator to be enabled at run time.
    2 //@ skip
    3 
    4 
    51var assert = function (result, expected, message = "") {
    62  if (result !== expected) {
    … …  
    84  }
    95};
    10 
    116
    127function checkSyntax(src) {

  • trunk/JSTests/test262.yaml

    r220415 r221080  
    7287172871  cmd: runTest262 :normal, "SyntaxError", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
    7287272872- path: test262/test/language/statements/async-function/early-errors-no-async-generator.js
    72873   cmd: runTest262 :normal, "SyntaxError", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
     72873  cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
    7287472874- path: test262/test/language/statements/async-function/early-errors-no-async-generator.js
    72875   cmd: runTest262 :normal, "SyntaxError", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
     72875  cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
    7287672876- path: test262/test/language/statements/async-function/evaluation-body-that-returns-after-await.js
    7287772877  cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js", "../../../../harness/doneprintHandle.js"], [:async]

  • trunk/LayoutTests/ChangeLog

    r221077 r221080  
     12017-08-23  Skachkov Oleksandr  <gskachkov@gmail.com>
     2
     3        [ESNext] Async iteration - Implement Async Generator - runtime
     4        https://bugs.webkit.org/show_bug.cgi?id=175240
     5
     6        Reviewed by Yusuke Suzuki.
     7
     8        * js/Object-getOwnPropertyNames-expected.txt:
     9        * js/script-tests/Object-getOwnPropertyNames.js:
     10
    1112017-08-23  Brent Fulgham  <bfulgham@apple.com>
    212

  • trunk/LayoutTests/js/Object-getOwnPropertyNames-expected.txt

    r215400 r221080  
    6363PASS getSortedOwnPropertyNames(Math) is ['E','LN10','LN2','LOG10E','LOG2E','PI','SQRT1_2','SQRT2','abs','acos','acosh','asin','asinh','atan','atan2','atanh','cbrt','ceil','clz32','cos','cosh','exp','expm1','floor','fround','hypot','imul','log','log10','log1p','log2','max','min','pow','random','round','sign','sin','sinh','sqrt','tan','tanh','trunc']
    6464PASS getSortedOwnPropertyNames(JSON) is ['parse', 'stringify']
    65 PASS getSortedOwnPropertyNames(Symbol) is ['for', 'hasInstance', 'isConcatSpreadable', 'iterator', 'keyFor', 'length', 'match', 'name', 'prototype', 'replace', 'search', 'species', 'split', 'toPrimitive', 'toStringTag', 'unscopables']
     65PASS getSortedOwnPropertyNames(Symbol) is ['asyncIterator','for', 'hasInstance', 'isConcatSpreadable', 'iterator', 'keyFor', 'length', 'match', 'name', 'prototype', 'replace', 'search', 'species', 'split', 'toPrimitive', 'toStringTag', 'unscopables']
    6666PASS getSortedOwnPropertyNames(Symbol.prototype) is ['constructor', 'toString', 'valueOf']
    6767PASS getSortedOwnPropertyNames(Map) is ['length', 'name', 'prototype']

  • trunk/LayoutTests/js/script-tests/Object-getOwnPropertyNames.js

    r215400 r221080  
    7272    "Math": "['E','LN10','LN2','LOG10E','LOG2E','PI','SQRT1_2','SQRT2','abs','acos','acosh','asin','asinh','atan','atan2','atanh','cbrt','ceil','clz32','cos','cosh','exp','expm1','floor','fround','hypot','imul','log','log10','log1p','log2','max','min','pow','random','round','sign','sin','sinh','sqrt','tan','tanh','trunc']",
    7373    "JSON": "['parse', 'stringify']",
    74     "Symbol": "['for', 'hasInstance', 'isConcatSpreadable', 'iterator', 'keyFor', 'length', 'match', 'name', 'prototype', 'replace', 'search', 'species', 'split', 'toPrimitive', 'toStringTag', 'unscopables']",
     74    "Symbol": "['asyncIterator','for', 'hasInstance', 'isConcatSpreadable', 'iterator', 'keyFor', 'length', 'match', 'name', 'prototype', 'replace', 'search', 'species', 'split', 'toPrimitive', 'toStringTag', 'unscopables']",
    7575    "Symbol.prototype": "['constructor', 'toString', 'valueOf']",
    7676    "Map": "['length', 'name', 'prototype']",

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r221021 r221080  
    691691    runtime/ArrayIteratorPrototype.cpp
    692692    runtime/ArrayPrototype.cpp
     693    runtime/AsyncFromSyncIteratorPrototype.cpp
     694    runtime/AsyncGeneratorFunctionConstructor.cpp
     695    runtime/AsyncGeneratorFunctionPrototype.cpp
     696    runtime/AsyncGeneratorPrototype.cpp
     697    runtime/AsyncIteratorPrototype.cpp
    693698    runtime/AtomicsObject.cpp
    694699    runtime/AsyncFunctionConstructor.cpp
    … …  
    780785    runtime/JSArrayBufferView.cpp
    781786    runtime/JSAsyncFunction.cpp
     787    runtime/JSAsyncGeneratorFunction.cpp
    782788    runtime/JSBoundFunction.cpp
    783789    runtime/JSCJSValue.cpp
    … …  
    10231029    runtime/ArrayConstructor.cpp
    10241030    runtime/ArrayIteratorPrototype.cpp
     1031    runtime/AsyncGeneratorPrototype.cpp
    10251032    runtime/BooleanPrototype.cpp
    10261033    runtime/DateConstructor.cpp
    … …  
    14541461
    14551462set(JavaScriptCore_BUILTINS_SOURCES
     1463    ${JAVASCRIPTCORE_DIR}/builtins/AsyncFromSyncIteratorPrototype.js
    14561464    ${JAVASCRIPTCORE_DIR}/builtins/ArrayConstructor.js
    14571465    ${JAVASCRIPTCORE_DIR}/builtins/ArrayIteratorPrototype.js
    14581466    ${JAVASCRIPTCORE_DIR}/builtins/ArrayPrototype.js
    14591467    ${JAVASCRIPTCORE_DIR}/builtins/AsyncFunctionPrototype.js
     1468    ${JAVASCRIPTCORE_DIR}/builtins/AsyncIteratorPrototype.js
     1469    ${JAVASCRIPTCORE_DIR}/builtins/AsyncGeneratorPrototype.js
    14601470    ${JAVASCRIPTCORE_DIR}/builtins/DatePrototype.js
    14611471    ${JAVASCRIPTCORE_DIR}/builtins/FunctionPrototype.js

  • trunk/Source/JavaScriptCore/ChangeLog

    r221052 r221080  
     12017-08-23  Skachkov Oleksandr  <gskachkov@gmail.com>
     2
     3        [ESNext] Async iteration - Implement Async Generator - runtime
     4        https://bugs.webkit.org/show_bug.cgi?id=175240
     5
     6        Reviewed by Yusuke Suzuki.
     7
     8        Current implementation is draft version of Async Iteration.
     9        Link to spec https://tc39.github.io/proposal-async-iteration/
     10       
     11        To implement async generator added new states that show reason why async generator was suspended:
     12        # yield - return promise with result
     13        # await - wait until promise will be resolved and then continue
     14       
     15        The main difference between async function and async generator is that,
     16        async function returns promise but async generator returns
     17        object with methods (next, throw and return) that return promise that
     18        can be resolved with pair of properties value and done.
     19        Async generator functions are similar to generator functions, with the following differences:
     20        # When called, async generator functions return an object, an async generator
     21        whose methods (next, throw, and return) return promises for { value, done },
     22        instead of directly returning { value, done }.
     23        This automatically makes the returned async generator objects async iterators.
     24        # await expressions and for-await-of statements are allowed.
     25        # The behavior of yield* is modified to support
     26          delegation to sync and async iterables
     27
     28        * CMakeLists.txt:
     29        * DerivedSources.make:
     30        * JavaScriptCore.xcodeproj/project.pbxproj:
     31        * builtins/AsyncFromSyncIteratorPrototype.js: Added.
     32        (next.try):
     33        (next):
     34        (return.try):
     35        (return):
     36        (throw.try):
     37        (throw):
     38        (globalPrivate.createAsyncFromSyncIterator):
     39        (globalPrivate.AsyncFromSyncIteratorConstructor):
     40        * builtins/AsyncGeneratorPrototype.js: Added.
     41        (globalPrivate.createAsyncGeneratorQueue):
     42        (globalPrivate.asyncGeneratorQueueIsEmpty):
     43        (globalPrivate.asyncGeneratorQueueCreateItem):
     44        (globalPrivate.asyncGeneratorQueueEnqueue):
     45        (globalPrivate.asyncGeneratorQueueDequeue):
     46        (globalPrivate.asyncGeneratorQueueGetFirstValue):
     47        (globalPrivate.asyncGeneratorDequeue):
     48        (globalPrivate.isExecutionState):
     49        (globalPrivate.isSuspendYieldState):
     50        (globalPrivate.asyncGeneratorReject):
     51        (globalPrivate.asyncGeneratorResolve):
     52        (asyncGeneratorYieldAwaited):
     53        (globalPrivate.asyncGeneratorYield):
     54        (const.onRejected):
     55        (globalPrivate.awaitValue):
     56        (const.onFulfilled):
     57        (globalPrivate.doAsyncGeneratorBodyCall):
     58        (globalPrivate.asyncGeneratorResumeNext.):
     59        (globalPrivate.asyncGeneratorResumeNext):
     60        (globalPrivate.asyncGeneratorEnqueue):
     61        (next):
     62        (return):
     63        (throw):
     64        * builtins/AsyncIteratorPrototype.js: Added.
     65        (symbolAsyncIteratorGetter):
     66        * builtins/BuiltinNames.h:
     67        * bytecode/BytecodeDumper.cpp:
     68        (JSC::BytecodeDumper<Block>::dumpBytecode):
     69        * bytecode/BytecodeIntrinsicRegistry.cpp:
     70        (JSC::BytecodeIntrinsicRegistry::BytecodeIntrinsicRegistry):
     71        * bytecode/BytecodeIntrinsicRegistry.h:
     72        * bytecode/BytecodeList.json:
     73        * bytecode/BytecodeUseDef.h:
     74        (JSC::computeUsesForBytecodeOffset):
     75        (JSC::computeDefsForBytecodeOffset):
     76        * bytecompiler/BytecodeGenerator.cpp:
     77        (JSC::BytecodeGenerator::BytecodeGenerator):
     78        (JSC::BytecodeGenerator::emitCreateAsyncGeneratorQueue):
     79        (JSC::BytecodeGenerator::emitPutAsyncGeneratorFields):
     80        (JSC::BytecodeGenerator::emitNewFunctionExpressionCommon):
     81        (JSC::BytecodeGenerator::emitNewFunction):
     82        (JSC::BytecodeGenerator::emitIteratorNextWithValue):
     83        (JSC::BytecodeGenerator::emitIteratorClose):
     84        (JSC::BytecodeGenerator::emitYieldPoint):
     85        (JSC::BytecodeGenerator::emitYield):
     86        (JSC::BytecodeGenerator::emitCallIterator):
     87        (JSC::BytecodeGenerator::emitAwait):
     88        (JSC::BytecodeGenerator::emitGetIterator):
     89        (JSC::BytecodeGenerator::emitGetAsyncIterator):
     90        (JSC::BytecodeGenerator::emitDelegateYield):
     91        * bytecompiler/BytecodeGenerator.h:
     92        * bytecompiler/NodesCodegen.cpp:
     93        (JSC::ReturnNode::emitBytecode):
     94        (JSC::FunctionNode::emitBytecode):
     95        (JSC::YieldExprNode::emitBytecode):
     96        (JSC::AwaitExprNode::emitBytecode):
     97        * dfg/DFGAbstractInterpreterInlines.h:
     98        (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
     99        * dfg/DFGByteCodeParser.cpp:
     100        (JSC::DFG::ByteCodeParser::parseBlock):
     101        * dfg/DFGCapabilities.cpp:
     102        (JSC::DFG::capabilityLevel):
     103        * dfg/DFGClobberize.h:
     104        (JSC::DFG::clobberize):
     105        * dfg/DFGClobbersExitState.cpp:
     106        (JSC::DFG::clobbersExitState):
     107        * dfg/DFGDoesGC.cpp:
     108        (JSC::DFG::doesGC):
     109        * dfg/DFGFixupPhase.cpp:
     110        (JSC::DFG::FixupPhase::fixupNode):
     111        * dfg/DFGMayExit.cpp:
     112        * dfg/DFGNode.h:
     113        (JSC::DFG::Node::convertToPhantomNewFunction):
     114        (JSC::DFG::Node::convertToPhantomNewAsyncGeneratorFunction):
     115        (JSC::DFG::Node::hasCellOperand):
     116        (JSC::DFG::Node::isFunctionAllocation):
     117        (JSC::DFG::Node::isPhantomFunctionAllocation):
     118        (JSC::DFG::Node::isPhantomAllocation):
     119        * dfg/DFGNodeType.h:
     120        * dfg/DFGObjectAllocationSinkingPhase.cpp:
     121        * dfg/DFGPredictionPropagationPhase.cpp:
     122        * dfg/DFGSafeToExecute.h:
     123        (JSC::DFG::safeToExecute):
     124        * dfg/DFGSpeculativeJIT.cpp:
     125        (JSC::DFG::SpeculativeJIT::compileNewFunction):
     126        * dfg/DFGSpeculativeJIT32_64.cpp:
     127        (JSC::DFG::SpeculativeJIT::compile):
     128        * dfg/DFGSpeculativeJIT64.cpp:
     129        (JSC::DFG::SpeculativeJIT::compile):
     130        * dfg/DFGStoreBarrierInsertionPhase.cpp:
     131        * dfg/DFGValidate.cpp:
     132        * ftl/FTLCapabilities.cpp:
     133        (JSC::FTL::canCompile):
     134        * ftl/FTLLowerDFGToB3.cpp:
     135        (JSC::FTL::DFG::LowerDFGToB3::compileNode):
     136        (JSC::FTL::DFG::LowerDFGToB3::compileNewFunction):
     137        * ftl/FTLOperations.cpp:
     138        (JSC::FTL::operationPopulateObjectInOSR):
     139        (JSC::FTL::operationMaterializeObjectInOSR):
     140        * jit/JIT.cpp:
     141        (JSC::JIT::privateCompileMainPass):
     142        * jit/JIT.h:
     143        * jit/JITOpcodes.cpp:
     144        (JSC::JIT::emitNewFuncCommon):
     145        (JSC::JIT::emit_op_new_async_generator_func):
     146        (JSC::JIT::emit_op_new_async_func):
     147        (JSC::JIT::emitNewFuncExprCommon):
     148        (JSC::JIT::emit_op_new_async_generator_func_exp):
     149        * jit/JITOperations.cpp:
     150        * jit/JITOperations.h:
     151        * llint/LLIntSlowPaths.cpp:
     152        (JSC::LLInt::LLINT_SLOW_PATH_DECL):
     153        * llint/LLIntSlowPaths.h:
     154        * llint/LowLevelInterpreter.asm:
     155        * parser/ASTBuilder.h:
     156        (JSC::ASTBuilder::createFunctionMetadata):
     157        * runtime/AsyncFromSyncIteratorPrototype.cpp: Added.
     158        (JSC::AsyncFromSyncIteratorPrototype::AsyncFromSyncIteratorPrototype):
     159        (JSC::AsyncFromSyncIteratorPrototype::finishCreation):
     160        (JSC::AsyncFromSyncIteratorPrototype::create):
     161        * runtime/AsyncFromSyncIteratorPrototype.h: Added.
     162        (JSC::AsyncFromSyncIteratorPrototype::createStructure):
     163        * runtime/AsyncGeneratorFunctionConstructor.cpp: Added.
     164        (JSC::AsyncGeneratorFunctionConstructor::AsyncGeneratorFunctionConstructor):
     165        (JSC::AsyncGeneratorFunctionConstructor::finishCreation):
     166        (JSC::callAsyncGeneratorFunctionConstructor):
     167        (JSC::constructAsyncGeneratorFunctionConstructor):
     168        (JSC::AsyncGeneratorFunctionConstructor::getCallData):
     169        (JSC::AsyncGeneratorFunctionConstructor::getConstructData):
     170        * runtime/AsyncGeneratorFunctionConstructor.h: Added.
     171        (JSC::AsyncGeneratorFunctionConstructor::create):
     172        (JSC::AsyncGeneratorFunctionConstructor::createStructure):
     173        * runtime/AsyncGeneratorFunctionPrototype.cpp: Added.
     174        (JSC::AsyncGeneratorFunctionPrototype::AsyncGeneratorFunctionPrototype):
     175        (JSC::AsyncGeneratorFunctionPrototype::finishCreation):
     176        * runtime/AsyncGeneratorFunctionPrototype.h: Added.
     177        (JSC::AsyncGeneratorFunctionPrototype::create):
     178        (JSC::AsyncGeneratorFunctionPrototype::createStructure):
     179        * runtime/AsyncGeneratorPrototype.cpp: Added.
     180        (JSC::AsyncGeneratorPrototype::finishCreation):
     181        * runtime/AsyncGeneratorPrototype.h: Added.
     182        (JSC::AsyncGeneratorPrototype::create):
     183        (JSC::AsyncGeneratorPrototype::createStructure):
     184        (JSC::AsyncGeneratorPrototype::AsyncGeneratorPrototype):
     185        * runtime/AsyncIteratorPrototype.cpp: Added.
     186        (JSC::AsyncIteratorPrototype::finishCreation):
     187        * runtime/AsyncIteratorPrototype.h: Added.
     188        (JSC::AsyncIteratorPrototype::create):
     189        (JSC::AsyncIteratorPrototype::createStructure):
     190        (JSC::AsyncIteratorPrototype::AsyncIteratorPrototype):
     191        * runtime/CommonIdentifiers.h:
     192        * runtime/FunctionConstructor.cpp:
     193        (JSC::constructFunctionSkippingEvalEnabledCheck):
     194        * runtime/FunctionConstructor.h:
     195        * runtime/FunctionExecutable.h:
     196        * runtime/JSAsyncGeneratorFunction.cpp: Added.
     197        (JSC::JSAsyncGeneratorFunction::JSAsyncGeneratorFunction):
     198        (JSC::JSAsyncGeneratorFunction::createImpl):
     199        (JSC::JSAsyncGeneratorFunction::create):
     200        (JSC::JSAsyncGeneratorFunction::createWithInvalidatedReallocationWatchpoint):
     201        * runtime/JSAsyncGeneratorFunction.h: Added.
     202        (JSC::JSAsyncGeneratorFunction::allocationSize):
     203        (JSC::JSAsyncGeneratorFunction::createStructure):
     204        * runtime/JSFunction.cpp:
     205        (JSC::JSFunction::getOwnPropertySlot):
     206        * runtime/JSGlobalObject.cpp:
     207        (JSC::JSGlobalObject::init):
     208        (JSC::JSGlobalObject::visitChildren):
     209        * runtime/JSGlobalObject.h:
     210        (JSC::JSGlobalObject::asyncIteratorPrototype const):
     211        (JSC::JSGlobalObject::asyncGeneratorPrototype const):
     212        (JSC::JSGlobalObject::asyncGeneratorFunctionPrototype const):
     213        (JSC::JSGlobalObject::asyncGeneratorFunctionStructure const):
     214        * runtime/Options.h:
     215
    12162017-08-22  Michael Saboff  <msaboff@apple.com>
    2217

  • trunk/Source/JavaScriptCore/DerivedSources.make

    r220753 r221080  
    9090
    9191JavaScriptCore_BUILTINS_SOURCES = \
     92    $(JavaScriptCore)/builtins/AsyncFromSyncIteratorPrototype.js \
    9293    $(JavaScriptCore)/builtins/ArrayConstructor.js \
    9394    $(JavaScriptCore)/builtins/ArrayIteratorPrototype.js \
    9495    $(JavaScriptCore)/builtins/ArrayPrototype.js \
     96    $(JavaScriptCore)/builtins/AsyncIteratorPrototype.js \
    9597    $(JavaScriptCore)/builtins/AsyncFunctionPrototype.js \
     98    $(JavaScriptCore)/builtins/AsyncGeneratorPrototype.js \
    9699    $(JavaScriptCore)/builtins/DatePrototype.js \
    97100    $(JavaScriptCore)/builtins/FunctionPrototype.js \
    … …  
    135138    ArrayConstructor.lut.h \
    136139    ArrayIteratorPrototype.lut.h \
     140    AsyncGeneratorPrototype.lut.h \
    137141    BooleanPrototype.lut.h \
    138142    DateConstructor.lut.h \

  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r221013 r221080  
    16751675                86FA9E91142BBB2E001773B7 /* JSBoundFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86FA9E8F142BBB2D001773B7 /* JSBoundFunction.cpp */; };
    16761676                86FA9E92142BBB2E001773B7 /* JSBoundFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 86FA9E90142BBB2E001773B7 /* JSBoundFunction.h */; };
     1677                8B3BF5E41E3D368B0076A87A /* AsyncGeneratorPrototype.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B3BF5E31E3D365A0076A87A /* AsyncGeneratorPrototype.lut.h */; };
     1678                8B6016F51F3E3CC000F9DE6A /* AsyncFromSyncIteratorPrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8B6016F31F3E3CC000F9DE6A /* AsyncFromSyncIteratorPrototype.cpp */; };
     1679                8B6016F61F3E3CC000F9DE6A /* AsyncFromSyncIteratorPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B6016F41F3E3CC000F9DE6A /* AsyncFromSyncIteratorPrototype.h */; };
    16771680                8B9F6D561D5912FA001C739F /* IterationKind.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B9F6D551D5912FA001C739F /* IterationKind.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1681                8BC064891E1ABA6400B2B8CA /* JSAsyncGeneratorFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BC064881E1A584000B2B8CA /* JSAsyncGeneratorFunction.h */; };
     1682                8BC0648A1E1ABA7B00B2B8CA /* AsyncGeneratorFunctionPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BC064861E1A4FD100B2B8CA /* AsyncGeneratorFunctionPrototype.h */; };
     1683                8BC0648B1E1ABA9400B2B8CA /* AsyncGeneratorFunctionConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BC064841E1A4FD100B2B8CA /* AsyncGeneratorFunctionConstructor.h */; };
     1684                8BC0648C1E1ABDFB00B2B8CA /* AsyncGeneratorFunctionConstructor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8BC064831E1A4FD000B2B8CA /* AsyncGeneratorFunctionConstructor.cpp */; };
     1685                8BC0648D1E1ABDFB00B2B8CA /* AsyncGeneratorFunctionPrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8BC064851E1A4FD100B2B8CA /* AsyncGeneratorFunctionPrototype.cpp */; };
     1686                8BC0648E1E1ABDFB00B2B8CA /* JSAsyncGeneratorFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8BC064871E1A583F00B2B8CA /* JSAsyncGeneratorFunction.cpp */; };
     1687                8BC064911E1ADC7900B2B8CA /* AsyncGeneratorPrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8BC0648F1E1AD6AC00B2B8CA /* AsyncGeneratorPrototype.cpp */; };
     1688                8BC064921E1ADCC400B2B8CA /* AsyncGeneratorPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BC064901E1AD6AC00B2B8CA /* AsyncGeneratorPrototype.h */; };
     1689                8BC064961E1D845C00B2B8CA /* AsyncIteratorPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BC064941E1D828B00B2B8CA /* AsyncIteratorPrototype.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1690                8BC064971E1D849900B2B8CA /* AsyncIteratorPrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8BC064931E1D828B00B2B8CA /* AsyncIteratorPrototype.cpp */; };
    16781691                90213E3D123A40C200D422F3 /* MemoryStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 90213E3B123A40C200D422F3 /* MemoryStatistics.cpp */; };
    16791692                90213E3E123A40C200D422F3 /* MemoryStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = 90213E3C123A40C200D422F3 /* MemoryStatistics.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    43134326                86FA9E90142BBB2E001773B7 /* JSBoundFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBoundFunction.h; sourceTree = "<group>"; };
    43144327                8852151A9C3842389B3215B7 /* ScriptFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptFetcher.h; sourceTree = "<group>"; };
     4328                8B1735EF1E92E52900369054 /* AsyncFromSyncIteratorPrototype.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = AsyncFromSyncIteratorPrototype.js; sourceTree = "<group>"; };
     4329                8B3BF5E31E3D365A0076A87A /* AsyncGeneratorPrototype.lut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncGeneratorPrototype.lut.h; sourceTree = "<group>"; };
    43154330                8B47F234366C4B72AC852A7E /* TemplateRegistryKeyTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TemplateRegistryKeyTable.cpp; sourceTree = "<group>"; };
     4331                8B6016F31F3E3CC000F9DE6A /* AsyncFromSyncIteratorPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncFromSyncIteratorPrototype.cpp; sourceTree = "<group>"; };
     4332                8B6016F41F3E3CC000F9DE6A /* AsyncFromSyncIteratorPrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncFromSyncIteratorPrototype.h; sourceTree = "<group>"; };
    43164333                8B9F6D551D5912FA001C739F /* IterationKind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IterationKind.h; sourceTree = "<group>"; };
     4334                8BC064821E180B4A00B2B8CA /* AsyncGeneratorPrototype.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = AsyncGeneratorPrototype.js; sourceTree = "<group>"; };
     4335                8BC064831E1A4FD000B2B8CA /* AsyncGeneratorFunctionConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncGeneratorFunctionConstructor.cpp; sourceTree = "<group>"; };
     4336                8BC064841E1A4FD100B2B8CA /* AsyncGeneratorFunctionConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncGeneratorFunctionConstructor.h; sourceTree = "<group>"; };
     4337                8BC064851E1A4FD100B2B8CA /* AsyncGeneratorFunctionPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncGeneratorFunctionPrototype.cpp; sourceTree = "<group>"; };
     4338                8BC064861E1A4FD100B2B8CA /* AsyncGeneratorFunctionPrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncGeneratorFunctionPrototype.h; sourceTree = "<group>"; };
     4339                8BC064871E1A583F00B2B8CA /* JSAsyncGeneratorFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAsyncGeneratorFunction.cpp; sourceTree = "<group>"; };
     4340                8BC064881E1A584000B2B8CA /* JSAsyncGeneratorFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = JSAsyncGeneratorFunction.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
     4341                8BC0648F1E1AD6AC00B2B8CA /* AsyncGeneratorPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncGeneratorPrototype.cpp; sourceTree = "<group>"; };
     4342                8BC064901E1AD6AC00B2B8CA /* AsyncGeneratorPrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncGeneratorPrototype.h; sourceTree = "<group>"; };
     4343                8BC064931E1D828B00B2B8CA /* AsyncIteratorPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncIteratorPrototype.cpp; sourceTree = "<group>"; };
     4344                8BC064941E1D828B00B2B8CA /* AsyncIteratorPrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncIteratorPrototype.h; sourceTree = "<group>"; };
     4345                8BC064951E1D838B00B2B8CA /* AsyncIteratorPrototype.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = AsyncIteratorPrototype.js; sourceTree = "<group>"; };
    43174346                90213E3B123A40C200D422F3 /* MemoryStatistics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryStatistics.cpp; sourceTree = "<group>"; };
    43184347                90213E3C123A40C200D422F3 /* MemoryStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryStatistics.h; sourceTree = "<group>"; };
    … …  
    63656394                                996B73151BDA05AA00331B84 /* ArrayConstructor.lut.h */,
    63666395                                996B73161BDA05AA00331B84 /* ArrayIteratorPrototype.lut.h */,
     6396                                8B3BF5E31E3D365A0076A87A /* AsyncGeneratorPrototype.lut.h */,
    63676397                                996B73071BD9FA2C00331B84 /* BooleanPrototype.lut.h */,
    63686398                                6514F21718B3E1670098FF8B /* Bytecodes.h */,
    … …  
    66116641                                F692A84E0255597D01FF60F7 /* ArrayPrototype.h */,
    66126642                                0FB7F38A15ED8E3800F167B2 /* ArrayStorage.h */,
     6643                                8B6016F31F3E3CC000F9DE6A /* AsyncFromSyncIteratorPrototype.cpp */,
     6644                                8B6016F41F3E3CC000F9DE6A /* AsyncFromSyncIteratorPrototype.h */,
    66136645                                5B70CFDD1DB69E5C00EC23F9 /* AsyncFunctionConstructor.cpp */,
    66146646                                5B70CFDC1DB69E5C00EC23F9 /* AsyncFunctionConstructor.h */,
    66156647                                5B70CFDB1DB69E5C00EC23F9 /* AsyncFunctionPrototype.cpp */,
    66166648                                5B70CFDA1DB69E5C00EC23F9 /* AsyncFunctionPrototype.h */,
     6649                                8BC064831E1A4FD000B2B8CA /* AsyncGeneratorFunctionConstructor.cpp */,
     6650                                8BC064841E1A4FD100B2B8CA /* AsyncGeneratorFunctionConstructor.h */,
     6651                                8BC064851E1A4FD100B2B8CA /* AsyncGeneratorFunctionPrototype.cpp */,
     6652                                8BC064861E1A4FD100B2B8CA /* AsyncGeneratorFunctionPrototype.h */,
     6653                                8BC0648F1E1AD6AC00B2B8CA /* AsyncGeneratorPrototype.cpp */,
     6654                                8BC064901E1AD6AC00B2B8CA /* AsyncGeneratorPrototype.h */,
     6655                                8BC064931E1D828B00B2B8CA /* AsyncIteratorPrototype.cpp */,
     6656                                8BC064941E1D828B00B2B8CA /* AsyncIteratorPrototype.h */,
    66176657                                0F7CF9541DC1258B0098CC12 /* AtomicsObject.cpp */,
    66186658                                0F7CF9551DC1258B0098CC12 /* AtomicsObject.h */,
    … …  
    68246864                                5B70CFD91DB69E5C00EC23F9 /* JSAsyncFunction.cpp */,
    68256865                                5B70CFD81DB69E5C00EC23F9 /* JSAsyncFunction.h */,
     6866                                8BC064871E1A583F00B2B8CA /* JSAsyncGeneratorFunction.cpp */,
     6867                                8BC064881E1A584000B2B8CA /* JSAsyncGeneratorFunction.h */,
    68266868                                86FA9E8F142BBB2D001773B7 /* JSBoundFunction.cpp */,
    68276869                                86FA9E90142BBB2E001773B7 /* JSBoundFunction.h */,
    … …  
    80708112                                7CF9BC591B65D9A3009DB1EF /* ArrayIteratorPrototype.js */,
    80718113                                A7D801A01880D66E0026C39B /* ArrayPrototype.js */,
     8114                                8B1735EF1E92E52900369054 /* AsyncFromSyncIteratorPrototype.js */,
    80728115                                5B8243041DB7AA4900EA6384 /* AsyncFunctionPrototype.js */,
     8116                                8BC064821E180B4A00B2B8CA /* AsyncGeneratorPrototype.js */,
     8117                                8BC064951E1D838B00B2B8CA /* AsyncIteratorPrototype.js */,
    80738118                                DE26E9061CB5DD9600D2BE82 /* BuiltinExecutableCreator.cpp */,
    80748119                                DE26E9021CB5DD0500D2BE82 /* BuiltinExecutableCreator.h */,
    … …  
    83398384                                0F24E54117EA9F5900ABB217 /* AssemblyHelpers.h in Headers */,
    83408385                                A784A26111D16622005776AC /* ASTBuilder.h in Headers */,
     8386                                8B6016F61F3E3CC000F9DE6A /* AsyncFromSyncIteratorPrototype.h in Headers */,
    83418387                                5B70CFE21DB69E6600EC23F9 /* AsyncFunctionConstructor.h in Headers */,
    83428388                                5B70CFE01DB69E6600EC23F9 /* AsyncFunctionPrototype.h in Headers */,
     8389                                8BC0648B1E1ABA9400B2B8CA /* AsyncGeneratorFunctionConstructor.h in Headers */,
     8390                                8BC0648A1E1ABA7B00B2B8CA /* AsyncGeneratorFunctionPrototype.h in Headers */,
     8391                                8BC064921E1ADCC400B2B8CA /* AsyncGeneratorPrototype.h in Headers */,
     8392                                8B3BF5E41E3D368B0076A87A /* AsyncGeneratorPrototype.lut.h in Headers */,
     8393                                8BC064961E1D845C00B2B8CA /* AsyncIteratorPrototype.h in Headers */,
    83438394                                6A38CFAA1E32B5AB0060206F /* AsyncStackTrace.h in Headers */,
    83448395                                0F7CF9571DC125900098CC12 /* AtomicsObject.h in Headers */,
    … …  
    86048655                                0FC3CD0019ADA410006AC72A /* DFGBlockWorklist.h in Headers */,
    86058656                                0F8364B7164B0C110053329A /* DFGBranchDirection.h in Headers */,
    8606                                 FE10AAEE1F44D954009DEDC5 /* ProbeContext.h in Headers */,
    86078657                                86EC9DC51328DF82002B2AD7 /* DFGByteCodeParser.h in Headers */,
    86088658                                0F256C361627B0AD007F2783 /* DFGCallArrayAllocatorSlowPathGenerator.h in Headers */,
    … …  
    90599109                                539FB8BA1C99DA7C00940FA1 /* JSArrayInlines.h in Headers */,
    90609110                                5B70CFDE1DB69E6600EC23F9 /* JSAsyncFunction.h in Headers */,
     9111                                8BC064891E1ABA6400B2B8CA /* JSAsyncGeneratorFunction.h in Headers */,
    90619112                                BC18C4180E16F5CD00B34460 /* JSBase.h in Headers */,
    90629113                                140D17D70E8AD4A9000CD17D /* JSBasePrivate.h in Headers */,
    … …  
    93449395                                FE63DD541EA9B61E00103A69 /* Printer.h in Headers */,
    93459396                                868916B0155F286300CB2B9A /* PrivateName.h in Headers */,
     9397                                FE10AAEE1F44D954009DEDC5 /* ProbeContext.h in Headers */,
     9398                                FE10AAEB1F44D528009DEDC5 /* ProbeStack.h in Headers */,
    93469399                                0FF729A5166AD351000F5BA3 /* ProfilerBytecode.h in Headers */,
    93479400                                0FF729B9166AD360000F5BA3 /* ProfilerBytecodes.h in Headers */,
    … …  
    96459698                                AD2FCC2D1DB838FD00B3E736 /* WebAssemblyPrototype.h in Headers */,
    96469699                                AD2FCBF91DB58DAD00B3E736 /* WebAssemblyRuntimeErrorConstructor.h in Headers */,
    9647                                 FE10AAEB1F44D528009DEDC5 /* ProbeStack.h in Headers */,
    96489700                                AD2FCC1E1DB59CB200B3E736 /* WebAssemblyRuntimeErrorConstructor.lut.h in Headers */,
    96499701                                AD2FCBFB1DB58DAD00B3E736 /* WebAssemblyRuntimeErrorPrototype.h in Headers */,
    … …  
    1024610298                                147F39C0107EC37600427A48 /* ArrayPrototype.cpp in Sources */,
    1024710299                                0F24E54017EA9F5900ABB217 /* AssemblyHelpers.cpp in Sources */,
     10300                                8B6016F51F3E3CC000F9DE6A /* AsyncFromSyncIteratorPrototype.cpp in Sources */,
    1024810301                                5B70CFE31DB69E6600EC23F9 /* AsyncFunctionConstructor.cpp in Sources */,
    1024910302                                5B70CFE11DB69E6600EC23F9 /* AsyncFunctionPrototype.cpp in Sources */,
     10303                                8BC0648C1E1ABDFB00B2B8CA /* AsyncGeneratorFunctionConstructor.cpp in Sources */,
     10304                                8BC0648D1E1ABDFB00B2B8CA /* AsyncGeneratorFunctionPrototype.cpp in Sources */,
     10305                                8BC064911E1ADC7900B2B8CA /* AsyncGeneratorPrototype.cpp in Sources */,
     10306                                8BC064971E1D849900B2B8CA /* AsyncIteratorPrototype.cpp in Sources */,
    1025010307                                6A38CFA91E32B5AB0060206F /* AsyncStackTrace.cpp in Sources */,
    1025110308                                0F7CF9561DC1258D0098CC12 /* AtomicsObject.cpp in Sources */,
    … …  
    1045610513                                86EC9DC71328DF82002B2AD7 /* DFGGraph.cpp in Sources */,
    1045710514                                0F2FCCF918A60070001A27F8 /* DFGGraphSafepoint.cpp in Sources */,
    10458                                 FE10AAF41F468396009DEDC5 /* ProbeContext.cpp in Sources */,
    1045910515                                0FB17660196B8F9E0091052A /* DFGHeapLocation.cpp in Sources */,
    1046010516                                0FC841681BA8C3210061837D /* DFGInferredTypeCheck.cpp in Sources */,
    … …  
    1073410790                                0F2B66E817B6B5AB00A7AE3F /* JSArrayBufferView.cpp in Sources */,
    1073510791                                5B70CFDF1DB69E6600EC23F9 /* JSAsyncFunction.cpp in Sources */,
     10792                                8BC0648E1E1ABDFB00B2B8CA /* JSAsyncGeneratorFunction.cpp in Sources */,
    1073610793                                1421359B0A677F4F00A8195E /* JSBase.cpp in Sources */,
    1073710794                                86FA9E91142BBB2E001773B7 /* JSBoundFunction.cpp in Sources */,
    … …  
    1074510802                                1440FCE40A51E46B0005F061 /* JSClassRef.cpp in Sources */,
    1074610803                                86E3C616167BABEE006D760A /* JSContext.mm in Sources */,
    10747                                 FE10AAEC1F44D545009DEDC5 /* ProbeStack.cpp in Sources */,
    1074810804                                14BD5A300A3E91F600BAF59C /* JSContextRef.cpp in Sources */,
    1074910805                                A72028B61797601E0098028C /* JSCTestRunnerUtils.cpp in Sources */,
    … …  
    1091810974                                0F98206016BFE38100240D02 /* PreciseJumpTargets.cpp in Sources */,
    1091910975                                FE63DD561EA9BC6700103A69 /* Printer.cpp in Sources */,
     10976                                FE10AAF41F468396009DEDC5 /* ProbeContext.cpp in Sources */,
     10977                                FE10AAEC1F44D545009DEDC5 /* ProbeStack.cpp in Sources */,
    1092010978                                0FF729AD166AD35C000F5BA3 /* ProfilerBytecode.cpp in Sources */,
    1092110979                                0FF729AE166AD35C000F5BA3 /* ProfilerBytecodes.cpp in Sources */,

  • trunk/Source/JavaScriptCore/builtins/BuiltinNames.h

    r220053 r221080  
    122122    macro(generatorValue) \
    123123    macro(generatorThis) \
     124    macro(syncIterator) \
     125    macro(asyncGeneratorState) \
     126    macro(asyncGeneratorSuspendReason) \
     127    macro(asyncGeneratorQueue) \
     128    macro(promiseCapability) \
    124129    macro(generatorResumeMode) \
    125130    macro(Collator) \

  • trunk/Source/JavaScriptCore/bytecode/BytecodeDumper.cpp

    r220735 r221080  
    13321332        break;
    13331333    }
     1334    case op_new_async_generator_func: {
     1335        int r0 = (++it)->u.operand;
     1336        int r1 = (++it)->u.operand;
     1337        int f0 = (++it)->u.operand;
     1338        printLocationAndOp(out, location, it, "new_async_generator_func");
     1339        out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
     1340        break;
     1341    }
    13341342    case op_new_func_exp: {
    13351343        int r0 = (++it)->u.operand;
    … …  
    13531361        int f0 = (++it)->u.operand;
    13541362        printLocationAndOp(out, location, it, "new_async_func_exp");
     1363        out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
     1364        break;
     1365    }
     1366    case op_new_async_generator_func_exp: {
     1367        int r0 = (++it)->u.operand;
     1368        int r1 = (++it)->u.operand;
     1369        int f0 = (++it)->u.operand;
     1370        printLocationAndOp(out, location, it, "op_new_async_generator_func_exp");
    13551371        out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
    13561372        break;

  • trunk/Source/JavaScriptCore/bytecode/BytecodeIntrinsicRegistry.cpp

    r220053 r221080  
    3232#include "BytecodeGenerator.h"
    3333#include "IterationKind.h"
     34#include "JSAsyncGeneratorFunction.h"
    3435#include "JSCJSValueInlines.h"
    3536#include "JSGeneratorFunction.h"
    … …  
    7475    m_GeneratorStateCompleted.set(m_vm, jsNumber(static_cast<int32_t>(JSGeneratorFunction::GeneratorState::Completed)));
    7576    m_GeneratorStateExecuting.set(m_vm, jsNumber(static_cast<int32_t>(JSGeneratorFunction::GeneratorState::Executing)));
     77    m_AsyncGeneratorStateCompleted.set(m_vm, jsNumber(static_cast<int32_t>(JSAsyncGeneratorFunction::AsyncGeneratorState::Completed)));
     78    m_AsyncGeneratorStateExecuting.set(m_vm, jsNumber(static_cast<int32_t>(JSAsyncGeneratorFunction::AsyncGeneratorState::Executing)));
     79    m_AsyncGeneratorStateSuspendedStart.set(m_vm, jsNumber(static_cast<int32_t>(JSAsyncGeneratorFunction::AsyncGeneratorState::SuspendedStart)));
     80    m_AsyncGeneratorStateSuspendedYield.set(m_vm, jsNumber(static_cast<int32_t>(JSAsyncGeneratorFunction::AsyncGeneratorState::SuspendedYield)));
     81    m_AsyncGeneratorStateAwaitingReturn.set(m_vm, jsNumber(static_cast<int32_t>(JSAsyncGeneratorFunction::AsyncGeneratorState::AwaitingReturn)));
     82    m_AsyncGeneratorSuspendReasonYield.set(m_vm, jsNumber(static_cast<int32_t>(JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason::Yield)));
     83    m_AsyncGeneratorSuspendReasonAwait.set(m_vm, jsNumber(static_cast<int32_t>(JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason::Await)));
     84    m_AsyncGeneratorSuspendReasonNone.set(m_vm, jsNumber(static_cast<int32_t>(JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason::None)));
    7685}
    7786

  • trunk/Source/JavaScriptCore/bytecode/BytecodeIntrinsicRegistry.h

    r220735 r221080  
    8686    macro(GeneratorStateCompleted) \
    8787    macro(GeneratorStateExecuting) \
    88 
     88    macro(AsyncGeneratorStateCompleted) \
     89    macro(AsyncGeneratorStateExecuting) \
     90    macro(AsyncGeneratorStateAwaitingReturn) \
     91    macro(AsyncGeneratorStateSuspendedStart) \
     92    macro(AsyncGeneratorStateSuspendedYield) \
     93    macro(AsyncGeneratorSuspendReasonYield) \
     94    macro(AsyncGeneratorSuspendReasonAwait) \
     95    macro(AsyncGeneratorSuspendReasonNone) \
    8996
    9097class BytecodeIntrinsicRegistry {

  • trunk/Source/JavaScriptCore/bytecode/BytecodeList.json

    r220753 r221080  
    122122            { "name" : "op_new_async_func", "length" : 4 },
    123123            { "name" : "op_new_async_func_exp", "length" : 4 },
     124            { "name" : "op_new_async_generator_func", "length" : 4 },
     125            { "name" : "op_new_async_generator_func_exp", "length" : 4 },
    124126            { "name" : "op_set_function_name", "length" : 3 },
    125127            { "name" : "op_call", "length" : 9 },

  • trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h

    r220735 r221080  
    202202    case op_unsigned:
    203203    case op_new_func:
     204    case op_new_async_generator_func:
     205    case op_new_async_generator_func_exp:
    204206    case op_new_generator_func:
    205207    case op_new_async_func:
    … …  
    402404    case op_new_generator_func:
    403405    case op_new_generator_func_exp:
     406    case op_new_async_generator_func:
     407    case op_new_async_generator_func_exp:
    404408    case op_new_async_func:
    405409    case op_new_async_func_exp:

  • trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

    r220852 r221080  
    3939#include "DefinePropertyAttributes.h"
    4040#include "Interpreter.h"
     41#include "JSAsyncGeneratorFunction.h"
    4142#include "JSCInlines.h"
    4243#include "JSFunction.h"
    … …  
    566567    switch (parseMode) {
    567568    case SourceParseMode::GeneratorWrapperFunctionMode:
    568     case SourceParseMode::GeneratorWrapperMethodMode: {
     569    case SourceParseMode::GeneratorWrapperMethodMode:
     570    case SourceParseMode::AsyncGeneratorWrapperMethodMode:
     571    case SourceParseMode::AsyncGeneratorWrapperFunctionMode: {
    569572        m_generatorRegister = addVar();
    570573
    … …  
    621624    }
    622625
     626    case SourceParseMode::AsyncGeneratorBodyMode:
    623627    case SourceParseMode::AsyncFunctionBodyMode:
    624628    case SourceParseMode::AsyncArrowFunctionBodyMode:
    … …  
    28562860}
    28572861
     2862RegisterID* BytecodeGenerator::emitCreateAsyncGeneratorQueue(const JSTextPosition& divot)
     2863{
     2864    auto varCreateAsyncGeneratorQueue = variable(propertyNames().builtinNames().createAsyncGeneratorQueuePrivateName());
     2865    RefPtr<RegisterID> scope = newTemporary();
     2866    RefPtr<RegisterID> queue = newTemporary();
     2867    moveToDestinationIfNeeded(scope.get(), emitResolveScope(scope.get(), varCreateAsyncGeneratorQueue));
     2868    RefPtr<RegisterID> createAsyncGeneratorQueue = emitGetFromScope(newTemporary(), scope.get(), varCreateAsyncGeneratorQueue, ThrowIfNotFound);
     2869
     2870    CallArguments args(*this, nullptr, 0);
     2871    emitLoad(args.thisRegister(), jsUndefined());
     2872
     2873    emitCall(queue.get(), createAsyncGeneratorQueue.get(), NoExpectedFunction, args, divot, divot, divot, DebuggableCall::No);
     2874
     2875    return queue.get();
     2876}
     2877
     2878void BytecodeGenerator::emitPutAsyncGeneratorFields(RegisterID* nextFunction, const JSTextPosition& divot)
     2879{
     2880    ASSERT(isAsyncGeneratorFunctionParseMode(parseMode()));
     2881
     2882    emitDirectPutById(m_generatorRegister, propertyNames().builtinNames().generatorNextPrivateName(), nextFunction, PropertyNode::KnownDirect);
     2883       
     2884    emitDirectPutById(m_generatorRegister, propertyNames().builtinNames().generatorThisPrivateName(), &m_thisRegister, PropertyNode::KnownDirect);
     2885       
     2886    emitDirectPutById(m_generatorRegister, propertyNames().builtinNames().generatorStatePrivateName(), emitLoad(nullptr, jsNumber(static_cast<int32_t>(JSAsyncGeneratorFunction::AsyncGeneratorState::SuspendedStart))), PropertyNode::KnownDirect);
     2887       
     2888    emitDirectPutById(m_generatorRegister, propertyNames().builtinNames().generatorFramePrivateName(), emitLoad(nullptr, jsNull()), PropertyNode::KnownDirect);
     2889
     2890    emitDirectPutById(m_generatorRegister, propertyNames().builtinNames().asyncGeneratorSuspendReasonPrivateName(), emitLoad(nullptr, jsNumber(static_cast<int32_t>(JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason::None))), PropertyNode::KnownDirect);
     2891
     2892
     2893    emitDirectPutById(m_generatorRegister, propertyNames().builtinNames().asyncGeneratorQueuePrivateName(), emitCreateAsyncGeneratorQueue(divot), PropertyNode::KnownDirect);
     2894}
     2895
    28582896RegisterID* BytecodeGenerator::emitDeleteById(RegisterID* dst, RegisterID* base, const Identifier& property)
    28592897{
    … …  
    32723310        opcodeID = op_new_async_func_exp;
    32733311        break;
     3312    case SourceParseMode::AsyncGeneratorWrapperFunctionMode:
     3313    case SourceParseMode::AsyncGeneratorWrapperMethodMode:
     3314        ASSERT(Options::useAsyncIterator());
     3315        opcodeID = op_new_async_generator_func_exp;
     3316        break;
    32743317    default:
    32753318        break;
    … …  
    33263369    else if (function->parseMode() == SourceParseMode::AsyncFunctionMode)
    33273370        emitOpcode(op_new_async_func);
    3328     else
     3371    else if (function->parseMode() == SourceParseMode::AsyncGeneratorWrapperFunctionMode) {
     3372        ASSERT(Options::useAsyncIterator());
     3373        emitOpcode(op_new_async_generator_func);
     3374    } else
    33293375        emitOpcode(op_new_func);
    33303376    instructions().append(dst->index());
    … …  
    45544600        emitCall(dst, next.get(), NoExpectedFunction, nextArguments, node->divot(), node->divotStart(), node->divotEnd(), DebuggableCall::No);
    45554601    }
    4556     {
    4557         Ref<Label> typeIsObject = newLabel();
    4558         emitJumpIfTrue(emitIsObject(newTemporary(), dst), typeIsObject.get());
    4559         emitThrowTypeError(ASCIILiteral("Iterator result interface is not an object."));
    4560         emitLabel(typeIsObject.get());
    4561     }
     4602
    45624603    return dst;
    45634604}
    45644605
    4565 void BytecodeGenerator::emitIteratorClose(RegisterID* iterator, const ThrowableExpressionData* node)
     4606void BytecodeGenerator::emitIteratorClose(RegisterID* iterator, const ThrowableExpressionData* node, EmitAwait doEmitAwait)
    45664607{
    45674608    Ref<Label> done = newLabel();
    … …  
    45734614    emitMove(returnArguments.thisRegister(), iterator);
    45744615    emitCall(value.get(), returnMethod.get(), NoExpectedFunction, returnArguments, node->divot(), node->divotStart(), node->divotEnd(), DebuggableCall::No);
     4616
     4617    if (doEmitAwait == EmitAwait::Yes)
     4618        emitAwait(value.get());
     4619
    45754620    emitJumpIfTrue(emitIsObject(newTemporary(), value.get()), done.get());
    45764621    emitThrowTypeError(ASCIILiteral("Iterator result interface is not an object."));
    … …  
    47544799}
    47554800
    4756 void BytecodeGenerator::emitYieldPoint(RegisterID* argument)
     4801void BytecodeGenerator::emitYieldPoint(RegisterID* argument, JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason result)
    47574802{
    47584803    Ref<Label> mergePoint = newLabel();
    47594804    unsigned yieldPointIndex = m_yieldPoints++;
    47604805    emitGeneratorStateChange(yieldPointIndex + 1);
     4806
     4807    if (parseMode() == SourceParseMode::AsyncGeneratorBodyMode) {
     4808        int suspendReason = static_cast<int32_t>(result);
     4809        emitPutById(generatorRegister(), propertyNames().builtinNames().asyncGeneratorSuspendReasonPrivateName(), emitLoad(nullptr, jsNumber(suspendReason)));
     4810    }
    47614811
    47624812    // Split the try range here.
    … …  
    47854835}
    47864836
    4787 RegisterID* BytecodeGenerator::emitYield(RegisterID* argument)
    4788 {
    4789     emitYieldPoint(argument);
     4837RegisterID* BytecodeGenerator::emitYield(RegisterID* argument, JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason result)
     4838{
     4839    emitYieldPoint(argument, result);
    47904840
    47914841    Ref<Label> normalLabel = newLabel();
    … …  
    48144864}
    48154865
     4866RegisterID* BytecodeGenerator::emitCallIterator(RegisterID* iterator, RegisterID* argument, ThrowableExpressionData* node)
     4867{
     4868    CallArguments args(*this, nullptr);
     4869    emitMove(args.thisRegister(), argument);
     4870    emitCall(iterator, iterator, NoExpectedFunction, args, node->divot(), node->divotStart(), node->divotEnd(), DebuggableCall::No);
     4871
     4872    return iterator;
     4873}
     4874
     4875void BytecodeGenerator::emitAwait(RegisterID* value)
     4876{
     4877    emitYield(value, JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason::Await);
     4878    emitMove(value, generatorValueRegister());
     4879}
     4880
     4881RegisterID* BytecodeGenerator::emitGetIterator(RegisterID* argument, ThrowableExpressionData* node)
     4882{
     4883    RefPtr<RegisterID> iterator = emitGetById(newTemporary(), argument, propertyNames().iteratorSymbol);
     4884    emitCallIterator(iterator.get(), argument, node);
     4885
     4886    return iterator.get();
     4887}
     4888
     4889RegisterID* BytecodeGenerator::emitGetAsyncIterator(RegisterID* argument, ThrowableExpressionData* node)
     4890{
     4891    RefPtr<RegisterID> iterator = emitGetById(newTemporary(), argument, propertyNames().asyncIteratorSymbol);
     4892    Ref<Label> asyncIteratorNotFound = newLabel();
     4893    Ref<Label> asyncIteratorFound = newLabel();
     4894    Ref<Label> iteratorReceived = newLabel();
     4895
     4896    emitJumpIfTrue(emitIsUndefined(newTemporary(), iterator.get()), asyncIteratorNotFound.get());
     4897    emitJumpIfTrue(emitUnaryOp(op_eq_null, newTemporary(), iterator.get()), asyncIteratorNotFound.get());
     4898
     4899    emitJump(asyncIteratorFound.get());
     4900    emitLabel(asyncIteratorNotFound.get());
     4901
     4902    RefPtr<RegisterID> commonIterator = emitGetById(newTemporary(), argument, propertyNames().iteratorSymbol);
     4903    emitCallIterator(commonIterator.get(), argument, node);
     4904    emitMove(iterator.get(), commonIterator.get());
     4905
     4906    auto varCreateAsyncFromSyncIterator = variable(propertyNames().builtinNames().createAsyncFromSyncIteratorPrivateName());
     4907    RefPtr<RegisterID> scope = newTemporary();
     4908    moveToDestinationIfNeeded(scope.get(), emitResolveScope(scope.get(), varCreateAsyncFromSyncIterator));
     4909    RefPtr<RegisterID> createAsyncFromSyncIterator = emitGetFromScope(newTemporary(), scope.get(), varCreateAsyncFromSyncIterator, ThrowIfNotFound);
     4910
     4911    CallArguments args(*this, nullptr, 1);
     4912    emitLoad(args.thisRegister(), jsUndefined());
     4913
     4914    emitMove(args.argumentRegister(0), iterator.get());
     4915
     4916    JSTextPosition divot(m_scopeNode->firstLine(), m_scopeNode->startOffset(), m_scopeNode->lineStartOffset());
     4917    emitCall(iterator.get(), createAsyncFromSyncIterator.get(), NoExpectedFunction, args, divot, divot, divot, DebuggableCall::No);
     4918
     4919    emitJump(iteratorReceived.get());
     4920
     4921    emitLabel(asyncIteratorFound.get());
     4922    emitCallIterator(iterator.get(), argument, node);
     4923    emitLabel(iteratorReceived.get());
     4924
     4925    return iterator.get();
     4926}
     4927
    48164928RegisterID* BytecodeGenerator::emitDelegateYield(RegisterID* argument, ThrowableExpressionData* node)
    48174929{
    48184930    RefPtr<RegisterID> value = newTemporary();
    48194931    {
    4820         RefPtr<RegisterID> iterator = emitGetById(newTemporary(), argument, propertyNames().iteratorSymbol);
    4821         {
    4822             CallArguments args(*this, nullptr);
    4823             emitMove(args.thisRegister(), argument);
    4824             emitCall(iterator.get(), iterator.get(), NoExpectedFunction, args, node->divot(), node->divotStart(), node->divotEnd(), DebuggableCall::No);
    4825         }
     4932        RefPtr<RegisterID> iterator = parseMode() == SourceParseMode::AsyncGeneratorBodyMode ? emitGetAsyncIterator(argument, node) : emitGetIterator(argument, node);
    48264933
    48274934        Ref<Label> loopDone = newLabel();
    … …  
    48384945            Ref<Label> branchOnResult = newLabel();
    48394946            {
    4840                 emitYieldPoint(value.get());
     4947                emitYieldPoint(value.get(), JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason::Yield);
    48414948
    48424949                Ref<Label> normalLabel = newLabel();
    … …  
    48594966                    emitJumpIfFalse(emitIsUndefined(newTemporary(), throwMethod.get()), throwMethodFound.get());
    48604967
    4861                     emitIteratorClose(iterator.get(), node);
     4968                    EmitAwait emitAwaitInIteratorClose = parseMode() == SourceParseMode::AsyncGeneratorBodyMode ? EmitAwait::Yes : EmitAwait::No;
     4969                    emitIteratorClose(iterator.get(), node, emitAwaitInIteratorClose);
     4970
    48624971                    emitThrowTypeError(ASCIILiteral("Delegated generator does not have a 'throw' method."));
    48634972
    … …  
    48684977                    emitCall(value.get(), throwMethod.get(), NoExpectedFunction, throwArguments, node->divot(), node->divotStart(), node->divotEnd(), DebuggableCall::No);
    48694978
    4870                     emitJumpIfTrue(emitIsObject(newTemporary(), value.get()), branchOnResult.get());
    4871                     emitThrowTypeError(ASCIILiteral("Iterator result interface is not an object."));
     4979                    emitJump(branchOnResult.get());
    48724980                }
    48734981
    … …  
    48904998                    emitCall(value.get(), returnMethod.get(), NoExpectedFunction, returnArguments, node->divot(), node->divotStart(), node->divotEnd(), DebuggableCall::No);
    48914999
     5000                    if (parseMode() == SourceParseMode::AsyncGeneratorBodyMode)
     5001                        emitAwait(value.get());
     5002
    48925003                    Ref<Label> returnIteratorResultIsObject = newLabel();
    48935004                    emitJumpIfTrue(emitIsObject(newTemporary(), value.get()), returnIteratorResultIsObject.get());
    … …  
    48955006
    48965007                    emitLabel(returnIteratorResultIsObject.get());
     5008
    48975009                    Ref<Label> returnFromGenerator = newLabel();
    48985010                    emitJumpIfTrue(emitGetById(newTemporary(), value.get(), propertyNames().done), returnFromGenerator.get());
    … …  
    49195031
    49205032            emitLabel(branchOnResult.get());
     5033
     5034            if (parseMode() == SourceParseMode::AsyncGeneratorBodyMode)
     5035                emitAwait(value.get());
     5036
     5037            Ref<Label> iteratorValueIsObject = newLabel();
     5038            emitJumpIfTrue(emitIsObject(newTemporary(), value.get()), iteratorValueIsObject.get());
     5039            emitThrowTypeError(ASCIILiteral("Iterator result interface is not an object."));
     5040            emitLabel(iteratorValueIsObject.get());
     5041
    49215042            emitJumpIfTrue(emitGetById(newTemporary(), value.get(), propertyNames().done), loopDone.get());
    49225043            emitGetById(value.get(), value.get(), propertyNames().value);
     5044
    49235045            emitJump(loopStart.get());
    49245046        }

  • trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h

    r220852 r221080  
    3434#include "Instruction.h"
    3535#include "Interpreter.h"
     36#include "JSAsyncGeneratorFunction.h"
    3637#include "JSGeneratorFunction.h"
    3738#include "Label.h"
    … …  
    6162    };
    6263
     64    enum class EmitAwait { Yes, No };
     65
    6366    enum class DebuggableCall { Yes, No };
    6467    enum class ThisResolutionType { Local, Scoped };
    … …  
    605608    private:
    606609        void emitTypeProfilerExpressionInfo(const JSTextPosition& startDivot, const JSTextPosition& endDivot);
     610        RegisterID* emitCreateAsyncGeneratorQueue(const JSTextPosition&);
    607611    public:
    608612
    … …  
    700704        // Initialize object with generator fields (@generatorThis, @generatorNext, @generatorState, @generatorFrame)
    701705        void emitPutGeneratorFields(RegisterID* nextFunction);
     706       
     707        void emitPutAsyncGeneratorFields(RegisterID* nextFunction, const JSTextPosition&);
    702708
    703709        ExpectedFunction expectedFunctionForIdentifier(const Identifier&);
    … …  
    777783        RegisterID* emitIteratorNext(RegisterID* dst, RegisterID* iterator, const ThrowableExpressionData* node);
    778784        RegisterID* emitIteratorNextWithValue(RegisterID* dst, RegisterID* iterator, RegisterID* value, const ThrowableExpressionData* node);
    779         void emitIteratorClose(RegisterID* iterator, const ThrowableExpressionData* node);
     785        void emitIteratorClose(RegisterID* iterator, const ThrowableExpressionData* node, EmitAwait = EmitAwait::No);
    780786
    781787        RegisterID* emitRestParameter(RegisterID* result, unsigned numParametersToSkip);
    … …  
    826832        void emitPopCatchScope(VariableEnvironment&);
    827833
     834        RegisterID* emitGetIterator(RegisterID*, ThrowableExpressionData*);
     835        RegisterID* emitGetAsyncIterator(RegisterID*, ThrowableExpressionData*);
     836
     837        void emitAwait(RegisterID*);
    828838        void emitGetScope();
    829839        RegisterID* emitPushWithScope(RegisterID* objectScope);
    … …  
    905915        void endSwitch(uint32_t clauseCount, const Vector<Ref<Label>, 8>&, ExpressionNode**, Label& defaultLabel, int32_t min, int32_t range);
    906916
    907         void emitYieldPoint(RegisterID*);
     917        void emitYieldPoint(RegisterID*, JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason);
    908918
    909919        void emitGeneratorStateLabel();
    910920        void emitGeneratorStateChange(int32_t state);
    911         RegisterID* emitYield(RegisterID* argument);
     921        RegisterID* emitYield(RegisterID* argument, JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason = JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason::Yield);
    912922        RegisterID* emitDelegateYield(RegisterID* argument, ThrowableExpressionData*);
    913923        RegisterID* generatorStateRegister() { return &m_parameters[static_cast<int32_t>(JSGeneratorFunction::GeneratorArgument::State)]; }
    … …  
    9971007        RegisterID* emitCall(OpcodeID, RegisterID* dst, RegisterID* func, ExpectedFunction, CallArguments&, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd, DebuggableCall);
    9981008
     1009        RegisterID* emitCallIterator(RegisterID* iterator, RegisterID* argument, ThrowableExpressionData*);
    9991010        RegisterID* newRegister();
    10001011

  • trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

    r220852 r221080  
    31473147    bool hasFinally = generator.emitReturnViaFinallyIfNeeded(returnRegister.get());
    31483148    if (!hasFinally) {
     3149        if (generator.parseMode() == SourceParseMode::AsyncGeneratorBodyMode) {
     3150            returnRegister = generator.emitMove(generator.newTemporary(), returnRegister.get());
     3151            generator.emitAwait(returnRegister.get());
     3152        }
     3153
    31493154        generator.emitWillLeaveCallFrameDebugHook();
    31503155        generator.emitReturn(returnRegister.get());
    … …  
    35513556    switch (generator.parseMode()) {
    35523557    case SourceParseMode::GeneratorWrapperFunctionMode:
    3553     case SourceParseMode::GeneratorWrapperMethodMode: {
     3558    case SourceParseMode::GeneratorWrapperMethodMode:
     3559    case SourceParseMode::AsyncGeneratorWrapperMethodMode:
     3560    case SourceParseMode::AsyncGeneratorWrapperFunctionMode: {
    35543561        StatementNode* singleStatement = this->singleStatement();
    35553562        ASSERT(singleStatement->isExprStatement());
    … …  
    35673574        }
    35683575
    3569         generator.emitPutGeneratorFields(next.get());
    3570 
     3576        if (isGeneratorWrapperParseMode(generator.parseMode()))
     3577            generator.emitPutGeneratorFields(next.get());
     3578        else {
     3579            ASSERT(isAsyncGeneratorFunctionParseMode(generator.parseMode()));
     3580            generator.emitPutAsyncGeneratorFields(next.get(), JSTextPosition(startLine(), startStartOffset(), startLineStartOffset()));
     3581        }
     3582       
    35713583        ASSERT(startOffset() >= lineStartOffset());
    35723584        generator.emitDebugHook(WillLeaveCallFrame, lastLine(), startOffset(), lineStartOffset());
    … …  
    36233635    }
    36243636
     3637    case SourceParseMode::AsyncGeneratorBodyMode:
    36253638    case SourceParseMode::AsyncArrowFunctionBodyMode:
    36263639    case SourceParseMode::AsyncFunctionBodyMode:
    … …  
    37213734        } else
    37223735            arg = generator.emitLoad(nullptr, jsUndefined());
    3723         RefPtr<RegisterID> value = generator.emitYield(arg.get());
     3736        RefPtr<RegisterID> value = generator.emitYield(arg.get(), JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason::Yield);
    37243737        if (dst == generator.ignoredResult())
    37253738            return nullptr;
    … …  
    37403753    RefPtr<RegisterID> arg = generator.newTemporary();
    37413754    generator.emitNode(arg.get(), argument());
    3742     RefPtr<RegisterID> value = generator.emitYield(arg.get());
     3755    RefPtr<RegisterID> value = generator.emitYield(arg.get(), JSAsyncGeneratorFunction::AsyncGeneratorSuspendReason::Await);
    37433756    if (dst == generator.ignoredResult())
    37443757        return nullptr;

  • trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h

    r220783 r221080  
    20442044    case PhantomNewFunction:
    20452045    case PhantomNewGeneratorFunction:
     2046    case PhantomNewAsyncGeneratorFunction:
    20462047    case PhantomNewAsyncFunction:
    20472048    case PhantomCreateActivation:
    … …  
    20942095        forNode(node).set(
    20952096            m_graph, m_codeBlock->globalObjectFor(node->origin.semantic)->generatorFunctionStructure());
     2097        break;
     2098
     2099    case NewAsyncGeneratorFunction:
     2100        forNode(node).set(
     2101            m_graph, m_codeBlock->globalObjectFor(node->origin.semantic)->asyncGeneratorFunctionStructure());
    20962102        break;
    20972103

  • trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

    r221018 r221080  
    57435743            NEXT_OPCODE(op_get_argument);
    57445744        }
    5745            
     5745        case op_new_async_generator_func:
    57465746        case op_new_func:
    57475747        case op_new_generator_func:
    … …  
    57495749            FunctionExecutable* decl = m_inlineStackTop->m_profiledBlock->functionDecl(currentInstruction[3].u.operand);
    57505750            FrozenValue* frozen = m_graph.freezeStrong(decl);
    5751             NodeType op = (opcodeID == op_new_generator_func) ? NewGeneratorFunction :
    5752                 (opcodeID == op_new_async_func) ? NewAsyncFunction : NewFunction;
     5751            NodeType op;
     5752            switch (opcodeID) {
     5753            case op_new_generator_func:
     5754                op = NewGeneratorFunction;
     5755                break;
     5756            case op_new_async_func:
     5757                op = NewAsyncFunction;
     5758                break;
     5759            case op_new_async_generator_func:
     5760                op = NewAsyncGeneratorFunction;
     5761                break;
     5762            default:
     5763                op = NewFunction;
     5764            }
    57535765            set(VirtualRegister(currentInstruction[1].u.operand), addToGraph(op, OpInfo(frozen), get(VirtualRegister(currentInstruction[2].u.operand))));
    57545766            static_assert(OPCODE_LENGTH(op_new_func) == OPCODE_LENGTH(op_new_generator_func), "The length of op_new_func should eqaual to one of op_new_generator_func");
    57555767            static_assert(OPCODE_LENGTH(op_new_func) == OPCODE_LENGTH(op_new_async_func), "The length of op_new_func should eqaual to one of op_new_async_func");
     5768            static_assert(OPCODE_LENGTH(op_new_func) == OPCODE_LENGTH(op_new_async_generator_func), "The length of op_new_func should eqaual to one of op_new_async_generator_func");
    57565769            NEXT_OPCODE(op_new_func);
    57575770        }
    … …  
    57595772        case op_new_func_exp:
    57605773        case op_new_generator_func_exp:
     5774        case op_new_async_generator_func_exp:
    57615775        case op_new_async_func_exp: {
    57625776            FunctionExecutable* expr = m_inlineStackTop->m_profiledBlock->functionExpr(currentInstruction[3].u.operand);
    57635777            FrozenValue* frozen = m_graph.freezeStrong(expr);
    5764             NodeType op = (opcodeID == op_new_generator_func_exp) ? NewGeneratorFunction :
    5765                 (opcodeID == op_new_async_func_exp) ? NewAsyncFunction : NewFunction;
     5778            NodeType op;
     5779            switch (opcodeID) {
     5780            case op_new_generator_func_exp:
     5781                op = NewGeneratorFunction;
     5782                break;
     5783            case op_new_async_func_exp:
     5784                op = NewAsyncFunction;
     5785                break;
     5786            case op_new_async_generator_func_exp:
     5787                op = NewAsyncGeneratorFunction;
     5788                break;
     5789            default:
     5790                op = NewFunction;
     5791            }
    57665792            set(VirtualRegister(currentInstruction[1].u.operand), addToGraph(op, OpInfo(frozen), get(VirtualRegister(currentInstruction[2].u.operand))));
    57675793   
    57685794            static_assert(OPCODE_LENGTH(op_new_func_exp) == OPCODE_LENGTH(op_new_generator_func_exp), "The length of op_new_func_exp should eqaual to one of op_new_generator_func_exp");
    57695795            static_assert(OPCODE_LENGTH(op_new_func_exp) == OPCODE_LENGTH(op_new_async_func_exp), "The length of op_new_func_exp should eqaual to one of op_new_async_func_exp");
     5796            static_assert(OPCODE_LENGTH(op_new_func_exp) == OPCODE_LENGTH(op_new_async_generator_func_exp), "The length of op_new_func_exp should eqaual to one of op_new_async_func_exp");
    57705797            NEXT_OPCODE(op_new_func_exp);
    57715798        }

  • trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp

    r220735 r221080  
    243243    case op_new_generator_func:
    244244    case op_new_generator_func_exp:
     245    case op_new_async_generator_func:
     246    case op_new_async_generator_func_exp:
    245247    case op_new_async_func:
    246248    case op_new_async_func_exp:

  • trunk/Source/JavaScriptCore/dfg/DFGClobberize.h

    r220783 r221080  
    14221422    case PhantomNewGeneratorFunction:
    14231423    case PhantomNewAsyncFunction:
     1424    case PhantomNewAsyncGeneratorFunction:
    14241425    case PhantomCreateActivation:
    14251426    case MaterializeCreateActivation:
    … …  
    14301431    case NewFunction:
    14311432    case NewGeneratorFunction:
     1433    case NewAsyncGeneratorFunction:
    14321434    case NewAsyncFunction:
    14331435        if (node->castOperand<FunctionExecutable*>()->singletonFunction()->isStillValid())

  • trunk/Source/JavaScriptCore/dfg/DFGClobbersExitState.cpp

    r209638 r221080  
    6363    case PhantomNewFunction:
    6464    case PhantomNewGeneratorFunction:
     65    case PhantomNewAsyncGeneratorFunction:
    6566    case PhantomNewAsyncFunction:
    6667    case PhantomCreateActivation:
    … …  
    8283    case NewFunction:
    8384    case NewGeneratorFunction:
     85    case NewAsyncGeneratorFunction:
    8486    case NewAsyncFunction:
    8587        // Like above, but with the JSFunction allocation caveat.

  • trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp

    r220783 r221080  
    247247    case PhantomNewGeneratorFunction:
    248248    case PhantomNewAsyncFunction:
     249    case PhantomNewAsyncGeneratorFunction:
    249250    case PhantomCreateActivation:
    250251    case PhantomDirectArguments:
    … …  
    306307    case NewFunction:
    307308    case NewGeneratorFunction:
     309    case NewAsyncGeneratorFunction:
    308310    case NewAsyncFunction:
    309311    case NewTypedArray:

  • trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp

    r220890 r221080  
    15471547        case PhantomNewFunction:
    15481548        case PhantomNewGeneratorFunction:
     1549        case PhantomNewAsyncGeneratorFunction:
    15491550        case PhantomNewAsyncFunction:
    15501551        case PhantomCreateActivation:
    … …  
    17131714        case NewFunction:
    17141715        case NewGeneratorFunction:
     1716        case NewAsyncGeneratorFunction:
    17151717        case NewAsyncFunction: {
    17161718            // Child 1 is always the current scope, which is guaranteed to be an object

  • trunk/Source/JavaScriptCore/dfg/DFGMayExit.cpp

    r220735 r221080  
    110110    case NewGeneratorFunction:
    111111    case NewAsyncFunction:
     112    case NewAsyncGeneratorFunction:
    112113    case NewStringObject:
    113114    case ToNumber:

  • trunk/Source/JavaScriptCore/dfg/DFGNode.h

    r220735 r221080  
    594594    void convertToPhantomNewFunction()
    595595    {
    596         ASSERT(m_op == NewFunction || m_op == NewGeneratorFunction || m_op == NewAsyncFunction);
     596        ASSERT(m_op == NewFunction || m_op == NewGeneratorFunction || m_op == NewAsyncFunction || m_op == NewAsyncGeneratorFunction);
    597597        m_op = PhantomNewFunction;
    598598        m_flags |= NodeMustGenerate;
    … …  
    622622    }
    623623
     624    void convertToPhantomNewAsyncGeneratorFunction()
     625    {
     626        ASSERT(m_op == NewAsyncGeneratorFunction);
     627        m_op = PhantomNewAsyncGeneratorFunction;
     628        m_flags |= NodeMustGenerate;
     629        m_opInfo = OpInfoWrapper();
     630        m_opInfo2 = OpInfoWrapper();
     631        children = AdjacencyList();
     632    }
     633   
    624634    void convertToPhantomCreateActivation()
    625635    {
    … …  
    15511561        case NewGeneratorFunction:
    15521562        case NewAsyncFunction:
     1563        case NewAsyncGeneratorFunction:
    15531564        case CreateActivation:
    15541565        case MaterializeCreateActivation:
    … …  
    17861797        case NewFunction:
    17871798        case NewGeneratorFunction:
     1799        case NewAsyncGeneratorFunction:
    17881800        case NewAsyncFunction:
    17891801            return true;
    … …  
    17991811        case PhantomNewGeneratorFunction:
    18001812        case PhantomNewAsyncFunction:
     1813        case PhantomNewAsyncGeneratorFunction:
    18011814            return true;
    18021815        default:
    … …  
    18171830        case PhantomNewGeneratorFunction:
    18181831        case PhantomNewAsyncFunction:
     1832        case PhantomNewAsyncGeneratorFunction:
    18191833        case PhantomCreateActivation:
    18201834            return true;

  • trunk/Source/JavaScriptCore/dfg/DFGNodeType.h

    r220735 r221080  
    328328    macro(PhantomNewGeneratorFunction, NodeResultJS | NodeMustGenerate) \
    329329    macro(PhantomNewAsyncFunction, NodeResultJS | NodeMustGenerate) \
     330    macro(PhantomNewAsyncGeneratorFunction, NodeResultJS | NodeMustGenerate) \
    330331    macro(PhantomCreateActivation, NodeResultJS | NodeMustGenerate) \
    331332    macro(MaterializeCreateActivation, NodeResultJS | NodeHasVarArgs) \
    … …  
    380381    macro(NewGeneratorFunction, NodeResultJS) \
    381382    \
     383    macro(NewAsyncGeneratorFunction, NodeResultJS) \
     384    \
    382385    macro(NewAsyncFunction, NodeResultJS) \
    383386    \

  • trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp

    r219562 r221080  
    140140    // replace any use of those pointers by the corresponding
    141141    // materialization
    142     enum class Kind { Escaped, Object, Activation, Function, GeneratorFunction, AsyncFunction };
     142    enum class Kind { Escaped, Object, Activation, Function, GeneratorFunction, AsyncFunction, AsyncGeneratorFunction };
    143143
    144144    explicit Allocation(Node* identifier = nullptr, Kind kind = Kind::Escaped)
    … …  
    279279            break;
    280280
     281        case Kind::AsyncGeneratorFunction:
     282            out.print("AsyncGeneratorFunction");
     283            break;
    281284        case Kind::Activation:
    282285            out.print("Activation");
    … …  
    839842        case NewFunction:
    840843        case NewGeneratorFunction:
     844        case NewAsyncGeneratorFunction:
    841845        case NewAsyncFunction: {
    842846            if (isStillValid(node->castOperand<FunctionExecutable*>()->singletonFunction())) {
    … …  
    849853            else if (node->op() == NewAsyncFunction)
    850854                target = &m_heap.newAllocation(node, Allocation::Kind::AsyncFunction);
     855            else if (node->op() == NewAsyncGeneratorFunction)
     856                target = &m_heap.newAllocation(node, Allocation::Kind::AsyncGeneratorFunction);
    851857            else
    852858                target = &m_heap.newAllocation(node, Allocation::Kind::Function);
    … …  
    14791485        }
    14801486
     1487        case Allocation::Kind::AsyncGeneratorFunction:
    14811488        case Allocation::Kind::AsyncFunction:
    14821489        case Allocation::Kind::GeneratorFunction:
    … …  
    14841491            FrozenValue* executable = allocation.identifier()->cellOperand();
    14851492           
    1486             NodeType nodeType =
    1487                 allocation.kind() == Allocation::Kind::GeneratorFunction ? NewGeneratorFunction :
    1488                 allocation.kind() == Allocation::Kind::AsyncFunction ? NewAsyncFunction : NewFunction;
    1489            
     1493            NodeType nodeType;
     1494            switch (allocation.kind()) {
     1495            case Allocation::Kind::GeneratorFunction:
     1496                nodeType = NewGeneratorFunction;
     1497                break;
     1498            case Allocation::Kind::AsyncGeneratorFunction:
     1499                nodeType = NewAsyncGeneratorFunction;
     1500                break;
     1501            case Allocation::Kind::AsyncFunction:
     1502                nodeType = NewAsyncFunction;
     1503                break;
     1504            default:
     1505                nodeType = NewFunction;
     1506            }
     1507
    14901508            return m_graph.addNode(
    14911509                allocation.identifier()->prediction(), nodeType,
    … …  
    18631881                        node->convertToPhantomNewGeneratorFunction();
    18641882                        break;
    1865 
     1883                    case NewAsyncGeneratorFunction:
     1884                        node->convertToPhantomNewAsyncGeneratorFunction();
     1885                        break;
    18661886                    case NewAsyncFunction:
    18671887                        node->convertToPhantomNewAsyncFunction();
    … …  
    21252145        case NewFunction:
    21262146        case NewGeneratorFunction:
     2147        case NewAsyncGeneratorFunction:
    21272148        case NewAsyncFunction: {
    21282149            Vector<PromotedHeapLocation> locations = m_locationsForAllocation.get(escapee);

  • trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp

    r220735 r221080  
    743743        case NewFunction:
    744744        case NewGeneratorFunction:
     745        case NewAsyncGeneratorFunction:
    745746        case NewAsyncFunction: {
    746747            setPrediction(SpecFunction);
    … …  
    10501051        case PhantomNewFunction:
    10511052        case PhantomNewGeneratorFunction:
     1053        case PhantomNewAsyncGeneratorFunction:
    10521054        case PhantomNewAsyncFunction:
    10531055        case PhantomCreateActivation:

  • trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h

    r220735 r221080  
    306306    case NewFunction:
    307307    case NewGeneratorFunction:
     308    case NewAsyncGeneratorFunction:
    308309    case NewAsyncFunction:
    309310    case Jump:
    … …  
    355356    case PhantomNewFunction:
    356357    case PhantomNewGeneratorFunction:
     358    case PhantomNewAsyncGeneratorFunction:
    357359    case PhantomNewAsyncFunction:
    358360    case PhantomCreateActivation:

  • trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

    r220890 r221080  
    5151#include "JITSubGenerator.h"
    5252#include "JSAsyncFunction.h"
     53#include "JSAsyncGeneratorFunction.h"
    5354#include "JSCInlines.h"
    5455#include "JSEnvironmentRecord.h"
    … …  
    65296530{
    65306531    NodeType nodeType = node->op();
    6531     ASSERT(nodeType == NewFunction || nodeType == NewGeneratorFunction || nodeType == NewAsyncFunction);
     6532    ASSERT(nodeType == NewFunction || nodeType == NewGeneratorFunction || nodeType == NewAsyncFunction || nodeType == NewAsyncGeneratorFunction);
    65326533   
    65336534    SpeculateCellOperand scope(this, node->child1());
    … …  
    65466547        else if (nodeType == NewAsyncFunction)
    65476548            callOperation(operationNewAsyncFunction, resultGPR, scopeGPR, executable);
     6549        else if (nodeType == NewAsyncGeneratorFunction)
     6550            callOperation(operationNewAsyncGeneratorFunction, resultGPR, scopeGPR, executable);
    65486551        else
    65496552            callOperation(operationNewFunction, resultGPR, scopeGPR, executable);
    … …  
    65566559        nodeType == NewGeneratorFunction ? m_jit.graph().globalObjectFor(node->origin.semantic)->generatorFunctionStructure() :
    65576560        nodeType == NewAsyncFunction ? m_jit.graph().globalObjectFor(node->origin.semantic)->asyncFunctionStructure() :
     6561        nodeType == NewAsyncGeneratorFunction ? m_jit.graph().globalObjectFor(node->origin.semantic)->asyncGeneratorFunctionStructure() :
    65586562        m_jit.graph().globalObjectFor(node->origin.semantic)->functionStructure());
    65596563   
    … …  
    65866590    }
    65876591
     6592    if (nodeType == NewAsyncGeneratorFunction) {
     6593        compileNewFunctionCommon<JSAsyncGeneratorFunction>(resultGPR, structure, scratch1GPR, scratch2GPR, scopeGPR, slowPath, JSAsyncGeneratorFunction::allocationSize(0), executable, JSAsyncGeneratorFunction::offsetOfScopeChain(), JSAsyncGeneratorFunction::offsetOfExecutable(), JSAsyncGeneratorFunction::offsetOfRareData());
     6594       
     6595        addSlowPathGenerator(slowPathCall(slowPath, this, operationNewAsyncGeneratorFunctionWithInvalidatedReallocationWatchpoint, resultGPR, scopeGPR, executable));
     6596    }
     6597   
    65886598    cellResult(resultGPR, node);
    65896599}

  • trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp

    r220735 r221080  
    50675067    case NewGeneratorFunction:
    50685068    case NewAsyncFunction:
     5069    case NewAsyncGeneratorFunction:
    50695070        compileNewFunction(node);
    50705071        break;
    … …  
    56585659    case PhantomNewGeneratorFunction:
    56595660    case PhantomNewAsyncFunction:
     5661    case PhantomNewAsyncGeneratorFunction:
    56605662    case PhantomCreateActivation:
    56615663    case PutHint:

  • trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp

    r220735 r221080  
    54685468    case NewFunction:
    54695469    case NewGeneratorFunction:
     5470    case NewAsyncGeneratorFunction:
    54705471    case NewAsyncFunction:
    54715472        compileNewFunction(node);
    … …  
    61096110    case PhantomNewGeneratorFunction:
    61106111    case PhantomNewAsyncFunction:
     6112    case PhantomNewAsyncGeneratorFunction:
    61116113    case PhantomCreateActivation:
    61126114    case GetMyArgumentByVal:

  • trunk/Source/JavaScriptCore/dfg/DFGStoreBarrierInsertionPhase.cpp

    r209638 r221080  
    327327            case NewFunction:
    328328            case NewGeneratorFunction:
     329            case NewAsyncGeneratorFunction:
    329330            case NewAsyncFunction:
    330331            case AllocatePropertyStorage:

  • trunk/Source/JavaScriptCore/dfg/DFGValidate.cpp

    r220735 r221080  
    537537                case PhantomNewGeneratorFunction:
    538538                case PhantomNewAsyncFunction:
     539                case PhantomNewAsyncGeneratorFunction:
    539540                case PhantomCreateActivation:
    540541                case GetMyArgumentByVal:
    … …  
    680681                case PhantomNewGeneratorFunction:
    681682                case PhantomNewAsyncFunction:
     683                case PhantomNewAsyncGeneratorFunction:
    682684                case PhantomCreateActivation:
    683685                case PhantomDirectArguments:

  • trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp

    r220778 r221080  
    120120    case NewGeneratorFunction:
    121121    case NewAsyncFunction:
     122    case NewAsyncGeneratorFunction:
    122123    case GetClosureVar:
    123124    case PutClosureVar:
    … …  
    228229    case PhantomNewFunction:
    229230    case PhantomNewGeneratorFunction:
     231    case PhantomNewAsyncGeneratorFunction:
    230232    case PhantomNewAsyncFunction:
    231233    case PhantomCreateActivation:

  • trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp

    r220890 r221080  
    745745        case NewFunction:
    746746        case NewGeneratorFunction:
     747        case NewAsyncGeneratorFunction:
    747748        case NewAsyncFunction:
    748749            compileNewFunction();
    … …  
    11301131        case PhantomNewFunction:
    11311132        case PhantomNewGeneratorFunction:
     1133        case PhantomNewAsyncGeneratorFunction:
    11321134        case PhantomNewAsyncFunction:
    11331135        case PhantomCreateActivation:
    … …  
    43434345    void compileNewFunction()
    43444346    {
    4345         ASSERT(m_node->op() == NewFunction || m_node->op() == NewGeneratorFunction || m_node->op() == NewAsyncFunction);
     4347        ASSERT(m_node->op() == NewFunction || m_node->op() == NewGeneratorFunction || m_node->op() == NewAsyncGeneratorFunction || m_node->op() == NewAsyncFunction);
    43464348        bool isGeneratorFunction = m_node->op() == NewGeneratorFunction;
    43474349        bool isAsyncFunction = m_node->op() == NewAsyncFunction;
     4350        bool isAsynGeneratorFunction =  m_node->op() == NewAsyncGeneratorFunction;
    43484351       
    43494352        LValue scope = lowCell(m_node->child1());
    … …  
    43544357                isGeneratorFunction ? vmCall(Int64, m_out.operation(operationNewGeneratorFunction), m_callFrame, scope, weakPointer(executable)) :
    43554358                isAsyncFunction ? vmCall(Int64, m_out.operation(operationNewAsyncFunction), m_callFrame, scope, weakPointer(executable)) :
     4359                isAsynGeneratorFunction ? vmCall(Int64, m_out.operation(operationNewAsyncGeneratorFunction), m_callFrame, scope, weakPointer(executable)) :
    43564360                vmCall(Int64, m_out.operation(operationNewFunction), m_callFrame, scope, weakPointer(executable));
    43574361            setJSValue(callResult);
    … …  
    43624366            isGeneratorFunction ? m_graph.globalObjectFor(m_node->origin.semantic)->generatorFunctionStructure() :
    43634367            isAsyncFunction ? m_graph.globalObjectFor(m_node->origin.semantic)->asyncFunctionStructure() :
     4368            isAsynGeneratorFunction ? m_graph.globalObjectFor(m_node->origin.semantic)->asyncGeneratorFunctionStructure() :
    43644369            m_graph.globalObjectFor(m_node->origin.semantic)->functionStructure());
    43654370       

  • trunk/Source/JavaScriptCore/ftl/FTLOperations.cpp

    r215919 r221080  
    3535#include "InlineCallFrame.h"
    3636#include "JSAsyncFunction.h"
     37#include "JSAsyncGeneratorFunction.h"
    3738#include "JSCInlines.h"
    3839#include "JSFixedArray.h"
    … …  
    8586    case PhantomNewGeneratorFunction:
    8687    case PhantomNewAsyncFunction:
     88    case PhantomNewAsyncGeneratorFunction:
    8789    case PhantomDirectArguments:
    8890    case PhantomClonedArguments:
    … …  
    159161    case PhantomNewFunction:
    160162    case PhantomNewGeneratorFunction:
     163    case PhantomNewAsyncGeneratorFunction:
    161164    case PhantomNewAsyncFunction: {
    162165        // Figure out what the executable and activation are
    … …  
    180183        else if (materialization->type() == PhantomNewGeneratorFunction)
    181184            return JSGeneratorFunction::createWithInvalidatedReallocationWatchpoint(vm, executable, activation);   
     185        else if (materialization->type() == PhantomNewAsyncGeneratorFunction)
     186            return JSAsyncGeneratorFunction::createWithInvalidatedReallocationWatchpoint(vm, executable, activation);
    182187        ASSERT(materialization->type() == PhantomNewAsyncFunction);
    183188        return JSAsyncFunction::createWithInvalidatedReallocationWatchpoint(vm, executable, activation);

  • trunk/Source/JavaScriptCore/jit/JIT.cpp

    r220735 r221080  
    353353        DEFINE_OP(op_new_async_func)
    354354        DEFINE_OP(op_new_async_func_exp)
     355        DEFINE_OP(op_new_async_generator_func)
     356        DEFINE_OP(op_new_async_generator_func_exp)
    355357        DEFINE_OP(op_new_object)
    356358        DEFINE_OP(op_new_regexp)

  • trunk/Source/JavaScriptCore/jit/JIT.h

    r221018 r221080  
    552552        void emit_op_new_async_func(Instruction*);
    553553        void emit_op_new_async_func_exp(Instruction*);
     554        void emit_op_new_async_generator_func(Instruction*);
     555        void emit_op_new_async_generator_func_exp(Instruction*);
    554556        void emit_op_new_object(Instruction*);
    555557        void emit_op_new_regexp(Instruction*);

  • trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp

    r220770 r221080  
    992992    else if (opcodeID == op_new_generator_func)
    993993        callOperation(operationNewGeneratorFunction, dst, regT0, funcExec);
     994    else if (opcodeID == op_new_async_func)
     995        callOperation(operationNewAsyncFunction, dst, regT0, funcExec);
    994996    else {
    995         ASSERT(opcodeID == op_new_async_func);
    996         callOperation(operationNewAsyncFunction, dst, regT0, funcExec);
     997        ASSERT(opcodeID == op_new_async_generator_func);
     998        callOperation(operationNewAsyncGeneratorFunction, dst, regT0, funcExec);
    997999    }
    9981000}
    … …  
    10081010}
    10091011
     1012void JIT::emit_op_new_async_generator_func(Instruction* currentInstruction)
     1013{
     1014    emitNewFuncCommon(currentInstruction);
     1015}
     1016
    10101017void JIT::emit_op_new_async_func(Instruction* currentInstruction)
    10111018{
    10121019    emitNewFuncCommon(currentInstruction);
    10131020}
    1014 
     1021   
    10151022void JIT::emitNewFuncExprCommon(Instruction* currentInstruction)
    10161023{
    … …  
    10361043    else if (opcodeID == op_new_generator_func_exp)
    10371044        callOperation(operationNewGeneratorFunction, dst, regT0, function);
     1045    else if (opcodeID == op_new_async_func_exp)
     1046        callOperation(operationNewAsyncFunction, dst, regT0, function);
    10381047    else {
    1039         ASSERT(opcodeID == op_new_async_func_exp);
    1040         callOperation(operationNewAsyncFunction, dst, regT0, function);
     1048        ASSERT(opcodeID == op_new_async_generator_func_exp);
     1049        callOperation(operationNewAsyncGeneratorFunction, dst, regT0, function);
    10411050    }
    10421051
    … …  
    10581067    emitNewFuncExprCommon(currentInstruction);
    10591068}
    1060 
     1069   
     1070void JIT::emit_op_new_async_generator_func_exp(Instruction* currentInstruction)
     1071{
     1072    emitNewFuncExprCommon(currentInstruction);
     1073}
     1074   
    10611075void JIT::emit_op_new_array(Instruction* currentInstruction)
    10621076{

  • trunk/Source/JavaScriptCore/jit/JITOperations.cpp

    r220890 r221080  
    5353#include "JITToDFGDeferredCompilationCallback.h"
    5454#include "JSAsyncFunction.h"
     55#include "JSAsyncGeneratorFunction.h"
    5556#include "JSCInlines.h"
    5657#include "JSGeneratorFunction.h"
    … …  
    12131214}
    12141215
     1216EncodedJSValue JIT_OPERATION operationNewAsyncGeneratorFunction(ExecState* exec, JSScope* scope, JSCell* functionExecutable)
     1217{
     1218    return operationNewFunctionCommon<JSAsyncGeneratorFunction>(exec, scope, functionExecutable, false);
     1219}
     1220   
     1221EncodedJSValue JIT_OPERATION operationNewAsyncGeneratorFunctionWithInvalidatedReallocationWatchpoint(ExecState* exec, JSScope* scope, JSCell* functionExecutable)
     1222{
     1223    return operationNewFunctionCommon<JSAsyncGeneratorFunction>(exec, scope, functionExecutable, true);
     1224}
     1225   
    12151226void JIT_OPERATION operationSetFunctionName(ExecState* exec, JSCell* funcCell, EncodedJSValue encodedName)
    12161227{

  • trunk/Source/JavaScriptCore/jit/JITOperations.h

    r220890 r221080  
    391391EncodedJSValue JIT_OPERATION operationNewAsyncFunction(ExecState*, JSScope*, JSCell*) WTF_INTERNAL;
    392392EncodedJSValue JIT_OPERATION operationNewAsyncFunctionWithInvalidatedReallocationWatchpoint(ExecState*, JSScope*, JSCell*) WTF_INTERNAL;
     393EncodedJSValue JIT_OPERATION operationNewAsyncGeneratorFunction(ExecState*, JSScope*, JSCell*) WTF_INTERNAL;
     394EncodedJSValue JIT_OPERATION operationNewAsyncGeneratorFunctionWithInvalidatedReallocationWatchpoint(ExecState*, JSScope*, JSCell*) WTF_INTERNAL;
    393395void JIT_OPERATION operationSetFunctionName(ExecState*, JSCell*, EncodedJSValue) WTF_INTERNAL;
    394396JSCell* JIT_OPERATION operationNewObject(ExecState*, Structure*) WTF_INTERNAL;

  • trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

    r218883 r221080  
    4747#include "JITWorklist.h"
    4848#include "JSAsyncFunction.h"
     49#include "JSAsyncGeneratorFunction.h"
    4950#include "JSCInlines.h"
    5051#include "JSCJSValue.h"
    … …  
    11761177}
    11771178
     1179LLINT_SLOW_PATH_DECL(slow_path_new_async_generator_func)
     1180{
     1181    LLINT_BEGIN();
     1182    CodeBlock* codeBlock = exec->codeBlock();
     1183    JSScope* scope = exec->uncheckedR(pc[2].u.operand).Register::scope();
     1184#if LLINT_SLOW_PATH_TRACING
     1185    dataLogF("Creating async generator function!\n");
     1186#endif
     1187    LLINT_RETURN(JSAsyncGeneratorFunction::create(vm, codeBlock->functionDecl(pc[3].u.operand), scope));
     1188}
     1189   
    11781190LLINT_SLOW_PATH_DECL(slow_path_new_func_exp)
    11791191{
    … …  
    12071219   
    12081220    LLINT_RETURN(JSAsyncFunction::create(vm, executable, scope));
     1221}
     1222   
     1223LLINT_SLOW_PATH_DECL(slow_path_new_async_generator_func_exp)
     1224{
     1225    LLINT_BEGIN();
     1226       
     1227    CodeBlock* codeBlock = exec->codeBlock();
     1228    JSScope* scope = exec->uncheckedR(pc[2].u.operand).Register::scope();
     1229    FunctionExecutable* executable = codeBlock->functionExpr(pc[3].u.operand);
     1230       
     1231    LLINT_RETURN(JSAsyncGeneratorFunction::create(vm, executable, scope));
    12091232}
    12101233

  • trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.h

    r213107 r221080  
    104104LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_generator_func);
    105105LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_generator_func_exp);
     106LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_async_generator_func);
     107LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_async_generator_func_exp);
    106108LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_async_func);
    107109LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_async_func_exp);

  • trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

    r220753 r221080  
    13231323    dispatch(constexpr op_new_generator_func_length)
    13241324
     1325_llint_op_new_async_generator_func:
     1326    traceExecution()
     1327    callSlowPath(_llint_slow_path_new_async_generator_func)
     1328    dispatch(constexpr op_new_async_generator_func_length)
     1329
     1330_llint_op_new_async_generator_func_exp:
     1331    traceExecution()
     1332    callSlowPath(_llint_slow_path_new_async_generator_func_exp)
     1333    dispatch(constexpr op_new_async_generator_func_exp_length)
    13251334
    13261335_llint_op_new_async_func:

  • trunk/Source/JavaScriptCore/parser/ASTBuilder.h

    r220323 r221080  
    438438        SourceParseMode mode, bool isArrowFunctionBodyExpression)
    439439    {
    440         SourceParseMode bodySourceParseMode = mode;
    441         if (mode == SourceParseMode::AsyncGeneratorBodyMode) {
    442             ASSERT(Options::useAsyncIterator());
    443             bodySourceParseMode = SourceParseMode::AsyncFunctionBodyMode;
    444         } else if (mode == SourceParseMode::AsyncGeneratorWrapperFunctionMode) {
    445             ASSERT(Options::useAsyncIterator());
    446             bodySourceParseMode = SourceParseMode::ArrowFunctionMode;
    447         } else if (mode == SourceParseMode::AsyncGeneratorWrapperMethodMode) {
    448             ASSERT(Options::useAsyncIterator());
    449             bodySourceParseMode = SourceParseMode::AsyncMethodMode;
    450         }
     440        ASSERT(Options::useAsyncIterator() || (mode != SourceParseMode::AsyncGeneratorBodyMode && mode != SourceParseMode::AsyncGeneratorWrapperFunctionMode && mode != SourceParseMode::AsyncGeneratorWrapperMethodMode));
    451441
    452442        return new (m_parserArena) FunctionMetadataNode(
    … …  
    454444            functionKeywordStart, functionNameStart, parametersStart,
    455445            inStrictContext, constructorKind, superBinding,
    456             parameterCount, bodySourceParseMode, isArrowFunctionBodyExpression);
     446            parameterCount, mode, isArrowFunctionBodyExpression);
    457447    }
    458448

  • trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h

    r220955 r221080  
    406406    macro(hasInstance) \
    407407    macro(isConcatSpreadable) \
     408    macro(asyncIterator) \
    408409    macro(iterator) \
    409410    macro(match) \

  • trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp

    r219115 r221080  
    2626#include "FunctionPrototype.h"
    2727#include "JSAsyncFunction.h"
     28#include "JSAsyncGeneratorFunction.h"
    2829#include "JSFunction.h"
    2930#include "JSGeneratorFunction.h"
    … …  
    109110        structure = globalObject->asyncFunctionStructure();
    110111        prefix = "async function ";
     112        break;
     113    case FunctionConstructionMode::AsyncGenerator:
     114        structure = globalObject->asyncGeneratorFunctionStructure();
     115        prefix = "{async function*";
    111116        break;
    112117    }
    … …  
    195200    case FunctionConstructionMode::Async:
    196201        return JSAsyncFunction::create(vm, function, globalObject->globalScope(), subclassStructure);
     202    case FunctionConstructionMode::AsyncGenerator:
     203        return JSAsyncGeneratorFunction::create(vm, function, globalObject->globalScope(), subclassStructure);
    197204    }
    198205

  • trunk/Source/JavaScriptCore/runtime/FunctionConstructor.h

    r210149 r221080  
    6060    Generator,
    6161    Async,
     62    AsyncGenerator,
    6263};
    6364

  • trunk/Source/JavaScriptCore/runtime/FunctionExecutable.h

    r218794 r221080  
    126126    bool isSetter() const { return parseMode() == SourceParseMode::SetterMode; }
    127127    bool isGenerator() const { return isGeneratorParseMode(parseMode()); }
     128    bool isAsyncGenerator() const { return SourceParseModeSet(SourceParseMode::AsyncGeneratorWrapperFunctionMode, SourceParseMode::AsyncGeneratorBodyMode).contains(parseMode()); }
    128129    bool isMethod() const { return parseMode() == SourceParseMode::MethodMode; }
    129130    bool hasCallerAndArgumentsProperties() const
    … …  
    139140            SourceParseMode::GeneratorBodyMode,
    140141            SourceParseMode::GeneratorWrapperFunctionMode,
    141             SourceParseMode::GeneratorWrapperMethodMode
     142            SourceParseMode::GeneratorWrapperMethodMode,
     143            SourceParseMode::AsyncGeneratorWrapperFunctionMode,
     144            SourceParseMode::AsyncGeneratorBodyMode
    142145        ).contains(parseMode()) || isClass();
    143146    }

  • trunk/Source/JavaScriptCore/runtime/JSFunction.cpp

    r220324 r221080  
    2727#include "JSFunction.h"
    2828
     29#include "AsyncGeneratorPrototype.h"
    2930#include "BuiltinNames.h"
    3031#include "ClonedArguments.h"
    … …  
    363364                // https://tc39.github.io/ecma262/#sec-generatorfunction-instances-prototype
    364365                prototype = constructEmptyObject(exec, thisObject->globalObject(vm)->generatorPrototype());
    365             } else {
     366            } else if (thisObject->jsExecutable()->parseMode() == SourceParseMode::AsyncGeneratorWrapperFunctionMode)
     367                prototype = constructEmptyObject(exec, thisObject->globalObject(vm)->asyncGeneratorPrototype());
     368            else {
    366369                prototype = constructEmptyObject(exec);
    367370                prototype->putDirect(vm, vm.propertyNames->constructor, thisObject, DontEnum);

  • trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

    r219301 r221080  
    3434#include "ArrayIteratorPrototype.h"
    3535#include "ArrayPrototype.h"
     36#include "AsyncFromSyncIteratorPrototype.h"
    3637#include "AtomicsObject.h"
    3738#include "AsyncFunctionConstructor.h"
    3839#include "AsyncFunctionPrototype.h"
     40#include "AsyncGeneratorFunctionConstructor.h"
     41#include "AsyncGeneratorFunctionPrototype.h"
     42#include "AsyncGeneratorPrototype.h"
     43#include "AsyncIteratorPrototype.h"
    3944#include "BooleanConstructor.h"
    4045#include "BooleanPrototype.h"
    … …  
    7176#include "JSArrayBufferPrototype.h"
    7277#include "JSAsyncFunction.h"
     78#include "JSAsyncGeneratorFunction.h"
    7379#include "JSBoundFunction.h"
    7480#include "JSCInlines.h"
    … …  
    579585
    580586    m_iteratorPrototype.set(vm, this, IteratorPrototype::create(vm, this, IteratorPrototype::createStructure(vm, this, m_objectPrototype.get())));
     587    m_asyncIteratorPrototype.set(vm, this, AsyncIteratorPrototype::create(vm, this, AsyncIteratorPrototype::createStructure(vm, this, m_objectPrototype.get())));
     588
    581589    m_generatorPrototype.set(vm, this, GeneratorPrototype::create(vm, this, GeneratorPrototype::createStructure(vm, this, m_iteratorPrototype.get())));
     590    m_asyncGeneratorPrototype.set(vm, this, AsyncGeneratorPrototype::create(vm, this, AsyncGeneratorPrototype::createStructure(vm, this, m_asyncIteratorPrototype.get())));
    582591
    583592#define CREATE_PROTOTYPE_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName, prototypeBase) \
    … …  
    671680    m_asyncFunctionStructure.set(vm, this, JSAsyncFunction::createStructure(vm, this, m_asyncFunctionPrototype.get()));
    672681
     682    m_asyncGeneratorFunctionPrototype.set(vm, this, AsyncGeneratorFunctionPrototype::create(vm, AsyncGeneratorFunctionPrototype::createStructure(vm, this, m_functionPrototype.get())));
     683    AsyncGeneratorFunctionConstructor* asyncGeneratorFunctionConstructor = AsyncGeneratorFunctionConstructor::create(vm, AsyncGeneratorFunctionConstructor::createStructure(vm, this, functionConstructor), m_asyncGeneratorFunctionPrototype.get());
     684    m_asyncGeneratorFunctionPrototype->putDirectWithoutTransition(vm, vm.propertyNames->constructor, asyncGeneratorFunctionConstructor, DontEnum | ReadOnly);
     685    m_asyncGeneratorFunctionStructure.set(vm, this, JSAsyncGeneratorFunction::createStructure(vm, this, m_asyncGeneratorFunctionPrototype.get()));
     686
     687    m_asyncGeneratorPrototype->putDirectWithoutTransition(vm, vm.propertyNames->constructor, m_asyncGeneratorFunctionPrototype.get(), DontEnum | ReadOnly);
     688    m_asyncGeneratorFunctionPrototype->putDirectWithoutTransition(vm, vm.propertyNames->prototype, m_asyncGeneratorPrototype.get(), DontEnum | ReadOnly);
     689   
     690   
    673691    m_objectPrototype->putDirectWithoutTransition(vm, vm.propertyNames->constructor, objectConstructor, DontEnum);
    674692    m_functionPrototype->putDirectWithoutTransition(vm, vm.propertyNames->constructor, functionConstructor, DontEnum);
    … …  
    763781    JSObject* arrayIteratorPrototype = ArrayIteratorPrototype::create(vm, this, ArrayIteratorPrototype::createStructure(vm, this, m_iteratorPrototype.get()));
    764782    createArrayIteratorPrivateFunction->putDirect(vm, vm.propertyNames->prototype, arrayIteratorPrototype);
     783
     784    JSObject* asyncFromSyncIteratorPrototype = AsyncFromSyncIteratorPrototype::create(vm, this, AsyncFromSyncIteratorPrototype::createStructure(vm, this, m_iteratorPrototype.get()));
     785    AsyncFromSyncIteratorConstructorPrivateFunction->putDirect(vm, vm.propertyNames->prototype, asyncFromSyncIteratorPrototype);
    765786
    766787    GlobalPropertyInfo staticGlobals[] = {
    … …  
    12421263    visitor.append(thisObject->m_generatorPrototype);
    12431264    visitor.append(thisObject->m_asyncFunctionPrototype);
     1265    visitor.append(thisObject->m_asyncGeneratorPrototype);
     1266    visitor.append(thisObject->m_asyncIteratorPrototype);
     1267    visitor.append(thisObject->m_asyncGeneratorFunctionPrototype);
    12441268    visitor.append(thisObject->m_moduleLoaderPrototype);
    12451269
    … …  
    12771301    visitor.append(thisObject->m_generatorFunctionStructure);
    12781302    visitor.append(thisObject->m_asyncFunctionStructure);
     1303    visitor.append(thisObject->m_asyncGeneratorFunctionStructure);
    12791304    visitor.append(thisObject->m_iteratorResultObjectStructure);
    12801305    visitor.append(thisObject->m_regExpMatchesArrayStructure);

  • trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

    r219301 r221080  
    5858class ArrayConstructor;
    5959class ArrayPrototype;
     60class AsyncIteratorPrototype;
    6061class AsyncFunctionPrototype;
     62class AsyncGeneratorPrototype;
     63class AsyncGeneratorFunctionPrototype;
    6164class BooleanPrototype;
    6265class ConsoleClient;
    … …  
    285288    WriteBarrier<RegExpPrototype> m_regExpPrototype;
    286289    WriteBarrier<IteratorPrototype> m_iteratorPrototype;
     290    WriteBarrier<AsyncIteratorPrototype> m_asyncIteratorPrototype;
    287291    WriteBarrier<GeneratorFunctionPrototype> m_generatorFunctionPrototype;
    288292    WriteBarrier<GeneratorPrototype> m_generatorPrototype;
     293    WriteBarrier<AsyncGeneratorPrototype> m_asyncGeneratorPrototype;
    289294    WriteBarrier<ModuleLoaderPrototype> m_moduleLoaderPrototype;
    290295
    … …  
    326331    WriteBarrier<Structure> m_regExpStructure;
    327332    WriteBarrier<AsyncFunctionPrototype> m_asyncFunctionPrototype;
     333    WriteBarrier<AsyncGeneratorFunctionPrototype> m_asyncGeneratorFunctionPrototype;
    328334    WriteBarrier<Structure> m_asyncFunctionStructure;
     335    WriteBarrier<Structure> m_asyncGeneratorFunctionStructure;
    329336    WriteBarrier<Structure> m_generatorFunctionStructure;
    330337    WriteBarrier<Structure> m_dollarVMStructure;
    … …  
    562569    ErrorPrototype* errorPrototype() const { return m_errorPrototype.get(); }
    563570    IteratorPrototype* iteratorPrototype() const { return m_iteratorPrototype.get(); }
     571    AsyncIteratorPrototype* asyncIteratorPrototype() const { return m_asyncIteratorPrototype.get(); }
    564572    GeneratorFunctionPrototype* generatorFunctionPrototype() const { return m_generatorFunctionPrototype.get(); }
    565573    GeneratorPrototype* generatorPrototype() const { return m_generatorPrototype.get(); }
    … …  
    568576    // Workaround for the name conflict between JSCell::setPrototype.
    569577    SetPrototype* jsSetPrototype() const { return m_setPrototype.get(); }
     578    AsyncGeneratorPrototype* asyncGeneratorPrototype() const { return m_asyncGeneratorPrototype.get(); }
     579    AsyncGeneratorFunctionPrototype* asyncGeneratorFunctionPrototype() const { return m_asyncGeneratorFunctionPrototype.get(); }
    570580
    571581    Structure* debuggerScopeStructure() const { return m_debuggerScopeStructure.get(this); }
    … …  
    628638    Structure* generatorFunctionStructure() const { return m_generatorFunctionStructure.get(); }
    629639    Structure* asyncFunctionStructure() const { return m_asyncFunctionStructure.get(); }
     640    Structure* asyncGeneratorFunctionStructure() const { return m_asyncGeneratorFunctionStructure.get(); }
    630641    Structure* stringObjectStructure() const { return m_stringObjectStructure.get(); }
    631642    Structure* symbolObjectStructure() const { return m_symbolObjectStructure.get(); }

  • trunk/Source/JavaScriptCore/runtime/Options.h

    r220449 r221080  
    449449    v(bool, useWebAssembly, true, Normal, "Expose the WebAssembly global object.") \
    450450    \
    451     v(bool, useAsyncIterator, false, Normal, "Allow to use Async Iterator in JS.") \
     451    v(bool, useAsyncIterator, true, Normal, "Allow to use Async Iterator in JS.") \
    452452    \
    453453    v(bool, failToCompileWebAssemblyCode, false, Normal, "If true, no Wasm::Plan will sucessfully compile a function.") \
Note: See TracChangeset for help on using the changeset viewer.