diff options
| author | Stanislav Malyshev <stas@php.net> | 2003-07-03 12:03:11 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2003-07-03 12:03:11 +0000 |
| commit | 8f0234160a519593e864f54931edc4c44931b437 (patch) | |
| tree | 00eddd2c53c280b5506015575696787ef2e6cf04 /Zend/zend_compile.c | |
| parent | bc16d962a6db829e18830d1e232a36bc0a6f1885 (diff) | |
| download | php-git-8f0234160a519593e864f54931edc4c44931b437.tar.gz | |
enable Classname() constructor to be called via parent::__constructor()
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 9c2b12588d..7b6eda00cf 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1306,7 +1306,14 @@ void zend_do_begin_class_member_function_call(TSRMLS_D) /* a tmp var is leaked here */ opline->opcode = ZEND_INIT_STATIC_METHOD_CALL; - zend_lowercase_znode_if_const(&opline->op2); + if(opline->op2.op_type == IS_CONST && + (sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == Z_STRLEN(opline->op2.u.constant) && + memcmp(Z_STRVAL(opline->op2.u.constant), ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == 0) { + zval_dtor(&opline->op2.u.constant); + SET_UNUSED(opline->op2); + } else { + zend_lowercase_znode_if_const(&opline->op2); + } zend_stack_push(&CG(function_call_stack), (void *) &ptr, sizeof(zend_function *)); } @@ -2600,7 +2607,7 @@ void zend_do_begin_new_object(znode *new_token, znode *class_type TSRMLS_DC) opline->opcode = ZEND_INIT_CTOR_CALL; opline->op1 = (opline-2)->result; SET_UNUSED(opline->op2); - + zend_stack_push(&CG(function_call_stack), (void *) &ptr, sizeof(unsigned char *)); } |