summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2000-11-10 11:48:12 +0000
committerAndi Gutmans <andi@php.net>2000-11-10 11:48:12 +0000
commit5e33cdaef3d0d024459c7df827fd4e8d31949fb8 (patch)
treed380150ce538a1b58d12c6eb79d7a12791ff1d68 /Zend
parent52aba68aa2ffb94332580bbdde20f0051739632d (diff)
downloadphp-git-5e33cdaef3d0d024459c7df827fd4e8d31949fb8.tar.gz
- Remove this damn thing once again.
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_compile.c11
-rw-r--r--Zend/zend_compile.h1
2 files changed, 1 insertions, 11 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 9246ee3e78..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->op_type == IS_VAR && 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"