cvs: ZendEngine2 / zend_compile.c zend_execute.c

sterling Sat May 31 14:31:29 2003 EDT Modified files: /ZendEngine2 zend_compile.c zend_execute.c Log: revert the function call caching patch until a new solution is decided upon. Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.422 ZendEngine2/zend_compile.c:1.423 --- ZendEngine2/zend_compile.c:1.422 Thu May 29 15:27:11 2003 +++ ZendEngine2/zend_compile.c Sat May 31 14:31:28 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.422 2003/05/29 19:27:11 helly Exp $ */ +/* $Id: zend_compile.c,v 1.423 2003/05/31 18:31:28 sterling Exp $ */ #include "zend_language_parser.h" #include "zend.h" @@ -1245,8 +1245,6 @@ opline->opcode = ZEND_INIT_FCALL_BY_NAME; opline->op2 = *function_name; opline->extended_value = 0; - opline->result.u.var = get_temporary_variable(CG(active_op_array)); - opline->result.op_type = IS_TMP_VAR; SET_UNUSED(opline->op1); Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.467 ZendEngine2/zend_execute.c:1.468 --- ZendEngine2/zend_execute.c:1.467 Fri May 30 06:05:29 2003 +++ ZendEngine2/zend_execute.c Sat May 31 14:31:28 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.467 2003/05/30 10:05:29 stas Exp $ */ +/* $Id: zend_execute.c,v 1.468 2003/05/31 18:31:28 sterling Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -2562,10 +2562,7 @@ is_const = (EX(opline)->op2.op_type == IS_CONST); - if (EX_T(EX(opline)->result.u.var).tmp_var.type == IS_LONG) { - function = (zend_function *) EX_T(EX(opline)->result.u.var).tmp_var.value.lval; - goto looked_up_fcall; - } else if (is_const) { + if (is_const) { function_name_strval = EX(opline)->op2.u.constant.value.str.val; function_name_strlen = EX(opline)->op2.u.constant.value.str.len; } else { @@ -2585,12 +2582,8 @@ if (!is_const) { efree(function_name_strval); FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - } else { - EX_T(EX(opline)->result.u.var).tmp_var.type = IS_LONG; - EX_T(EX(opline)->result.u.var).tmp_var.value.lval = (long) function; - } + } -looked_up_fcall: EX(calling_scope) = function->common.scope; EX(object) = NULL;