svn: /php/php-src/trunk/Zend/ zend_vm_def.h zend_vm_execute.h
| From: | Felipe Pena | Date: | Tue, 04 May 2010 18:31:40 +0000 |
| Subject: | svn: /php/php-src/trunk/Zend/ zend_vm_def.h zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62549@lists.php.net to get a copy of this message | ||
felipe Tue, 04 May 2010 18:31:40 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=298987
Log:
- Fix trait flag identification
Changed paths:
U php/php-src/trunk/Zend/zend_vm_def.h
U php/php-src/trunk/Zend/zend_vm_execute.h
Modified: php/php-src/trunk/Zend/zend_vm_def.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_def.h 2010-05-04 18:21:00 UTC (rev 298986)
+++ php/php-src/trunk/Zend/zend_vm_def.h 2010-05-04 18:31:40 UTC (rev 298987)
@@ -3230,7 +3230,7 @@
if (EX_T(opline->op1.var).class_entry->ce_flags & ZEND_ACC_INTERFACE) {
class_type = "interface";
- } else if (EX_T(opline->op1.var).class_entry->ce_flags & ZEND_ACC_TRAIT) {
+ } else if ((EX_T(opline->op1.var).class_entry->ce_flags &
~ZEND_ACC_EXPLICIT_ABSTRACT_CLASS) & ZEND_ACC_TRAIT) {
class_type = "trait";
} else {
class_type = "abstract class";
Modified: php/php-src/trunk/Zend/zend_vm_execute.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_execute.h 2010-05-04 18:21:00 UTC (rev 298986)
+++ php/php-src/trunk/Zend/zend_vm_execute.h 2010-05-04 18:31:40 UTC (rev 298987)
@@ -520,7 +520,7 @@
if (EX_T(opline->op1.var).class_entry->ce_flags & ZEND_ACC_INTERFACE) {
class_type = "interface";
- } else if (EX_T(opline->op1.var).class_entry->ce_flags & ZEND_ACC_TRAIT) {
+ } else if ((EX_T(opline->op1.var).class_entry->ce_flags &
~ZEND_ACC_EXPLICIT_ABSTRACT_CLASS) & ZEND_ACC_TRAIT) {
class_type = "trait";
} else {
class_type = "abstract class";