]> granicus.if.org Git - php/commitdiff
Reorder switch cases for consistency between zend_jit() and zend_jit_trace()
authorDmitry Stogov <dmitry@zend.com>
Wed, 2 Sep 2020 20:16:58 +0000 (23:16 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 2 Sep 2020 20:16:58 +0000 (23:16 +0300)
ext/opcache/jit/zend_jit.c

index 98bcdc46d9236e4fc0e6186291d9c1b3f1b65e48..ea5bbfb33993a5f1be83e1f38114008691053285 100644 (file)
@@ -2951,16 +2951,6 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
                                                        goto jit_failure;
                                                }
                                                goto done;
-                                       case ZEND_FE_FETCH_R:
-                                               op1_info = OP1_INFO();
-                                               if ((op1_info & MAY_BE_ANY) != MAY_BE_ARRAY) {
-                                                       break;
-                                               }
-                                               if (!zend_jit_fe_fetch(&dasm_state, opline, op_array, ssa, ssa_op,
-                                                               op1_info, ssa->cfg.blocks[b].successors[0], opline->opcode, NULL)) {
-                                                       goto jit_failure;
-                                               }
-                                               goto done;
                                        case ZEND_VERIFY_RETURN_TYPE:
                                                if (opline->op1_type == IS_UNUSED) {
                                                        /* Always throws */
@@ -2982,6 +2972,16 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
                                                        goto jit_failure;
                                                }
                                                goto done;
+                                       case ZEND_FE_FETCH_R:
+                                               op1_info = OP1_INFO();
+                                               if ((op1_info & MAY_BE_ANY) != MAY_BE_ARRAY) {
+                                                       break;
+                                               }
+                                               if (!zend_jit_fe_fetch(&dasm_state, opline, op_array, ssa, ssa_op,
+                                                               op1_info, ssa->cfg.blocks[b].successors[0], opline->opcode, NULL)) {
+                                                       goto jit_failure;
+                                               }
+                                               goto done;
                                        default:
                                                break;
                                }