From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 1 Jun 2020 13:26:22 +0000 (+0300)
Subject: Fixed retutn type inference when return undefined variable
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27066154185210e8532636612e5121423d70870f;p=php

Fixed retutn type inference when return undefined variable
---

diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index f72c87e4f7..7c2cfb5e2e 100644
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -1469,6 +1469,10 @@ propagate_arg:
 					} else {
 						ZEND_ASSERT(ssa_ops[idx].op1_use >= 0);
 						return_value_info = ssa_var_info[ssa_ops[idx].op1_use];
+						if (return_value_info.type & MAY_BE_UNDEF) {
+							return_value_info.type &= ~MAY_BE_UNDEF;
+							return_value_info.type |= MAY_BE_NULL;
+						}
 						return_value_info.type &= ~MAY_BE_GUARD;
 					}
 					break;