Merge branch 'PHP-5.4' into PHP-5.5

laruence · laruence · commit a5cfe57e08f3 · 2013-04-11T14:29:09.000+08:00
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -4939,7 +4939,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
@@ -1479,7 +1479,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)) {

Original file line number	Diff line number	Diff line change
`@@ -4939,7 +4939,7 @@ ZEND_VM_HANDLER(144, ZEND_ADD_INTERFACE, ANY, CONST)`
`4939`	`4939`	`CHECK_EXCEPTION();`
`4940`	`4940`	`ZEND_VM_NEXT_OPCODE();`
`4941`	`4941`	`}`
`4942`		`- CACHE_PTR(opline->op2.literal->cache_slot, ce);`
	`4942`	`+ CACHE_PTR(opline->op2.literal->cache_slot, iface);`
`4943`	`4943`	`}`
`4944`	`4944`
`4945`	`4945`	`if (UNEXPECTED((iface->ce_flags & ZEND_ACC_INTERFACE) == 0)) {`
Original file line number	Diff line number	Diff line change
`@@ -1479,7 +1479,7 @@ static int ZEND_FASTCALL ZEND_ADD_INTERFACE_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND`
`1479`	`1479`	`CHECK_EXCEPTION();`
`1480`	`1480`	`ZEND_VM_NEXT_OPCODE();`
`1481`	`1481`	`}`
`1482`		`- CACHE_PTR(opline->op2.literal->cache_slot, ce);`
	`1482`	`+ CACHE_PTR(opline->op2.literal->cache_slot, iface);`
`1483`	`1483`	`}`
`1484`	`1484`
`1485`	`1485`	`if (UNEXPECTED((iface->ce_flags & ZEND_ACC_INTERFACE) == 0)) {`