Skip to content

Commit ee4e350

Browse files
iluuu1994iluuu1994
committed
Allow arbitrary expressions in static variable initializer
1 parent b1954f5 commit ee4e350

23 files changed

+873
-598
lines changed

‎Zend/tests/035.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Using 'static' and 'global' in global scope
33
--FILE--
44
<?php
55

6-
static $var, $var, $var = -1;
6+
static $var = -1;
77
var_dump($var);
88

99
global $var, $var, $var;

‎Zend/tests/bug79778.phpt

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,49 @@ Bug #79778: Assertion failure if dumping closure with unresolved static variable
55
$closure1 = function() {
66
static $var = CONST_REF;
77
};
8+
9+
var_dump($closure1);
10+
print_r($closure1);
11+
12+
try {
13+
$closure1();
14+
} catch (\Error $e) {
15+
echo $e->getMessage(), "\n";
16+
}
17+
18+
var_dump($closure1);
19+
print_r($closure1);
20+
21+
const CONST_REF = 'foo';
22+
$closure1();
823
var_dump($closure1);
924
print_r($closure1);
25+
1026
?>
1127
--EXPECT--
28+
object(Closure)#1 (0) {
29+
}
30+
Closure Object
31+
(
32+
)
33+
Undefined constant "CONST_REF"
34+
object(Closure)#1 (0) {
35+
}
36+
Closure Object
37+
(
38+
)
1239
object(Closure)#1 (1) {
1340
["static"]=>
1441
array(1) {
1542
["var"]=>
16-
string(14) "<constant ast>"
43+
string(3) "foo"
1744
}
1845
}
1946
Closure Object
2047
(
2148
[static] => Array
2249
(
23-
[var] => <constant ast>
50+
[var] => foo
2451
)
2552

2653
)

‎Zend/tests/constexpr/new_anon_class.phpt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
--TEST--
2-
New with anonymous class is not supported in constant expressions
2+
New with anonymous class works
33
--FILE--
44
<?php
55

66
static $x = new class {};
77

8+
var_dump($x);
9+
810
?>
9-
--EXPECTF--
10-
Fatal error: Cannot use anonymous class in constant expression in %s on line %d
11+
--EXPECT--
12+
object(class@anonymous)#1 (0) {
13+
}

‎Zend/tests/constexpr/new_arg_unpack.phpt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
--TEST--
2-
Argument unpacking in new arguments in const expr (not yet supported)
2+
Argument unpacking in new arguments in static variable
33
--FILE--
44
<?php
55

66
static $x = new stdClass(...[0]);
77

8+
var_dump($x);
9+
810
?>
9-
--EXPECTF--
10-
Fatal error: Argument unpacking in constant expressions is not supported in %s on line %d
11+
--EXPECT--
12+
object(stdClass)#1 (0) {
13+
}

‎Zend/tests/constexpr/new_dynamic_class_name.phpt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@ Dynamic class name in new is not supported
33
--FILE--
44
<?php
55

6+
class Foo {}
7+
const FOO = 'Foo';
68
static $x = new (FOO);
79

10+
var_dump($x);
11+
812
?>
9-
--EXPECTF--
10-
Fatal error: Cannot use dynamic class name in constant expression in %s on line %d
13+
--EXPECT--
14+
object(Foo)#1 (0) {
15+
}

‎Zend/tests/constexpr/new_invalid_operation_in_arg.phpt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,17 @@ Invalid operation in new arg in const expr
33
--FILE--
44
<?php
55

6+
$foo = [1, 2, 3];
67
static $x = new stdClass($foo);
8+
var_dump($foo);
79

810
?>
9-
--EXPECTF--
10-
Fatal error: Constant expression contains invalid operations in %s on line %d
11+
--EXPECT--
12+
array(3) {
13+
[0]=>
14+
int(1)
15+
[1]=>
16+
int(2)
17+
[2]=>
18+
int(3)
19+
}

‎Zend/tests/constexpr/new_static.phpt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,20 @@ Static in new is not supported
33
--FILE--
44
<?php
55

6-
static $x = new static;
6+
class Foo {
7+
public static function singleton() {
8+
static $x = new static;
9+
return $x;
10+
}
11+
}
12+
13+
$x = Foo::singleton();
14+
$y = Foo::singleton();
15+
var_dump($x, $y);
716

817
?>
9-
--EXPECTF--
10-
Fatal error: "static" is not allowed in compile-time constants in %s on line %d
18+
--EXPECT--
19+
object(Foo)#1 (0) {
20+
}
21+
object(Foo)#1 (0) {
22+
}

‎Zend/tests/static_variable_func_call.phpt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
--TEST--
2+
Static variable initializer with function call
3+
--FILE--
4+
<?php
5+
6+
function bar() {
7+
echo "bar() called\n";
8+
return 'bar';
9+
}
10+
11+
function foo() {
12+
static $bar = bar();
13+
echo $bar, "\n";
14+
}
15+
16+
foo();
17+
foo();
18+
19+
?>
20+
--EXPECT--
21+
bar() called
22+
bar
23+
bar

‎Zend/zend_compile.c

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2264,6 +2264,7 @@ static inline void zend_update_jump_target(uint32_t opnum_jump, uint32_t opnum_t
22642264
zend_op *opline = &CG(active_op_array)->opcodes[opnum_jump];
22652265
switch (opline->opcode) {
22662266
case ZEND_JMP:
2267+
case ZEND_JMP_STATIC_DEF:
22672268
opline->op1.opline_num = opnum_target;
22682269
break;
22692270
case ZEND_JMPZ:
@@ -4868,16 +4869,53 @@ static void zend_compile_static_var_common(zend_string *var_name, zval *value, u
48684869
static void zend_compile_static_var(zend_ast *ast) /* {{{ */
48694870
{
48704871
zend_ast *var_ast = ast->child[0];
4871-
zend_ast **value_ast_ptr = &ast->child[1];
4872-
zval value_zv;
4872+
zend_ast *value_ast = ast->child[1];
4873+
zend_string *var_name = zend_ast_get_str(var_ast);
48734874

4874-
if (*value_ast_ptr) {
4875-
zend_const_expr_to_zval(&value_zv, value_ast_ptr, /* allow_dynamic */ true);
4876-
} else {
4877-
ZVAL_NULL(&value_zv);
4875+
if (zend_string_equals_literal(var_name, "this")) {
4876+
zend_error_noreturn(E_COMPILE_ERROR, "Cannot use $this as static variable");
48784877
}
48794878

4880-
zend_compile_static_var_common(zend_ast_get_str(var_ast), &value_zv, ZEND_BIND_REF);
4879+
if (!value_ast) {
4880+
zval value_zv;
4881+
ZVAL_NULL(&value_zv);
4882+
zend_compile_static_var_common(zend_ast_get_str(var_ast), &value_zv, ZEND_BIND_REF);
4883+
} else {
4884+
zend_op *opline;
4885+
4886+
if (!CG(active_op_array)->static_variables) {
4887+
if (CG(active_op_array)->scope) {
4888+
CG(active_op_array)->scope->ce_flags |= ZEND_HAS_STATIC_IN_METHODS;
4889+
}
4890+
CG(active_op_array)->static_variables = zend_new_array(8);
4891+
}
4892+
4893+
if (zend_hash_exists(CG(active_op_array)->static_variables, var_name)) {
4894+
zend_error_noreturn(E_COMPILE_ERROR, "Duplicate declaration of static variable $%s", ZSTR_VAL(var_name));
4895+
}
4896+
4897+
zval placeholder;
4898+
ZVAL_UNDEF(&placeholder);
4899+
zval *placeholder_ptr = zend_hash_update(CG(active_op_array)->static_variables, var_name, &placeholder);
4900+
uint32_t placeholder_offset = (uint32_t)((char*)placeholder_ptr - (char*)CG(active_op_array)->static_variables->arData);
4901+
4902+
uint32_t jmp_opnum = get_next_op_number();
4903+
opline = zend_emit_op(NULL, ZEND_JMP_STATIC_DEF, NULL, NULL);
4904+
opline->extended_value = placeholder_offset;
4905+
4906+
znode expr;
4907+
zend_compile_expr(&expr, value_ast);
4908+
4909+
opline = zend_emit_op(NULL, ZEND_ASSIGN_STATIC, &expr, NULL);
4910+
opline->extended_value = placeholder_offset;
4911+
4912+
zend_update_jump_target_to_next(jmp_opnum);
4913+
4914+
opline = zend_emit_op(NULL, ZEND_BIND_STATIC, NULL, NULL);
4915+
opline->op1_type = IS_CV;
4916+
opline->op1.var = lookup_cv(var_name);
4917+
opline->extended_value = placeholder_offset | ZEND_BIND_REF;
4918+
}
48814919
}
48824920
/* }}} */
48834921

‎Zend/zend_opcode.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,6 +1103,7 @@ ZEND_API void pass_two(zend_op_array *op_array)
11031103
}
11041104
ZEND_FALLTHROUGH;
11051105
case ZEND_JMP:
1106+
case ZEND_JMP_STATIC_DEF:
11061107
ZEND_PASS_TWO_UPDATE_JMP_TARGET(op_array, opline, opline->op1);
11071108
break;
11081109
case ZEND_JMPZ:

‎Zend/zend_vm_def.h

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8891,6 +8891,55 @@ ZEND_VM_HANDLER(183, ZEND_BIND_STATIC, CV, UNUSED, REF)
88918891
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
88928892
}
88938893

8894+
ZEND_VM_HANDLER(203, ZEND_JMP_STATIC_DEF, JMP_ADDR, UNUSED)
8895+
{
8896+
USE_OPLINE
8897+
HashTable *ht;
8898+
zval *value;
8899+
8900+
ht = ZEND_MAP_PTR_GET(EX(func)->op_array.static_variables_ptr);
8901+
if (!ht) {
8902+
ZEND_VM_NEXT_OPCODE();
8903+
}
8904+
ZEND_ASSERT(GC_REFCOUNT(ht) == 1);
8905+
8906+
value = (zval*)((char*)ht->arData + (opline->extended_value));
8907+
if (Z_TYPE_P(value) == IS_UNDEF) {
8908+
ZEND_VM_NEXT_OPCODE();
8909+
} else {
8910+
ZEND_VM_JMP_EX(OP_JMP_ADDR(opline, opline->op1), 0);
8911+
}
8912+
}
8913+
8914+
ZEND_VM_HANDLER(204, ZEND_ASSIGN_STATIC, ANY, UNUSED)
8915+
{
8916+
USE_OPLINE
8917+
HashTable *ht;
8918+
zval *static_var;
8919+
zval *value;
8920+
8921+
value = GET_OP1_ZVAL_PTR_UNDEF(BP_VAR_R);
8922+
8923+
ht = ZEND_MAP_PTR_GET(EX(func)->op_array.static_variables_ptr);
8924+
if (!ht) {
8925+
ht = zend_array_dup(EX(func)->op_array.static_variables);
8926+
ZEND_MAP_PTR_SET(EX(func)->op_array.static_variables_ptr, ht);
8927+
}
8928+
ZEND_ASSERT(GC_REFCOUNT(ht) == 1);
8929+
8930+
static_var = (zval*)((char*)ht->arData + (opline->extended_value));
8931+
8932+
SAVE_OPLINE();
8933+
i_zval_ptr_dtor(static_var);
8934+
if (EG(exception)) {
8935+
HANDLE_EXCEPTION();
8936+
}
8937+
ZVAL_COPY(static_var, value);
8938+
8939+
FREE_OP1();
8940+
ZEND_VM_NEXT_OPCODE();
8941+
}
8942+
88948943
ZEND_VM_HOT_HANDLER(184, ZEND_FETCH_THIS, UNUSED, UNUSED)
88958944
{
88968945
USE_OPLINE

0 commit comments

Comments
 (0)