@@ -1221,11 +1221,10 @@ static int zend_jit_compute_liveness(const zend_op_array *op_array, zend_ssa *ss
1221
1221
/* Register hinting (a cheap way for register coalescing) */
1222
1222
for (i = 0 ; i < ssa -> vars_count ; i ++ ) {
1223
1223
if (intervals [i ]) {
1224
- int var = intervals [i ]-> ssa_var ;
1225
1224
int src ;
1226
1225
1227
- if (ssa -> vars [var ].definition_phi ) {
1228
- zend_ssa_phi * phi = ssa -> vars [var ].definition_phi ;
1226
+ if (ssa -> vars [i ].definition_phi ) {
1227
+ zend_ssa_phi * phi = ssa -> vars [i ].definition_phi ;
1229
1228
1230
1229
if (phi -> pi >= 0 ) {
1231
1230
src = phi -> sources [0 ];
@@ -1253,10 +1252,9 @@ static int zend_jit_compute_liveness(const zend_op_array *op_array, zend_ssa *ss
1253
1252
}
1254
1253
for (i = 0 ; i < ssa -> vars_count ; i ++ ) {
1255
1254
if (intervals [i ] && !intervals [i ]-> hint ) {
1256
- int var = intervals [i ]-> ssa_var ;
1257
1255
1258
- if (ssa -> vars [var ].definition >= 0 ) {
1259
- uint32_t line = ssa -> vars [var ].definition ;
1256
+ if (ssa -> vars [i ].definition >= 0 ) {
1257
+ uint32_t line = ssa -> vars [i ].definition ;
1260
1258
const zend_op * opline = op_array -> opcodes + line ;
1261
1259
1262
1260
switch (opline -> opcode ) {
@@ -1265,8 +1263,8 @@ static int zend_jit_compute_liveness(const zend_op_array *op_array, zend_ssa *ss
1265
1263
case ZEND_POST_DEC :
1266
1264
if (ssa -> ops [line ].op1_use >= 0 &&
1267
1265
intervals [ssa -> ops [line ].op1_use ] &&
1268
- (var == ssa -> ops [line ].op1_def ||
1269
- (var == ssa -> ops [line ].result_def &&
1266
+ (i == ssa -> ops [line ].op1_def ||
1267
+ (i == ssa -> ops [line ].result_def &&
1270
1268
(ssa -> ops [line ].op1_def < 0 ||
1271
1269
!intervals [ssa -> ops [line ].op1_def ])))) {
1272
1270
zend_jit_add_hint (intervals , i , ssa -> ops [line ].op1_use );
@@ -1275,7 +1273,7 @@ static int zend_jit_compute_liveness(const zend_op_array *op_array, zend_ssa *ss
1275
1273
case ZEND_SEND_VAR :
1276
1274
case ZEND_PRE_INC :
1277
1275
case ZEND_PRE_DEC :
1278
- if (var == ssa -> ops [line ].op1_def &&
1276
+ if (i == ssa -> ops [line ].op1_def &&
1279
1277
ssa -> ops [line ].op1_use >= 0 &&
1280
1278
intervals [ssa -> ops [line ].op1_use ]) {
1281
1279
zend_jit_add_hint (intervals , i , ssa -> ops [line ].op1_use );
@@ -1284,11 +1282,11 @@ static int zend_jit_compute_liveness(const zend_op_array *op_array, zend_ssa *ss
1284
1282
case ZEND_ASSIGN :
1285
1283
if (ssa -> ops [line ].op2_use >= 0 &&
1286
1284
intervals [ssa -> ops [line ].op2_use ] &&
1287
- (var == ssa -> ops [line ].op2_def ||
1288
- (var == ssa -> ops [line ].op1_def &&
1285
+ (i == ssa -> ops [line ].op2_def ||
1286
+ (i == ssa -> ops [line ].op1_def &&
1289
1287
(ssa -> ops [line ].op2_def < 0 ||
1290
1288
!intervals [ssa -> ops [line ].op2_def ])) ||
1291
- (var == ssa -> ops [line ].result_def &&
1289
+ (i == ssa -> ops [line ].result_def &&
1292
1290
(ssa -> ops [line ].op2_def < 0 ||
1293
1291
!intervals [ssa -> ops [line ].op2_def ]) &&
1294
1292
(ssa -> ops [line ].op1_def < 0 ||
0 commit comments