Fix JIT?

Author: Girgias

Zend/tests/foreach/foreach_list_002.phpt

@@ -7,18 +7,48 @@ foreach (array(array(1,2), array(3,4)) as list($a, )) {
     var_dump($a);
 }
 
+echo "Array of strings:\n";
 $array = [['a', 'b'], 'c', 'd'];
 
 foreach($array as list(, $a)) {
    var_dump($a);
 }
 
+echo "Array of ints:\n";
+$array = [[5, 6], 10, 20];
+
+foreach($array as list(, $a)) {
+   var_dump($a);
+}
+
+echo "Array of nulls:\n";
+$array = [[null, null], null, null];
+
+foreach($array as list(, $a)) {
+   var_dump($a);
+}
+
 ?>
 --EXPECTF--
 int(1)
 int(3)
+Array of strings:
 string(1) "b"
 
 Warning: Cannot use string as array in %s on line %d
 NULL
+
+Warning: Cannot use string as array in %s on line %d
+NULL
+Array of ints:
+int(6)
+
+Warning: Cannot use int as array in %s on line %d
+NULL
+
+Warning: Cannot use int as array in %s on line %d
+NULL
+Array of nulls:
+NULL
+NULL
 NULL

ext/opcache/jit/zend_jit_helpers.c

@@ -16,6 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
+#include "../../../Zend/zend_types.h"
 #include "Zend/zend_API.h"
 
 static ZEND_COLD void undef_result_after_exception(void) {
@@ -2561,6 +2562,14 @@ static void ZEND_FASTCALL zend_jit_only_vars_by_reference(zval *arg)
 	zend_error(E_NOTICE, "Only variables should be passed by reference");
 }
 
+static void ZEND_FASTCALL zend_jit_invalid_array_use(const zval *container)
+{
+	/* Warning should not occur on null */
+	if (Z_TYPE_P(container) != IS_NULL) {
+		zend_error(E_WARNING, "Cannot use %s as array", zend_zval_type_name(container));
+	}
+}
+
 static void ZEND_FASTCALL zend_jit_invalid_array_access(zval *container)
 {
 	zend_error(E_WARNING, "Trying to access array offset on %s", zend_zval_value_name(container));

ext/opcache/jit/zend_jit_ir.c

@@ -16,6 +16,7 @@
  *  +----------------------------------------------------------------------+
  */
 
+#include "../../../Zend/zend_type_info.h"
 #include "jit/ir/ir.h"
 #include "jit/ir/ir_builder.h"
 #include "jit/tls/zend_jit_tls.h"
@@ -12786,6 +12787,18 @@ static int zend_jit_fetch_dim_read(zend_jit_ctx       *jit,
 				}
 			}
 
+			if (opline->opcode == ZEND_FETCH_LIST_R) {
+				ir_ref ref;
+
+				may_throw = 1;
+				if ((op1_info & MAY_BE_UNDEF) || (op2_info & MAY_BE_UNDEF)) {
+					ref = jit_ZVAL_ADDR(jit, orig_op1_addr);
+				} else {
+					jit_SET_EX_OPLINE(jit, opline);
+					ref = jit_ZVAL_ADDR(jit, op1_addr);
+				}
+				ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_jit_invalid_array_use), ref);
+			}
 			if (opline->opcode != ZEND_FETCH_DIM_IS && opline->opcode != ZEND_FETCH_LIST_R) {
 				ir_ref ref;
 

ext/opcache/tests/opt/block_pass_003.phpt

@@ -19,5 +19,41 @@ DONE
 --EXPECTF--
 Warning: Cannot use int as array in %s on line %d
 
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+
 Warning: Cannot use int as array in %s on line %d
 DONE