From 9163aaebb670bd87e6ef71beaf24999c926217eb Mon Sep 17 00:00:00 2001
From: Gaming4JC <g4jc@hyperbola.info>
Date: Sun, 1 Dec 2019 13:34:22 -0500
Subject: Bug 1343481 - Part 1: Remove
 {JSFunction,JSScript,LazyScript}.isGenerator() method.

Tag #1287
---
 js/src/frontend/SharedContext.h | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'js/src/frontend/SharedContext.h')

diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h
index 013444690..5766c135a 100644
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -520,7 +520,9 @@ class FunctionBox : public ObjectBox, public SharedContext
         return hasExtensibleScope() ||
                needsHomeObject() ||
                isDerivedClassConstructor() ||
-               isGenerator();
+               isStarGenerator() ||
+               isLegacyGenerator() ||
+               isAsync();
     }
 
     bool hasExtraBodyVarScope() const {
@@ -531,7 +533,7 @@ class FunctionBox : public ObjectBox, public SharedContext
 
     bool needsExtraBodyVarEnvironmentRegardlessOfBindings() const {
         MOZ_ASSERT(hasParameterExprs);
-        return hasExtensibleScope() || isGenerator();
+        return hasExtensibleScope() || needsDotGeneratorName();
     }
 
     bool isLikelyConstructorWrapper() const {
@@ -539,10 +541,17 @@ class FunctionBox : public ObjectBox, public SharedContext
     }
 
     GeneratorKind generatorKind() const { return GeneratorKindFromBits(generatorKindBits_); }
-    bool isGenerator() const { return generatorKind() != NotGenerator; }
     bool isLegacyGenerator() const { return generatorKind() == LegacyGenerator; }
     bool isStarGenerator() const { return generatorKind() == StarGenerator; }
     FunctionAsyncKind asyncKind() const { return AsyncKindFromBits(asyncKindBits_); }
+
+    bool needsFinalYield() const {
+        return isStarGenerator() || isLegacyGenerator() || isAsync();
+    }
+    bool needsDotGeneratorName() const {
+        return isStarGenerator() || isLegacyGenerator() || isAsync();
+    }
+
     bool isAsync() const { return asyncKind() == AsyncFunction; }
     bool isArrow() const { return function()->isArrow(); }
 
@@ -560,7 +569,7 @@ class FunctionBox : public ObjectBox, public SharedContext
         // A generator kind can be set at initialization, or when "yield" is
         // first seen.  In both cases the transition can only happen from
         // NotGenerator.
-        MOZ_ASSERT(!isGenerator());
+        MOZ_ASSERT(!isStarGenerator() && !isLegacyGenerator());
         generatorKindBits_ = GeneratorKindAsBits(kind);
     }
 
@@ -655,7 +664,11 @@ SharedContext::asModuleContext()
 inline bool
 SharedContext::allBindingsClosedOver()
 {
-    return bindingsAccessedDynamically() || (isFunctionBox() && asFunctionBox()->isGenerator());
+    return bindingsAccessedDynamically() ||
+           (isFunctionBox() &&
+            (asFunctionBox()->isStarGenerator() ||
+             asFunctionBox()->isLegacyGenerator() ||
+             asFunctionBox()->isAsync()));
 }
 
 } // namespace frontend
-- 
cgit v1.2.3


From f07d5707c77e73031b6921faac165ca7f8d577c6 Mon Sep 17 00:00:00 2001
From: Gaming4JC <g4jc@hyperbola.info>
Date: Sun, 1 Dec 2019 18:44:06 -0500
Subject: Bug 1343481 - Part 2: Stop using StarGegerator for async function.

Tag #1287
---
 js/src/frontend/SharedContext.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'js/src/frontend/SharedContext.h')

diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h
index 5766c135a..2d478308e 100644
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -552,6 +552,10 @@ class FunctionBox : public ObjectBox, public SharedContext
         return isStarGenerator() || isLegacyGenerator() || isAsync();
     }
 
+    bool needsIteratorResult() const {
+        return isStarGenerator() || isAsync();
+    }
+
     bool isAsync() const { return asyncKind() == AsyncFunction; }
     bool isArrow() const { return function()->isArrow(); }
 
-- 
cgit v1.2.3


From d0d9a4f43dbd58c694c706b17996157fede20bdf Mon Sep 17 00:00:00 2001
From: Gaming4JC <g4jc@hyperbola.info>
Date: Fri, 13 Dec 2019 20:59:32 -0500
Subject: Bug 1316098 - Optimize out result object allocation for await/return
 in async function.

Tag #1287
---
 js/src/frontend/SharedContext.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/src/frontend/SharedContext.h')

diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h
index 2d478308e..8a5f6c0bd 100644
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -553,7 +553,7 @@ class FunctionBox : public ObjectBox, public SharedContext
     }
 
     bool needsIteratorResult() const {
-        return isStarGenerator() || isAsync();
+        return isStarGenerator();
     }
 
     bool isAsync() const { return asyncKind() == AsyncFunction; }
-- 
cgit v1.2.3