From 1ea1ed151571a523d1c8016dcd314e12238cd785 Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Sat, 24 Mar 2018 12:27:00 +0100
Subject: Bug 1147371: Implement calling IteratorClose and "return" on
 iterators in yield*

Issue #74
---
 js/src/jit/BaselineCompiler.cpp | 14 +++++++++++++-
 js/src/jit/BaselineCompiler.h   |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'js/src/jit')

diff --git a/js/src/jit/BaselineCompiler.cpp b/js/src/jit/BaselineCompiler.cpp
index 2f0d417071..4524bae07a 100644
--- a/js/src/jit/BaselineCompiler.cpp
+++ b/js/src/jit/BaselineCompiler.cpp
@@ -3975,7 +3975,7 @@ BaselineCompiler::emit_JSOP_MOREITER()
 }
 
 bool
-BaselineCompiler::emit_JSOP_ISNOITER()
+BaselineCompiler::emitIsMagicValue()
 {
     frame.syncStack(0);
 
@@ -3993,6 +3993,12 @@ BaselineCompiler::emit_JSOP_ISNOITER()
     return true;
 }
 
+bool
+BaselineCompiler::emit_JSOP_ISNOITER()
+{
+    return emitIsMagicValue();
+}
+
 bool
 BaselineCompiler::emit_JSOP_ENDITER()
 {
@@ -4004,6 +4010,12 @@ BaselineCompiler::emit_JSOP_ENDITER()
     return emitOpIC(compiler.getStub(&stubSpace_));
 }
 
+bool
+BaselineCompiler::emit_JSOP_ISGENCLOSING()
+{
+    return emitIsMagicValue();
+}
+
 bool
 BaselineCompiler::emit_JSOP_GETRVAL()
 {
diff --git a/js/src/jit/BaselineCompiler.h b/js/src/jit/BaselineCompiler.h
index 60dac09665..18e56bcd42 100644
--- a/js/src/jit/BaselineCompiler.h
+++ b/js/src/jit/BaselineCompiler.h
@@ -203,6 +203,7 @@ namespace jit {
     _(JSOP_MOREITER)           \
     _(JSOP_ISNOITER)           \
     _(JSOP_ENDITER)            \
+    _(JSOP_ISGENCLOSING)       \
     _(JSOP_GENERATOR)          \
     _(JSOP_INITIALYIELD)       \
     _(JSOP_YIELD)              \
@@ -342,6 +343,8 @@ class BaselineCompiler : public BaselineCompilerSpecific
     MOZ_MUST_USE bool emitThrowConstAssignment();
     MOZ_MUST_USE bool emitUninitializedLexicalCheck(const ValueOperand& val);
 
+    MOZ_MUST_USE bool emitIsMagicValue();
+
     MOZ_MUST_USE bool addPCMappingEntry(bool addIndexEntry);
 
     MOZ_MUST_USE bool addYieldOffset();
-- 
cgit v1.2.3