com php-src: Remove last EA usages: Zend/zend_compile.c
| From: | Nikita Popov | Date: | Sun, 27 Jul 2014 10:49:26 +0000 |
| Subject: | com php-src: Remove last EA usages: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80913@lists.php.net to get a copy of this message | ||
Commit: d0943edf49e39f9aa5ab7be2ad0c9d718b891484
Author: Nikita Popov <nikic@php.net> Sun, 27 Jul 2014 12:49:26 +0200
Parents: bea85f58bbdf100d780b48af8752d8eee44634d3
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d0943edf49e39f9aa5ab7be2ad0c9d718b891484
Log:
Remove last EA usages
Still retaining the EA field in znode as it is used by opcache
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 900789a..c46ed92 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -51,7 +51,6 @@
(target)->u.constant = CONSTANT(src.constant); \
} else { \
(target)->u.op = src; \
- (target)->EA = 0; \
} \
} while (0)
@@ -553,14 +552,6 @@ static int zend_add_const_name_literal(zend_op_array *op_array, zval *zv, int
un
op.constant = zend_add_literal(CG(active_op_array), &_c TSRMLS_CC); \
} while (0)
-static inline zend_bool zend_is_function_or_method_call(const znode *variable) /* {{{ */
-{
- zend_uint type = variable->EA;
-
- return ((type & ZEND_PARSED_METHOD_CALL) || (type == ZEND_PARSED_FUNCTION_CALL));
-}
-/* }}} */
-
#define MAKE_NOP(opline) { opline->opcode = ZEND_NOP;
memset(&opline->result,0,sizeof(opline->result));
memset(&opline->op1,0,sizeof(opline->op1));
memset(&opline->op2,0,sizeof(opline->op2));
opline->result_type=opline->op1_type=opline->op2_type=IS_UNUSED; }
void zend_discard_doc_comment(TSRMLS_D) {
@@ -3658,7 +3649,6 @@ static int zend_try_compile_cv(znode *result, zend_ast *ast TSRMLS_DC) {
result->op_type = IS_CV;
result->u.op.var = lookup_cv(CG(active_op_array), name TSRMLS_CC);
- result->EA = 0;
if (name->len == sizeof("this") - 1 && !memcmp(name->val,
"this", sizeof("this") - 1)) {
CG(active_op_array)->this_var = result->u.op.var;