@@ -5308,6 +5308,7 @@ static zend_always_inline zend_execute_data *_zend_vm_stack_push_call_frame(uint
5308
5308
#endif
5309
5309
5310
5310
#ifdef ZEND_VERIFY_TYPE_INFERENCE
5311
+
5311
5312
static bool zend_verify_type_inference (uint32_t type_mask , zval * value )
5312
5313
{
5313
5314
if (type_mask == 0 ) {
@@ -5420,6 +5421,7 @@ static void zend_verify_result_type_inference(zend_execute_data *execute_data, c
5420
5421
fflush (stderr );
5421
5422
}
5422
5423
}
5424
+
5423
5425
static void zend_verify_op1_type_inference (zend_execute_data * execute_data , const zend_op * opline , uint32_t type )
5424
5426
{
5425
5427
if (!type ) {
@@ -5443,6 +5445,7 @@ static void zend_verify_op1_type_inference(zend_execute_data *execute_data, cons
5443
5445
fflush (stderr );
5444
5446
}
5445
5447
}
5448
+
5446
5449
static void zend_verify_op2_type_inference (zend_execute_data * execute_data , const zend_op * opline , uint32_t type )
5447
5450
{
5448
5451
if (!type ) {
@@ -5462,18 +5465,21 @@ static void zend_verify_op2_type_inference(zend_execute_data *execute_data, cons
5462
5465
fflush (stderr );
5463
5466
}
5464
5467
}
5468
+
5465
5469
static void zend_verify_inference_use (zend_execute_data * execute_data , const zend_op * opline )
5466
5470
{
5467
5471
zend_verify_op1_type_inference (execute_data , opline , opline -> op1_use_type );
5468
5472
zend_verify_op2_type_inference (execute_data , opline , opline -> op2_use_type );
5469
5473
zend_verify_result_type_inference (execute_data , opline , opline -> result_use_type );
5470
5474
}
5475
+
5471
5476
static void zend_verify_inference_def (zend_execute_data * execute_data , const zend_op * opline )
5472
5477
{
5473
5478
zend_verify_op1_type_inference (execute_data , opline , opline -> op1_def_type );
5474
5479
zend_verify_op2_type_inference (execute_data , opline , opline -> op2_def_type );
5475
5480
zend_verify_result_type_inference (execute_data , opline , opline -> result_def_type );
5476
5481
}
5482
+
5477
5483
# define ZEND_VERIFY_INFERENCE_USE () zend_verify_inference_use(execute_data, OPLINE);
5478
5484
# define ZEND_VERIFY_INFERENCE_DEF () zend_verify_inference_def(execute_data, OPLINE);
5479
5485
#else
0 commit comments