com php-src: Fixed bug (Wrong ce cached): Zend/zend_vm_def .h Zend/zend_vm_execute.h
| From: | Xinchen Hui | Date: | Thu, 11 Apr 2013 06:28:42 +0000 |
| Subject: | com php-src: Fixed bug (Wrong ce cached): Zend/zend_vm_def .h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71928@lists.php.net to get a copy of this message | ||
Commit: ba292b037f58c6cb0ef090936811cc658eadd26f
Author: Xinchen Hui <laruence@php.net> Thu, 11 Apr 2013 14:28:42 +0800
Parents: 4475dbf11d6660818537ae706583b7c15139c13f
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ba292b037f58c6cb0ef090936811cc658eadd26f
Log:
Fixed bug (Wrong ce cached)
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 3934752..f051c1a 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4925,7 +4925,7 @@ ZEND_VM_HANDLER(144, ZEND_ADD_INTERFACE, ANY, CONST)
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
- CACHE_PTR(opline->op2.literal->cache_slot, ce);
+ CACHE_PTR(opline->op2.literal->cache_slot, iface);
}
if (UNEXPECTED((iface->ce_flags & ZEND_ACC_INTERFACE) == 0)) {
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 81d3688..07082d4 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1447,7 +1447,7 @@ static int ZEND_FASTCALL
ZEND_ADD_INTERFACE_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
- CACHE_PTR(opline->op2.literal->cache_slot, ce);
+ CACHE_PTR(opline->op2.literal->cache_slot, iface);
}
if (UNEXPECTED((iface->ce_flags & ZEND_ACC_INTERFACE) == 0)) {