diff options
| -rw-r--r-- | Zend/zend_compile.c | 36 | ||||
| -rw-r--r-- | Zend/zend_constants.c | 14 | ||||
| -rw-r--r-- | Zend/zend_constants.h | 1 |
3 files changed, 42 insertions, 9 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 0babb016ff..afbb09f681 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3278,6 +3278,34 @@ void zend_do_end_new_object(znode *result, znode *new_token, znode *argument_lis *result = CG(active_op_array)->opcodes[new_token->u.opline_num].result; } +static int zend_constant_ct_subst(znode *result, zval *const_name TSRMLS_DC) +{ + zend_constant *c = NULL; + + if (zend_u_hash_find(EG(zend_constants), Z_TYPE_P(const_name), Z_UNIVAL_P(const_name), Z_UNILEN_P(const_name)+1, (void **) &c) == FAILURE) { + unsigned int lookup_name_len; + zstr lookup_name = zend_u_str_case_fold(Z_TYPE_P(const_name), Z_UNIVAL_P(const_name), Z_UNILEN_P(const_name), 1, &lookup_name_len); + + if (zend_u_hash_find(EG(zend_constants), Z_TYPE_P(const_name), lookup_name, lookup_name_len+1, (void **) &c)==SUCCESS) { + if ((c->flags & CONST_CS) && memcmp(c->name.v, Z_UNIVAL_P(const_name).v, UG(unicode)?UBYTES(Z_USTRLEN_P(const_name)):Z_STRLEN_P(const_name))!=0) { + c = NULL; + } + } else { + c = NULL; + } + efree(lookup_name.v); + } + if (c && (c->flags & CONST_CT_SUBST)) { + zval_dtor(const_name); + result->op_type = IS_CONST; + result->u.constant = c->value; + zval_copy_ctor(&result->u.constant); + INIT_PZVAL(&result->u.constant); + return 1; + } + return 0; +} + void zend_do_fetch_constant(znode *result, znode *constant_container, znode *constant_name, int mode TSRMLS_DC) { switch (mode) { @@ -3285,13 +3313,15 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con if (constant_container) { zend_do_fetch_class_name(NULL, constant_container, constant_name TSRMLS_CC); *result = *constant_container; - } else { + result->u.constant.type = IS_CONSTANT; + } else if (!zend_constant_ct_subst(result, &constant_name->u.constant TSRMLS_CC)) { *result = *constant_name; + result->u.constant.type = IS_CONSTANT; } - Z_TYPE(result->u.constant) = IS_CONSTANT; break; case ZEND_RT: - { + if (constant_container || + !zend_constant_ct_subst(result, &constant_name->u.constant TSRMLS_CC)) { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = ZEND_FETCH_CONSTANT; diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 69607d1620..3ed7883be0 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -126,7 +126,7 @@ void zend_register_standard_constants(TSRMLS_D) zend_constant c; Z_TYPE(c.value) = IS_BOOL; - c.flags = CONST_PERSISTENT; + c.flags = CONST_PERSISTENT | CONST_CT_SUBST; c.module_number = 0; c.name.s = zend_strndup(ZEND_STRL("TRUE")); @@ -141,16 +141,18 @@ void zend_register_standard_constants(TSRMLS_D) Z_TYPE(c.value) = IS_BOOL; zend_register_constant(&c TSRMLS_CC); + c.name.s = zend_strndup(ZEND_STRL("NULL")); + c.name_len = sizeof("NULL"); + Z_TYPE(c.value) = IS_NULL; + zend_register_constant(&c TSRMLS_CC); + + c.flags = CONST_PERSISTENT; + c.name.s = zend_strndup(ZEND_STRL("ZEND_THREAD_SAFE")); c.name_len = sizeof("ZEND_THREAD_SAFE"); Z_LVAL(c.value) = ZTS_V; Z_TYPE(c.value) = IS_BOOL; zend_register_constant(&c TSRMLS_CC); - - c.name.s = zend_strndup(ZEND_STRL("NULL")); - c.name_len = sizeof("NULL"); - Z_TYPE(c.value) = IS_NULL; - zend_register_constant(&c TSRMLS_CC); } } diff --git a/Zend/zend_constants.h b/Zend/zend_constants.h index 516241bfad..319a3b9bf2 100644 --- a/Zend/zend_constants.h +++ b/Zend/zend_constants.h @@ -26,6 +26,7 @@ #define CONST_CS (1<<0) /* Case Sensitive */ #define CONST_PERSISTENT (1<<1) /* Persistent */ +#define CONST_CT_SUBST (2<<1) /* Allow compile-time substitution */ #define PHP_USER_CONSTANT INT_MAX /* a constant defined in user space */ |