diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2016-03-27 00:57:56 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2016-03-27 00:57:56 +0100 |
| commit | 9600ddbd1ac7ca0e81a5c6f3d033357a856e75c0 (patch) | |
| tree | d4e225e5ea51c2d604e62c21aa612e659ffbeb7c /Zend/zend_compile.c | |
| parent | b867bd1c8d00701c0952fca4ea5ef9af39f9bb07 (diff) | |
| parent | 4327370d1308eab3c611fc6994e67048a18f92ef (diff) | |
| download | php-git-9600ddbd1ac7ca0e81a5c6f3d033357a856e75c0.tar.gz | |
Merge remote-tracking branch 'origin/PHP-7.0'
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 64e0e0d1e3..2e1ce9ba44 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5747,10 +5747,6 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */ CG(active_class_entry) = ce; - if (implements_ast) { - zend_compile_implements(&declare_node, implements_ast); - } - zend_compile_stmt(stmt_ast); /* Reset lineno for final opcodes and errors */ @@ -5807,11 +5803,15 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */ zend_emit_op(NULL, ZEND_BIND_TRAITS, &declare_node, NULL); } + if (implements_ast) { + zend_compile_implements(&declare_node, implements_ast); + } + if (!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) - && (extends_ast || ce->num_interfaces > 0) + && (extends_ast || implements_ast) ) { zend_verify_abstract_class(ce); - if (ce->num_interfaces && !(ce->ce_flags & ZEND_ACC_IMPLEMENT_TRAITS)) { + if (implements_ast) { zend_emit_op(NULL, ZEND_VERIFY_ABSTRACT_CLASS, &declare_node, NULL); } } |