Update opcode for bug 1673553 and bug 1681272

mozilla-spidermonkey · Dec 15, 2020 · 2c388f2 · 2c388f2
1 parent 3a03e10
commit 2c388f2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/crates/stencil/src/copy/Opcodes.h b/crates/stencil/src/copy/Opcodes.h
@@ -1432,7 +1432,7 @@
     /*
      * Initialize an array element `array[index]` with value `val`.
      *
-     * `val` may be `MagicValue(JS_ELEMENTS_HOLE)`. If it is, this does nothing.
+     * `val` may be `MagicValue(JS_ELEMENTS_HOLE)` pushed by `JSOp::Hole`.
      *
      * This never calls setters or proxy traps.
      *
@@ -1449,13 +1449,13 @@
      *   Operands: uint32_t index
      *   Stack: array, val => array
      */ \
-    MACRO(InitElemArray, init_elem_array, NULL, 5, 2, 1, JOF_UINT32|JOF_ELEM|JOF_PROPINIT|JOF_IC) \
+    MACRO(InitElemArray, init_elem_array, NULL, 5, 2, 1, JOF_UINT32|JOF_ELEM|JOF_PROPINIT) \
     /*
      * Initialize an array element `array[index++]` with value `val`.
      *
-     * `val` may be `MagicValue(JS_ELEMENTS_HOLE)`. If it is, no element is
-     * defined, but the array length and the stack value `index` are still
-     * incremented.
+     * `val` may be `MagicValue(JS_ELEMENTS_HOLE)` pushed by `JSOp::Hole`. If it
+     * is, no element is defined, but the array length and the stack value
+     * `index` are still incremented.
      *
      * This never calls setters or proxy traps.
      *
@@ -3339,7 +3339,7 @@
      *
      * Example 1: `arguments[0]` is supported; therefore the interpreter's
      * implementation of `JSOp::GetElem` checks for optimized arguments (see
-     * `GetElemOptimizedArguments`).
+     * `MaybeGetElemOptimizedArguments`).
      *
      * Example 2: `f.apply(this, arguments)` is supported; therefore our
      * implementation of `Function.prototype.apply` checks for optimized

diff --git a/crates/stencil/src/copy/StencilEnums.h b/crates/stencil/src/copy/StencilEnums.h
@@ -297,7 +297,7 @@ enum class MutableScriptFlagsEnum : uint32_t {
 
   // An overflow happened where Range Analysis hoped it would not. The next
   // compile should be more conservative.
-  HadOverflowBailout = 1 << 21,
+  HadEagerTruncationBailout = 1 << 21,
 
   // This script should not be inlined into others. This happens after inlining
   // has failed.

diff --git a/crates/stencil/src/opcode.rs b/crates/stencil/src/opcode.rs
@@ -107,7 +107,7 @@ macro_rules! using_opcode_database {
                 (ToAsyncIter, to_async_iter, NULL, 1, 2, 1, JOF_BYTE),
                 (MutateProto, mutate_proto, NULL, 1, 2, 1, JOF_BYTE),
                 (NewArray, new_array, NULL, 5, 0, 1, JOF_UINT32|JOF_IC),
-                (InitElemArray, init_elem_array, NULL, 5, 2, 1, JOF_UINT32|JOF_ELEM|JOF_PROPINIT|JOF_IC),
+                (InitElemArray, init_elem_array, NULL, 5, 2, 1, JOF_UINT32|JOF_ELEM|JOF_PROPINIT),
                 (InitElemInc, init_elem_inc, NULL, 1, 3, 2, JOF_BYTE|JOF_ELEM|JOF_PROPINIT|JOF_IC),
                 (Hole, hole, NULL, 1, 0, 1, JOF_BYTE),
                 (RegExp, reg_exp, NULL, 5, 0, 1, JOF_REGEXP),

diff --git a/crates/stencil/src/script.rs b/crates/stencil/src/script.rs
@@ -101,7 +101,7 @@ pub enum MutableScriptFlagsEnum {
     #[allow(dead_code)]
     HadLICMInvalidation = 1 << 20,
     #[allow(dead_code)]
-    HadOverflowBailout = 1 << 21,
+    HadEagerTruncationBailout = 1 << 21,
     #[allow(dead_code)]
     Uninlineable = 1 << 22,
     #[allow(dead_code)]