clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ZEND_INIT_STATIC_METHOD_CALL for literals of form "classname::method"

Browse Source
This commit is contained in:
Bob Weinand 2015-06-26 19:55:13 +02:00
parent 1d704a05ee
commit 2894bc5bb8
2 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Zend/tests/indirect_call_from_constant.phpt Normal file
View File

@ -0,0 +1,27 @@
--TEST--
Indirect call with constants.
--FILE--
<?php
class Test
{
public static function method()
{
echo "Method called!\n";
}
}
['Test', 'method']();
'Test::method'();
(['Test', 'method'])();
('Test::method')();
?>
--EXPECT--
Method called!
Method called!
Method called!
Method called!

22
Zend/zend_compile.c
View File

@ -2866,16 +2866,30 @@ void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *args_a
{
zend_op *opline = get_next_op(CG(active_op_array));
if (name_node->op_type == IS_CONST && Z_TYPE(name_node->u.constant) == IS_STRING) {
opline->opcode = ZEND_INIT_FCALL_BY_NAME;
const char *colon;
zend_string *str = Z_STR(name_node->u.constant);
if ((colon = zend_memrchr(str->val, ':', str->len)) != NULL && colon > str->val && *(colon - 1) == ':') {
zend_string *class = zend_string_init(str->val, colon - str->val - 1, 0);
zend_string *method = zend_string_init(colon + 1, str->len - (colon - str->val) - 1, 0);
opline->opcode = ZEND_INIT_STATIC_METHOD_CALL;
opline->op1_type = IS_CONST;
opline->op1.constant = zend_add_class_name_literal(CG(active_op_array), class);
opline->op2_type = IS_CONST;
opline->op2.constant = zend_add_func_name_literal(CG(active_op_array),
Z_STR(name_node->u.constant));
opline->op2.constant = zend_add_func_name_literal(CG(active_op_array), method);
zend_alloc_cache_slot(opline->op2.constant);
zval_ptr_dtor(&name_node->u.constant);
} else {
opline->opcode = ZEND_INIT_FCALL_BY_NAME;
SET_UNUSED(opline->op1);
opline->op2_type = IS_CONST;
opline->op2.constant = zend_add_func_name_literal(CG(active_op_array), str);
zend_alloc_cache_slot(opline->op2.constant);
}
} else {
opline->opcode = ZEND_INIT_DYNAMIC_CALL;
SET_UNUSED(opline->op1);
SET_NODE(opline->op2, name_node);
}
SET_UNUSED(opline->op1);
zend_compile_call_common(result, args_ast, NULL);
}