| author | Craig Mohrman <craig.mohrman@oracle.com> |
| Thu, 31 May 2012 14:36:45 -0700 | |
| changeset 846 | fe258446a1ae |
| permissions | -rw-r--r-- |
|
846
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
1 |
--- php-5.3.10/Zend/zend_vm_def.h_orig Sun Jan 1 05:15:04 2012 |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
2 |
+++ php-5.3.10/Zend/zend_vm_def.h Wed Feb 8 11:25:26 2012 |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
3 |
@@ -2569,6 +2569,11 @@ |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
4 |
ZEND_VM_CONTINUE(); /* CHECK_ME */ |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
5 |
} |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
6 |
ce = Z_OBJCE_P(EG(exception)); |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
7 |
+ |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
8 |
+#ifdef HAVE_DTRACE |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
9 |
+ DTRACE_EXCEPTION_CAUGHT(ce->name); |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
10 |
+#endif /* HAVE_DTRACE */ |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
11 |
+ |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
12 |
if (ce != EX_T(opline->op1.u.var).class_entry) {
|
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
13 |
if (!instanceof_function(ce, EX_T(opline->op1.u.var).class_entry TSRMLS_CC)) {
|
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
14 |
if (opline->op1.u.EA.type) {
|