diff options
| author | Gaming4JC <g4jc@hyperbola.info> | 2019-12-01 18:44:06 -0500 |
|---|---|---|
| committer | Gaming4JC <g4jc@hyperbola.info> | 2019-12-17 06:25:23 -0500 |
| commit | f07d5707c77e73031b6921faac165ca7f8d577c6 (patch) | |
| tree | 0ecbf325bbefb73bee1dce56dac494620b461fb2 /js/src/vm | |
| parent | 9163aaebb670bd87e6ef71beaf24999c926217eb (diff) | |
| download | UXP-f07d5707c77e73031b6921faac165ca7f8d577c6.tar UXP-f07d5707c77e73031b6921faac165ca7f8d577c6.tar.gz UXP-f07d5707c77e73031b6921faac165ca7f8d577c6.tar.lz UXP-f07d5707c77e73031b6921faac165ca7f8d577c6.tar.xz UXP-f07d5707c77e73031b6921faac165ca7f8d577c6.zip | |
Bug 1343481 - Part 2: Stop using StarGegerator for async function.
Tag #1287
Diffstat (limited to 'js/src/vm')
| -rw-r--r-- | js/src/vm/AsyncFunction.cpp | 2 | ||||
| -rw-r--r-- | js/src/vm/Debugger.cpp | 2 | ||||
| -rw-r--r-- | js/src/vm/GeneratorObject.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/js/src/vm/AsyncFunction.cpp b/js/src/vm/AsyncFunction.cpp index e14b77424..be7a36ecc 100644 --- a/js/src/vm/AsyncFunction.cpp +++ b/js/src/vm/AsyncFunction.cpp @@ -109,7 +109,7 @@ WrappedAsyncFunction(JSContext* cx, unsigned argc, Value* vp) JSObject* js::WrapAsyncFunctionWithProto(JSContext* cx, HandleFunction unwrapped, HandleObject proto) { - MOZ_ASSERT(unwrapped->isStarGenerator()); + MOZ_ASSERT(unwrapped->isAsync()); MOZ_ASSERT(proto, "We need an explicit prototype to avoid the default" "%FunctionPrototype% fallback in NewFunctionWithProto()."); diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp index b3efeb175..7c09c50b0 100644 --- a/js/src/vm/Debugger.cpp +++ b/js/src/vm/Debugger.cpp @@ -1569,7 +1569,7 @@ CheckResumptionValue(JSContext* cx, AbstractFramePtr frame, const Maybe<HandleVa JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_BAD_AWAIT); return false; } - } else if (callee->isStarGenerator()) { + } else if (callee->isStarGenerator() || callee->isAsync()) { if (!CheckStarGeneratorResumptionValue(cx, vp)) { JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_BAD_YIELD); return false; diff --git a/js/src/vm/GeneratorObject.cpp b/js/src/vm/GeneratorObject.cpp index 448bc543d..c0dff8faa 100644 --- a/js/src/vm/GeneratorObject.cpp +++ b/js/src/vm/GeneratorObject.cpp @@ -25,7 +25,7 @@ GeneratorObject::create(JSContext* cx, AbstractFramePtr frame) Rooted<GlobalObject*> global(cx, cx->global()); RootedNativeObject obj(cx); - if (frame.script()->isStarGenerator()) { + if (frame.script()->isStarGenerator() || frame.script()->isAsync()) { RootedValue pval(cx); RootedObject fun(cx, frame.callee()); // FIXME: This would be faster if we could avoid doing a lookup to get |