From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 2 Sep 2020 20:16:58 +0000 (+0300)
Subject: Reorder switch cases for consistency between zend_jit() and zend_jit_trace()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=508f8285e2981a51b898676adf43098f9357f9be;p=php

Reorder switch cases for consistency between zend_jit() and zend_jit_trace()
---

diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
index 98bcdc46d9..ea5bbfb339 100644
--- a/ext/opcache/jit/zend_jit.c
+++ b/ext/opcache/jit/zend_jit.c
@@ -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;
 				}