From: Tyson Andre <tysonandre775@hotmail.com>
Date: Tue, 19 Nov 2019 13:58:48 +0000 (-0500)
Subject: Make opcache infer array_key_exists is non-null bool
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7c44ef2a0e1e1e5bed5527b8899c66b00416f43;p=php

Make opcache infer array_key_exists is non-null bool

array_key_exists now throws a TypeError instead of returning null
for invalid arguments after 14bdb0cfc7b62205c75f6d5c783e343259796776
---

diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
index cb31ea21f2..975853a9eb 100644
--- a/ext/opcache/Optimizer/zend_inference.c
+++ b/ext/opcache/Optimizer/zend_inference.c
@@ -2480,14 +2480,8 @@ static int zend_update_type_info(const zend_op_array *op_array,
 		case ZEND_ISSET_ISEMPTY_STATIC_PROP:
 		case ZEND_ASSERT_CHECK:
 		case ZEND_IN_ARRAY:
-			UPDATE_SSA_TYPE(MAY_BE_FALSE|MAY_BE_TRUE, ssa_ops[i].result_def);
-			break;
 		case ZEND_ARRAY_KEY_EXISTS:
-			tmp = MAY_BE_FALSE|MAY_BE_TRUE;
-			if (t2 & ((MAY_BE_ANY|MAY_BE_UNDEF) - (MAY_BE_ARRAY|MAY_BE_OBJECT))) {
-				tmp |= MAY_BE_NULL;
-			}
-			UPDATE_SSA_TYPE(tmp, ssa_ops[i].result_def);
+			UPDATE_SSA_TYPE(MAY_BE_FALSE|MAY_BE_TRUE, ssa_ops[i].result_def);
 			break;
 		case ZEND_CAST:
 			if (ssa_ops[i].op1_def >= 0) {