com php-src: Remove one usage of implementing_class: Zend /zend_compile.c
| From: | Nikita Popov | Date: | Mon, 21 Jul 2014 16:25:46 +0000 |
| Subject: | com php-src: Remove one usage of implementing_class: Zend /zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80940@lists.php.net to get a copy of this message | ||
Commit: 94d5d7d01b91a2f033dfccbcbf5d227a3ea35f39
Author: Nikita Popov <nikic@php.net> Mon, 21 Jul 2014 18:25:46 +0200
Parents: 6c6dd84c509ec24b18e76e0ed00d41a552335b69
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=94d5d7d01b91a2f033dfccbcbf5d227a3ea35f39
Log:
Remove one usage of implementing_class
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 0620978..970a0c7 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2943,16 +2943,6 @@ ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array
TSRMLS
}
/* }}} */
-static void do_verify_abstract_class(TSRMLS_D) /* {{{ */
-{
- zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-
- opline->opcode = ZEND_VERIFY_ABSTRACT_CLASS;
- SET_NODE(opline->op1, &CG(implementing_class));
- SET_UNUSED(opline->op2);
-}
-/* }}} */
-
ZEND_API zend_string *zend_mangle_property_name(const char *src1, int src1_length, const char
*src2, int src2_length, int internal) /* {{{ */
{
zend_string *prop_name;
@@ -6471,7 +6461,7 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) {
) {
zend_verify_abstract_class(ce TSRMLS_CC);
if (ce->num_interfaces && !(ce->ce_flags & ZEND_ACC_IMPLEMENT_TRAITS)) {
- do_verify_abstract_class(TSRMLS_C);
+ emit_op(NULL, ZEND_VERIFY_ABSTRACT_CLASS, &declare_node, NULL TSRMLS_CC);
}
}