zend_compile: Support static methods for array_map() optimization

Author: TimWolla

Zend/zend_compile.c

@@ -5037,19 +5037,24 @@ static zend_result zend_compile_func_array_map(znode *result, zend_ast_list *arg
 	zend_ast *callback = args->child[0];
 
 	/* Bail out if the callback is not a FCC/PFA. */
-	if (callback->kind != ZEND_AST_CALL) {
-		return FAILURE;
-	}
+	zend_ast *args_ast;
+	switch (callback->kind) {
+		case ZEND_AST_CALL:
+		case ZEND_AST_STATIC_CALL:
+			args_ast = zend_ast_call_get_args(callback);
+			if (args_ast->kind != ZEND_AST_CALLABLE_CONVERT) {
+				return FAILURE;
+			}
 
-	zend_ast *args_ast = zend_ast_call_get_args(callback);
-	if (args_ast->kind != ZEND_AST_CALLABLE_CONVERT) {
-		return FAILURE;
+			break;
+		default:
+			return FAILURE;
 	}
 
 	/* Bail out if the callback is assert() due to the AST stringification logic
 	 * breaking for the generated call.
 	 */
-	if (zend_string_equals_literal_ci(zend_ast_get_str(callback->child[0]), "assert")) {
+	if (callback->kind == ZEND_AST_CALL && zend_string_equals_literal_ci(zend_ast_get_str(callback->child[0]), "assert")) {
 		return FAILURE;
 	}
 
@@ -5104,7 +5109,14 @@ static zend_result zend_compile_func_array_map(znode *result, zend_ast_list *arg
 
 	/* loop body */
 	znode call_result;
-	zend_compile_expr(&call_result, zend_ast_create(ZEND_AST_CALL, callback->child[0], call_args));
+	switch (callback->kind) {
+		case ZEND_AST_CALL:
+			zend_compile_expr(&call_result, zend_ast_create(ZEND_AST_CALL, callback->child[0], call_args));
+			break;
+		case ZEND_AST_STATIC_CALL:
+			zend_compile_expr(&call_result, zend_ast_create(ZEND_AST_STATIC_CALL, callback->child[0], callback->child[1], call_args));
+			break;
+	}
 	opline = zend_emit_op(NULL, ZEND_ADD_ARRAY_ELEMENT, &call_result, &key);
 	SET_NODE(opline->result, result);
 	/* end loop body */

ext/standard/tests/array/array_map_foreach_optimization_005.phpt

@@ -0,0 +1,84 @@
+--TEST--
+array_map(): foreach optimization - static call
+--EXTENSIONS--
+opcache
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.opt_debug_level=0x20000
+--FILE--
+<?php
+
+class Adder {
+    static function plus1($x) {
+        return $x + 1;
+    }
+}
+
+$array = range(1, 10);
+
+$foo = array_map(Adder::plus1(...), $array);
+
+var_dump($foo);
+
+?>
+--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 V2 = DO_ICALL
+0004 ASSIGN CV0($array) V2
+0005 TYPE_ASSERT 131079 string("array_map") CV0($array)
+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_STATIC_METHOD_CALL 1 string("Adder") string("plus1")
+0010 SEND_VAL T4 1
+0011 V4 = DO_UCALL
+0012 T2 = ADD_ARRAY_ELEMENT V4 T5
+0013 JMP 0008
+0014 FE_FREE V3
+0015 ASSIGN CV1($foo) T2
+0016 INIT_FCALL 1 %d string("var_dump")
+0017 SEND_VAR CV1($foo) 1
+0018 DO_ICALL
+0019 RETURN int(1)
+LIVE RANGES:
+     2: 0007 - 0015 (tmp/var)
+     3: 0008 - 0014 (loop)
+     4: 0009 - 0010 (tmp/var)
+     5: 0009 - 0012 (tmp/var)
+
+Adder::plus1:
+     ; (lines=3, args=1, vars=1, tmps=1)
+     ; (after optimizer)
+     ; %s
+0000 CV0($x) = RECV 1
+0001 T1 = ADD CV0($x) int(1)
+0002 RETURN T1
+array(10) {
+  [0]=>
+  int(2)
+  [1]=>
+  int(3)
+  [2]=>
+  int(4)
+  [3]=>
+  int(5)
+  [4]=>
+  int(6)
+  [5]=>
+  int(7)
+  [6]=>
+  int(8)
+  [7]=>
+  int(9)
+  [8]=>
+  int(10)
+  [9]=>
+  int(11)
+}