Merge pull request mozilla#54 from bytecodealliance/cfallin/fix-if-co…

…nversion-on-pbl-branches PBL/weval: value-specialize on two-way conditional inputs to avoid issues with if-conversion.
cfallin · Jul 31, 2024 · b44d44f · b44d44f
2 parents b7935be + 7d24061
commit b44d44f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/js/src/vm/PortableBaselineInterpret.cpp b/js/src/vm/PortableBaselineInterpret.cpp
@@ -6350,7 +6350,8 @@ PBIResult PortableBaselineInterpret(JSContext* cx_, State& state, Stack& stack,
           result = Value::fromRawBits(ic_ret).toBoolean();
         }
         int32_t jumpOffset = GET_JUMP_OFFSET(pc);
-        if (!result) {
+        int choice = PBL_SPECIALIZE_VALUE(uint32_t(result), 0, 1);
+        if (!choice) {
           ADVANCE(jumpOffset);
           PREDICT_NEXT(JumpTarget);
           PREDICT_NEXT(LoopHead);
@@ -6376,7 +6377,8 @@ PBIResult PortableBaselineInterpret(JSContext* cx_, State& state, Stack& stack,
           result = Value::fromRawBits(ic_ret).toBoolean();
         }
         int32_t jumpOffset = GET_JUMP_OFFSET(pc);
-        if (result) {
+        int choice = PBL_SPECIALIZE_VALUE(uint32_t(result), 0, 1);
+        if (choice) {
           ADVANCE(jumpOffset);
           PREDICT_NEXT(JumpTarget);
           PREDICT_NEXT(LoopHead);
@@ -6404,7 +6406,8 @@ PBIResult PortableBaselineInterpret(JSContext* cx_, State& state, Stack& stack,
           result = Value::fromRawBits(ic_ret).toBoolean();
         }
         int32_t jumpOffset = GET_JUMP_OFFSET(pc);
-        if (result) {
+        int choice = PBL_SPECIALIZE_VALUE(uint32_t(result), 0, 1);
+        if (choice) {
           ADVANCE(jumpOffset);
           PREDICT_NEXT(JumpTarget);
           PREDICT_NEXT(LoopHead);
@@ -6432,7 +6435,8 @@ PBIResult PortableBaselineInterpret(JSContext* cx_, State& state, Stack& stack,
           result = Value::fromRawBits(ic_ret).toBoolean();
         }
         int32_t jumpOffset = GET_JUMP_OFFSET(pc);
-        if (!result) {
+        int choice = PBL_SPECIALIZE_VALUE(uint32_t(result), 0, 1);
+        if (!choice) {
           ADVANCE(jumpOffset);
           PREDICT_NEXT(JumpTarget);
           PREDICT_NEXT(LoopHead);