diff options
| author | Andi Gutmans <andi@php.net> | 2000-11-09 23:43:21 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-11-09 23:43:21 +0000 |
| commit | 113a5bb8c2243dd9caa728c526416d3fd39c272e (patch) | |
| tree | feb73c99961690b4d2721d95a3f787544732620f | |
| parent | d9d4824cd302ffb0d92ce5d684cd1a54803f1a30 (diff) | |
| download | php-git-113a5bb8c2243dd9caa728c526416d3fd39c272e.tar.gz | |
- Undo the previous commit for fixing $obj = new foo().
| -rw-r--r-- | Zend/zend_compile.c | 11 | ||||
| -rw-r--r-- | Zend/zend_compile.h | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 3c51e21a11..33616a0d5a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -303,15 +303,7 @@ void zend_do_echo(znode *arg CLS_DC) void zend_do_assign(znode *result, znode *variable, znode *value CLS_DC) { - zend_op *opline; - - if (value->u.EA.type & EXT_TYPE_NEW_OP) { - value->u.EA.type &= ~EXT_TYPE_NEW_OP; - zend_do_assign_ref(result, variable, value CLS_CC); - return; - } - - opline = get_next_op(CG(active_op_array) CLS_CC); + zend_op *opline = get_next_op(CG(active_op_array) CLS_CC); opline->opcode = ZEND_ASSIGN; opline->result.op_type = IS_VAR; @@ -1657,7 +1649,6 @@ void zend_do_begin_new_object(znode *new_token, znode *class_name CLS_DC) opline->opcode = ZEND_NEW; opline->result.op_type = IS_VAR; opline->result.u.var = get_temporary_variable(CG(active_op_array)); - opline->result.u.EA.type |= EXT_TYPE_NEW_OP; opline->op1 = *class_name; SET_UNUSED(opline->op2); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 445d9cb0b3..bc771935e6 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -204,7 +204,6 @@ typedef struct _zend_file_handle { #define EXT_TYPE_UNUSED (1<<0) -#define EXT_TYPE_NEW_OP (1<<1) #include "zend_globals.h" |