@@ -10188,9 +10188,9 @@ static zend_op *zend_compile_rope_add(znode *result, uint32_t num, znode *elem_n
10188
10188
}
10189
10189
/* }}} */
10190
10190
10191
- static void zend_compile_rope_finalize (znode * result , uint32_t j , zend_op * init_opline , zend_op * opline )
10191
+ static void zend_compile_rope_finalize (znode * result , uint32_t rope_elements , zend_op * init_opline , zend_op * opline )
10192
10192
{
10193
- if (j == 1 ) {
10193
+ if (rope_elements == 1 ) {
10194
10194
if (opline -> op2_type == IS_CONST ) {
10195
10195
GET_NODE (result , opline -> op2 );
10196
10196
MAKE_NOP (opline );
@@ -10202,7 +10202,7 @@ static void zend_compile_rope_finalize(znode *result, uint32_t j, zend_op *init_
10202
10202
SET_UNUSED (opline -> op2 );
10203
10203
zend_make_tmp_result (result , opline );
10204
10204
}
10205
- } else if (j == 2 ) {
10205
+ } else if (rope_elements == 2 ) {
10206
10206
opline -> opcode = ZEND_FAST_CONCAT ;
10207
10207
opline -> extended_value = 0 ;
10208
10208
opline -> op1_type = init_opline -> op2_type ;
@@ -10212,13 +10212,13 @@ static void zend_compile_rope_finalize(znode *result, uint32_t j, zend_op *init_
10212
10212
} else {
10213
10213
uint32_t var ;
10214
10214
10215
- init_opline -> extended_value = j ;
10215
+ init_opline -> extended_value = rope_elements ;
10216
10216
opline -> opcode = ZEND_ROPE_END ;
10217
10217
zend_make_tmp_result (result , opline );
10218
10218
var = opline -> op1 .var = get_temporary_variable ();
10219
10219
10220
10220
/* Allocates the necessary number of zval slots to keep the rope */
10221
- uint32_t i = ((j * sizeof (zend_string * )) + (sizeof (zval ) - 1 )) / sizeof (zval );
10221
+ uint32_t i = ((rope_elements * sizeof (zend_string * )) + (sizeof (zval ) - 1 )) / sizeof (zval );
10222
10222
while (i > 1 ) {
10223
10223
get_temporary_variable ();
10224
10224
i -- ;
0 commit comments