Bug 1916260 - Part 9: Resolve binding in destructuring before retriev…

…ing destructured element. r=arai `BytecodeEmitter::emitDestructuringLHSRef` needs to call `NameOpEmitter::prepareForRhs` to emit the necessary steps to resolve environment bindings. To avoid adding a new `skipPrepareForRhs` method to `NameOpEmitter`, instead pass `DestructuringLHSRef&` to `emitDestructuringLHSRef`, where `DestructuringLHSRef` holds the emitter for the destructuring left-hand side reference. Tests are in <tc39/test262#4216>. Differential Revision: https://phabricator.services.mozilla.com/D220828 UltraBlame original commit: 4c26da6ff32617ca7b277a16949419a7ab28ac5b
marco-c · Sep 6, 2024 · 16154a6 · 16154a6
1 parent a145e76
commit 16154a6
Show file tree

Hide file tree

Showing 9 changed files with 491 additions and 573 deletions.
diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
diff --git a/js/src/frontend/BytecodeEmitter.h b/js/src/frontend/BytecodeEmitter.h
@@ -325,6 +325,9 @@ class
 ClassEmitter
 ;
 class
+DestructuringLHSRef
+;
+class
 ElemOpEmitter
 ;
 class
@@ -3278,9 +3281,11 @@ emitDestructuringLHSRef
 ParseNode
 *
 target
-size_t
-*
-emitted
+DestructuringFlavor
+flav
+DestructuringLHSRef
+&
+lref
 )
 ;
 [
@@ -3296,6 +3301,9 @@ ParseNode
 target
 DestructuringFlavor
 flav
+DestructuringLHSRef
+&
+lref
 )
 ;
 [

diff --git a/js/src/frontend/ElemOpEmitter.cpp b/js/src/frontend/ElemOpEmitter.cpp
@@ -558,53 +558,6 @@ bool
 ElemOpEmitter
 :
 :
-skipObjAndKeyAndRhs
-(
-)
-{
-MOZ_ASSERT
-(
-state_
-=
-=
-State
-:
-:
-Start
-)
-;
-MOZ_ASSERT
-(
-isSimpleAssignment
-(
-)
-|
-|
-isPropInit
-(
-)
-)
-;
-#
-ifdef
-DEBUG
-state_
-=
-State
-:
-:
-Rhs
-;
-#
-endif
-return
-true
-;
-}
-bool
-ElemOpEmitter
-:
-:
 emitDelete
 (
 )

diff --git a/js/src/frontend/ElemOpEmitter.h b/js/src/frontend/ElemOpEmitter.h
@@ -13,6 +13,13 @@ Attributes
 .
 h
 "
+#
+include
+<
+stddef
+.
+h
+>
 namespace
 js
 {
@@ -396,16 +403,6 @@ nodiscard
 ]
 ]
 bool
-skipObjAndKeyAndRhs
-(
-)
-;
-[
-[
-nodiscard
-]
-]
-bool
 emitDelete
 (
 )
@@ -432,6 +429,20 @@ ValueUsage
 valueUsage
 )
 ;
+size_t
+numReferenceSlots
+(
+)
+const
+{
+return
+2
++
+isSuper
+(
+)
+;
+}
 }
 ;
 }

diff --git a/js/src/frontend/NameOpEmitter.h b/js/src/frontend/NameOpEmitter.h
@@ -15,6 +15,13 @@ h
 "
 #
 include
+<
+stddef
+.
+h
+>
+#
+include
 "
 frontend
 /
@@ -423,6 +430,18 @@ ValueUsage
 valueUsage
 )
 ;
+size_t
+numReferenceSlots
+(
+)
+const
+{
+return
+emittedBindOp
+(
+)
+;
+}
 }
 ;
 }

diff --git a/js/src/frontend/PrivateOpEmitter.cpp b/js/src/frontend/PrivateOpEmitter.cpp
@@ -425,53 +425,6 @@ bool
 PrivateOpEmitter
 :
 :
-skipReference
-(
-)
-{
-MOZ_ASSERT
-(
-state_
-=
-=
-State
-:
-:
-Start
-)
-;
-if
-(
-!
-init
-(
-)
-)
-{
-return
-false
-;
-}
-#
-ifdef
-DEBUG
-state_
-=
-State
-:
-:
-Reference
-;
-#
-endif
-return
-true
-;
-}
-bool
-PrivateOpEmitter
-:
-:
 emitGet
 (
 )

diff --git a/js/src/frontend/PrivateOpEmitter.h b/js/src/frontend/PrivateOpEmitter.h
@@ -434,16 +434,6 @@ nodiscard
 ]
 ]
 bool
-skipReference
-(
-)
-;
-[
-[
-nodiscard
-]
-]
-bool
 emitGet
 (
 )
@@ -480,15 +470,11 @@ ValueUsage
 valueUsage
 )
 ;
-[
-[
-nodiscard
-]
-]
 size_t
 numReferenceSlots
 (
 )
+const
 {
 return
 2

diff --git a/js/src/frontend/PropOpEmitter.cpp b/js/src/frontend/PropOpEmitter.cpp
@@ -492,53 +492,6 @@ bool
 PropOpEmitter
 :
 :
-skipObjAndRhs
-(
-)
-{
-MOZ_ASSERT
-(
-state_
-=
-=
-State
-:
-:
-Start
-)
-;
-MOZ_ASSERT
-(
-isSimpleAssignment
-(
-)
-|
-|
-isPropInit
-(
-)
-)
-;
-#
-ifdef
-DEBUG
-state_
-=
-State
-:
-:
-Rhs
-;
-#
-endif
-return
-true
-;
-}
-bool
-PropOpEmitter
-:
-:
 emitDelete
 (
 TaggedParserAtomIndex

diff --git a/js/src/frontend/PropOpEmitter.h b/js/src/frontend/PropOpEmitter.h
@@ -15,6 +15,13 @@ h
 "
 #
 include
+<
+stddef
+.
+h
+>
+#
+include
 "
 vm
 /
@@ -414,16 +421,6 @@ nodiscard
 ]
 ]
 bool
-skipObjAndRhs
-(
-)
-;
-[
-[
-nodiscard
-]
-]
-bool
 emitDelete
 (
 TaggedParserAtomIndex
@@ -456,6 +453,20 @@ ValueUsage
 valueUsage
 )
 ;
+size_t
+numReferenceSlots
+(
+)
+const
+{
+return
+1
++
+isSuper
+(
+)
+;
+}
 }
 ;
 }