@@ -62,9 +62,8 @@ typedef struct _func_info_t {
6262
6363static uint32_t zend_strlen_info (const zend_call_info * call_info , const zend_ssa * ssa )
6464{
65- if (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args &&
66- call_info -> num_args == 1 ) {
67-
65+ ZEND_ASSERT (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args );
66+ if (call_info -> num_args == 1 ) {
6867 uint32_t tmp = 0 ;
6968 if (call_info -> arg_info [0 ].opline ) {
7069 uint32_t arg_info = _ssa_op1_info (call_info -> caller_op_array , ssa , call_info -> arg_info [0 ].opline );
@@ -88,8 +87,8 @@ static uint32_t zend_strlen_info(const zend_call_info *call_info, const zend_ssa
8887
8988static uint32_t zend_dechex_info (const zend_call_info * call_info , const zend_ssa * ssa )
9089{
91- if (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args &&
92- call_info -> num_args == 1 ) {
90+ ZEND_ASSERT (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args );
91+ if ( call_info -> num_args == 1 ) {
9392 return MAY_BE_RC1 | MAY_BE_STRING ;
9493 } else {
9594 /* warning, and returns NULL */
@@ -99,8 +98,8 @@ static uint32_t zend_dechex_info(const zend_call_info *call_info, const zend_ssa
9998
10099static uint32_t zend_range_info (const zend_call_info * call_info , const zend_ssa * ssa )
101100{
102- if (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args &&
103- (call_info -> num_args == 2 || call_info -> num_args == 3 ) ) {
101+ ZEND_ASSERT (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args );
102+ if (call_info -> num_args == 2 || call_info -> num_args == 3 ) {
104103
105104 uint32_t t1 = _ssa_op1_info (call_info -> caller_op_array , ssa , call_info -> arg_info [0 ].opline );
106105 uint32_t t2 = _ssa_op1_info (call_info -> caller_op_array , ssa , call_info -> arg_info [1 ].opline );
@@ -132,8 +131,8 @@ static uint32_t zend_range_info(const zend_call_info *call_info, const zend_ssa
132131
133132static uint32_t zend_is_type_info (const zend_call_info * call_info , const zend_ssa * ssa )
134133{
135- if (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args &&
136- call_info -> num_args == 1 ) {
134+ ZEND_ASSERT (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args );
135+ if ( call_info -> num_args == 1 ) {
137136 return MAY_BE_FALSE | MAY_BE_TRUE ;
138137 } else {
139138 return MAY_BE_FALSE | MAY_BE_TRUE | FUNC_MAY_WARN ;
@@ -142,8 +141,8 @@ static uint32_t zend_is_type_info(const zend_call_info *call_info, const zend_ss
142141
143142static uint32_t zend_l_ss_info (const zend_call_info * call_info , const zend_ssa * ssa )
144143{
145- if (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args &&
146- call_info -> num_args == 2 ) {
144+ ZEND_ASSERT (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args );
145+ if ( call_info -> num_args == 2 ) {
147146
148147 uint32_t arg1_info = _ssa_op1_info (call_info -> caller_op_array , ssa , call_info -> arg_info [0 ].opline );
149148 uint32_t arg2_info = _ssa_op1_info (call_info -> caller_op_array , ssa , call_info -> arg_info [1 ].opline );
@@ -167,8 +166,8 @@ static uint32_t zend_l_ss_info(const zend_call_info *call_info, const zend_ssa *
167166
168167static uint32_t zend_lb_ssn_info (const zend_call_info * call_info , const zend_ssa * ssa )
169168{
170- if (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args &&
171- call_info -> num_args == 3 ) {
169+ ZEND_ASSERT (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args );
170+ if ( call_info -> num_args == 3 ) {
172171 uint32_t arg1_info = _ssa_op1_info (call_info -> caller_op_array , ssa , call_info -> arg_info [0 ].opline );
173172 uint32_t arg2_info = _ssa_op1_info (call_info -> caller_op_array , ssa , call_info -> arg_info [1 ].opline );
174173 uint32_t arg3_info = _ssa_op1_info (call_info -> caller_op_array , ssa , call_info -> arg_info [2 ].opline );
@@ -194,8 +193,8 @@ static uint32_t zend_lb_ssn_info(const zend_call_info *call_info, const zend_ssa
194193
195194static uint32_t zend_b_s_info (const zend_call_info * call_info , const zend_ssa * ssa )
196195{
197- if (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args &&
198- call_info -> num_args == 1 ) {
196+ ZEND_ASSERT (call_info -> caller_init_opline -> extended_value == (uint32_t )call_info -> num_args );
197+ if ( call_info -> num_args == 1 ) {
199198
200199 uint32_t arg1_info = _ssa_op1_info (call_info -> caller_op_array , ssa , call_info -> arg_info [0 ].opline );
201200 uint32_t tmp = 0 ;
0 commit comments