/js/src/vm/Opcodes.h and one more file have been updated (d4ac4955)

[github-actions[bot]]

Files

• /js/src/vm/BytecodeUtil.cpp
• /js/src/vm/Opcodes.h

Changesets

• https://hg.mozilla.org/mozilla-central/rev/d4ac49553c04ee2f9c1cce36705f617601108b9d Bug 1911642 - Eliminate GetDisposableRecord opcode. r=arai

Diffs

/js/src/vm/BytecodeUtil.cpp

--- 41d7324db09a0d5989fb12454651403991a5284d/js/src/vm/BytecodeUtil.cpp
+++ d4ac49553c04ee2f9c1cce36705f617601108b9d/js/src/vm/BytecodeUtil.cpp
@@ -2146,26 +2146,16 @@ bool ExpressionDecompiler::decompilePC(j
         return decompilePCForStackOperand(pc, -1);

       case JSOp::TakeDisposeCapability:
         if (defIndex == 0) {
           return write("DISPOSECAPABILITY");
         }
         MOZ_ASSERT(defIndex == 1);
         return write("COUNT");
-
-      case JSOp::GetDisposableRecord:
-        if (defIndex == 0) {
-          return write("HINT");
-        }
-        if (defIndex == 1) {
-          return write("METHOD");
-        }
-        MOZ_ASSERT(defIndex == 2);
-        return write("VALUE");
 #  endif

       default:
         break;
     }
     return write("<unknown>");
   }
 #endif /* DEBUG */

/js/src/vm/Opcodes.h

--- 41d7324db09a0d5989fb12454651403991a5284d/js/src/vm/Opcodes.h
+++ d4ac49553c04ee2f9c1cce36705f617601108b9d/js/src/vm/Opcodes.h
@@ -3452,25 +3452,16 @@
      *
      *   Category: Variables and scopes
      *   Type: Entering and leaving environments
      *   Operands:
      *   Stack: => disposeCapability, count
      */ \
     IF_EXPLICIT_RESOURCE_MANAGEMENT(MACRO(TakeDisposeCapability, take_dispose_capability, NULL, 1, 0, 2, JOF_BYTE)) \
     /*
-     * Get the disposable record contents from the given dispose capability and given index.
-     *
-     *   Category: Variables and scopes
-     *   Type: Entering and leaving environments
-     *   Operands:
-     *   Stack: disposeCapability, index => hint, method, value
-     */ \
-    IF_EXPLICIT_RESOURCE_MANAGEMENT(MACRO(GetDisposableRecord, get_disposable_record, NULL, 1, 2, 3, JOF_BYTE)) \
-    /*
      * Push the current VariableEnvironment (the environment on the environment
      * chain designated to receive new variables).
      *
      * Implements: [Annex B.3.3.1, changes to FunctionDeclarationInstantiation
      * for block-level functions][1], step 1.a.ii.3.a, and similar steps in
      * other Annex B.3.3 algorithms, when setting the function's second binding
      * can't be optimized.
      *
@@ -3724,23 +3715,24 @@

 /*
  * In certain circumstances it may be useful to "pad out" the opcode space to
  * a power of two.  Use this macro to do so.
  */

 #ifdef ENABLE_EXPLICIT_RESOURCE_MANAGEMENT
 #  define FOR_EACH_TRAILING_UNUSED_OPCODE(MACRO) \
+    IF_RECORD_TUPLE(/* empty */, MACRO(241))     \
     IF_RECORD_TUPLE(/* empty */, MACRO(242))     \
     IF_RECORD_TUPLE(/* empty */, MACRO(243))     \
     IF_RECORD_TUPLE(/* empty */, MACRO(244))     \
     IF_RECORD_TUPLE(/* empty */, MACRO(245))     \
     IF_RECORD_TUPLE(/* empty */, MACRO(246))     \
     IF_RECORD_TUPLE(/* empty */, MACRO(247))     \
-    IF_RECORD_TUPLE(/* empty */, MACRO(248))     \
+    MACRO(248)                                   \
     MACRO(249)                                   \
     MACRO(250)                                   \
     MACRO(251)                                   \
     MACRO(252)                                   \
     MACRO(253)                                   \
     MACRO(254)                                   \
     MACRO(255)
 #else