File tree Expand file tree Collapse file tree 1 file changed +7
-1
lines changed Expand file tree Collapse file tree 1 file changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -678,12 +678,18 @@ ZEND_API int pass_two(zend_op_array *op_array)
678
678
ZEND_PASS_TWO_UPDATE_JMP_TARGET (op_array , opline , opline -> op2 );
679
679
break ;
680
680
case ZEND_ASSERT_CHECK :
681
+ {
681
682
/* If result of assert is unused, result of check is unused as well */
682
- if (op_array -> opcodes [opline -> op2 .opline_num - 1 ].result_type == IS_UNUSED ) {
683
+ zend_op * call = & op_array -> opcodes [opline -> op2 .opline_num - 1 ];
684
+ if (call -> opcode == ZEND_EXT_FCALL_END ) {
685
+ call -- ;
686
+ }
687
+ if (call -> result_type == IS_UNUSED ) {
683
688
opline -> result_type = IS_UNUSED ;
684
689
}
685
690
ZEND_PASS_TWO_UPDATE_JMP_TARGET (op_array , opline , opline -> op2 );
686
691
break ;
692
+ }
687
693
case ZEND_DECLARE_ANON_CLASS :
688
694
case ZEND_DECLARE_ANON_INHERITED_CLASS :
689
695
case ZEND_CATCH :
You can’t perform that action at this time.
0 commit comments