Fixed tracing JIT type inference for passing undefined CV by value

dstogov · dstogov · commit 784f1b5c490f · 2020-05-28T18:35:32.000+03:00
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -3125,6 +3125,9 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 							if (opline->op1_type == IS_CONST) {
 								zend_jit_trace_send_type(opline, frame->call, Z_TYPE_P(RT_CONSTANT(opline, opline->op1)));
 							} else if (op1_type != IS_UNKNOWN) {
+								if (op1_type == IS_UNDEF) {
+									op1_type = IS_NULL;
+								}
 								zend_jit_trace_send_type(opline, frame->call, op1_type);
 							}
 						}
@@ -3169,6 +3172,9 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 								goto done;
 							}
 							if (op1_type != IS_UNKNOWN) {
+								if (op1_type == IS_UNDEF) {
+									op1_type = IS_NULL;
+								}
 								zend_jit_trace_send_type(opline, frame->call, op1_type);
 							}
 						}

Original file line number	Diff line number	Diff line change
`@@ -3125,6 +3125,9 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`3125`	`3125`	`if (opline->op1_type == IS_CONST) {`
`3126`	`3126`	`zend_jit_trace_send_type(opline, frame->call, Z_TYPE_P(RT_CONSTANT(opline, opline->op1)));`
`3127`	`3127`	`} else if (op1_type != IS_UNKNOWN) {`
	`3128`	`+ if (op1_type == IS_UNDEF) {`
	`3129`	`+ op1_type = IS_NULL;`
	`3130`	`+ }`
`3128`	`3131`	`zend_jit_trace_send_type(opline, frame->call, op1_type);`
`3129`	`3132`	`}`
`3130`	`3133`	`}`
`@@ -3169,6 +3172,9 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`3169`	`3172`	`goto done;`
`3170`	`3173`	`}`
`3171`	`3174`	`if (op1_type != IS_UNKNOWN) {`
	`3175`	`+ if (op1_type == IS_UNDEF) {`
	`3176`	`+ op1_type = IS_NULL;`
	`3177`	`+ }`
`3172`	`3178`	`zend_jit_trace_send_type(opline, frame->call, op1_type);`
`3173`	`3179`	`}`
`3174`	`3180`	`}`