@@ -134,43 +134,43 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
134134 LITERAL_INFO (opline -> op1 .constant , 1 );
135135 break ;
136136 case ZEND_INIT_FCALL_BY_NAME :
137- LITERAL_INFO (opline -> op2 .constant , 2 );
137+ LITERAL_INFO (opline -> op2 .constant , 1 );
138138 break ;
139139 case ZEND_INIT_NS_FCALL_BY_NAME :
140- LITERAL_INFO (opline -> op2 .constant , 3 );
140+ LITERAL_INFO (opline -> op2 .constant , 2 );
141141 break ;
142142 case ZEND_INIT_METHOD_CALL :
143143 if (opline -> op1_type == IS_CONST ) {
144144 LITERAL_INFO (opline -> op1 .constant , 1 );
145145 }
146146 if (opline -> op2_type == IS_CONST ) {
147- LITERAL_INFO (opline -> op2 .constant , 2 );
147+ LITERAL_INFO (opline -> op2 .constant , 1 );
148148 }
149149 break ;
150150 case ZEND_INIT_STATIC_METHOD_CALL :
151151 if (opline -> op1_type == IS_CONST ) {
152- LITERAL_INFO (opline -> op1 .constant , 2 );
152+ LITERAL_INFO (opline -> op1 .constant , 1 );
153153 }
154154 if (opline -> op2_type == IS_CONST ) {
155- LITERAL_INFO (opline -> op2 .constant , 2 );
155+ LITERAL_INFO (opline -> op2 .constant , 1 );
156156 }
157157 break ;
158158 case ZEND_INIT_PARENT_PROPERTY_HOOK_CALL :
159159 LITERAL_INFO (opline -> op1 .constant , 1 );
160160 break ;
161161 case ZEND_CATCH :
162- LITERAL_INFO (opline -> op1 .constant , 2 );
162+ LITERAL_INFO (opline -> op1 .constant , 1 );
163163 break ;
164164 case ZEND_FETCH_CONSTANT :
165165 if (opline -> op1 .num & IS_CONSTANT_UNQUALIFIED_IN_NAMESPACE ) {
166- LITERAL_INFO (opline -> op2 .constant , 3 );
167- } else {
168166 LITERAL_INFO (opline -> op2 .constant , 2 );
167+ } else {
168+ LITERAL_INFO (opline -> op2 .constant , 1 );
169169 }
170170 break ;
171171 case ZEND_FETCH_CLASS_CONSTANT :
172172 if (opline -> op1_type == IS_CONST ) {
173- LITERAL_INFO (opline -> op1 .constant , 2 );
173+ LITERAL_INFO (opline -> op1 .constant , 1 );
174174 }
175175 if (opline -> op2_type == IS_CONST ) {
176176 LITERAL_INFO (opline -> op2 .constant , 1 );
@@ -192,7 +192,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
192192 case ZEND_POST_DEC_STATIC_PROP :
193193 case ZEND_ASSIGN_STATIC_PROP_OP :
194194 if (opline -> op2_type == IS_CONST ) {
195- LITERAL_INFO (opline -> op2 .constant , 2 );
195+ LITERAL_INFO (opline -> op2 .constant , 1 );
196196 }
197197 if (opline -> op1_type == IS_CONST ) {
198198 LITERAL_INFO (opline -> op1 .constant , 1 );
@@ -201,12 +201,12 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
201201 case ZEND_FETCH_CLASS :
202202 case ZEND_INSTANCEOF :
203203 if (opline -> op2_type == IS_CONST ) {
204- LITERAL_INFO (opline -> op2 .constant , 2 );
204+ LITERAL_INFO (opline -> op2 .constant , 1 );
205205 }
206206 break ;
207207 case ZEND_NEW :
208208 if (opline -> op1_type == IS_CONST ) {
209- LITERAL_INFO (opline -> op1 .constant , 2 );
209+ LITERAL_INFO (opline -> op1 .constant , 1 );
210210 }
211211 break ;
212212 case ZEND_DECLARE_CLASS :
0 commit comments