zend_compile: Fix leak of unused result in array_map() optimization

Author: TimWolla

Zend/zend_compile.c

@@ -5090,7 +5090,7 @@ static zend_result zend_compile_func_array_map(znode *result, zend_ast_list *arg
 	Z_EXTRA_P(CT_CONSTANT(opline->op1)) = fbc_bucket - CG(function_table)->arData;
 
 	/* Initialize the result array. */
-	zend_emit_op(result, ZEND_INIT_ARRAY, NULL, NULL);
+	zend_emit_op_tmp(result, ZEND_INIT_ARRAY, NULL, NULL);
 
 	/* foreach loop starts here. */
 	znode key;

ext/standard/tests/array/array_map_foreach_optimization_001.phpt

@@ -31,16 +31,16 @@ $_main:
 0003 V2 = DO_ICALL
 0004 ASSIGN CV0($array) V2
 0005 TYPE_ASSERT 131079 string("array_map") CV0($array)
-0006 V2 = INIT_ARRAY 0 (packed) NEXT
+0006 T2 = INIT_ARRAY 0 (packed) NEXT
 0007 V3 = FE_RESET_R CV0($array) 0014
 0008 T5 = FE_FETCH_R V3 T4 0014
 0009 INIT_FCALL 1 %d string("plus1")
 0010 SEND_VAL T4 1
 0011 V4 = DO_UCALL
-0012 V2 = ADD_ARRAY_ELEMENT V4 T5
+0012 T2 = ADD_ARRAY_ELEMENT V4 T5
 0013 JMP 0008
 0014 FE_FREE V3
-0015 ASSIGN CV1($foo) V2
+0015 ASSIGN CV1($foo) T2
 0016 INIT_FCALL 1 %d string("var_dump")
 0017 SEND_VAR CV1($foo) 1
 0018 DO_ICALL

ext/standard/tests/array/array_map_foreach_optimization_002.phpt

@@ -37,16 +37,16 @@ $_main:
 0006 SEND_VAR%S CV0($array) 1
 0007 DO_FCALL
 0008 TYPE_ASSERT 131079 string("array_map") V5
-0009 V2 = INIT_ARRAY 0 (packed) NEXT
+0009 T2 = INIT_ARRAY 0 (packed) NEXT
 0010 V3 = FE_RESET_R V5 0017
 0011 T5 = FE_FETCH_R V3 T4 0017
 0012 INIT_FCALL 1 %d string("plus1")
 0013 SEND_VAL T4 1
 0014 V4 = DO_UCALL
-0015 V2 = ADD_ARRAY_ELEMENT V4 T5
+0015 T2 = ADD_ARRAY_ELEMENT V4 T5
 0016 JMP 0011
 0017 FE_FREE V3
-0018 ASSIGN CV1($foo) V2
+0018 ASSIGN CV1($foo) T2
 0019 INIT_FCALL 1 %d string("var_dump")
 0020 SEND_VAR CV1($foo) 1
 0021 DO_ICALL

ext/standard/tests/array/array_map_foreach_optimization_003.phpt

@@ -24,16 +24,16 @@ $_main:
      ; (after optimizer)
      ; %s
 0000 TYPE_ASSERT 131079 string("array_map") array(...)
-0001 V1 = INIT_ARRAY 0 (packed) NEXT
+0001 T1 = INIT_ARRAY 0 (packed) NEXT
 0002 V2 = FE_RESET_R array(...) 0009
 0003 T4 = FE_FETCH_R V2 T3 0009
 0004 INIT_FCALL 1 %d string("plus1")
 0005 SEND_VAL T3 1
 0006 V3 = DO_UCALL
-0007 V1 = ADD_ARRAY_ELEMENT V3 T4
+0007 T1 = ADD_ARRAY_ELEMENT V3 T4
 0008 JMP 0003
 0009 FE_FREE V2
-0010 ASSIGN CV0($foo) V1
+0010 ASSIGN CV0($foo) T1
 0011 INIT_FCALL 1 %d string("var_dump")
 0012 SEND_VAR CV0($foo) 1
 0013 DO_ICALL

ext/standard/tests/array/array_map_foreach_optimization_004.phpt

@@ -0,0 +1,57 @@
+--TEST--
+array_map(): foreach optimization - unused refcounted result
+--EXTENSIONS--
+opcache
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.opt_debug_level=0x20000
+--FILE--
+<?php
+
+function stdClass() {
+    return new stdClass();
+}
+
+$array = range(1, 10);
+
+array_map(stdClass(...), $array);
+
+?>
+--EXPECTF--
+$_main:
+     ; (lines=%d, args=0, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 INIT_FCALL 2 %d string("range")
+0001 SEND_VAL int(1) 1
+0002 SEND_VAL int(10) 2
+0003 V1 = DO_ICALL
+0004 ASSIGN CV0($array) V1
+0005 TYPE_ASSERT 131079 string("array_map") CV0($array)
+0006 T1 = INIT_ARRAY 0 (packed) NEXT
+0007 V2 = FE_RESET_R CV0($array) 0014
+0008 T4 = FE_FETCH_R V2 T3 0014
+0009 INIT_FCALL 1 %d string("stdclass")
+0010 SEND_VAL T3 1
+0011 V3 = DO_UCALL
+0012 T1 = ADD_ARRAY_ELEMENT V3 T4
+0013 JMP 0008
+0014 FE_FREE V2
+0015 FREE T1
+0016 RETURN int(1)
+LIVE RANGES:
+     1: 0007 - 0015 (tmp/var)
+     2: 0008 - 0014 (loop)
+     3: 0009 - 0010 (tmp/var)
+     4: 0009 - 0012 (tmp/var)
+
+stdClass:
+     ; (lines=3, args=0, vars=0, tmps=1)
+     ; (after optimizer)
+     ; %s
+0000 V0 = NEW 0 string("stdClass")
+0001 DO_FCALL
+0002 RETURN V0
+LIVE RANGES:
+     0: 0001 - 0002 (new)