com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h
| From: | Xinchen Hui | Date: | Sun, 14 Jul 2013 04:01:50 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72634@lists.php.net to get a copy of this message | ||
Commit: 75808151e378cc0d9e3a8028011d6e00143fff3e
Author: Xinchen Hui <laruence@php.net> Sun, 14 Jul 2013 12:01:50 +0800
Parents: b64e2218f2c6fac302cfe2900f525f084e382935 e20fc854540716117aea5e169cf2a5cbb4af0a56
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=75808151e378cc0d9e3a8028011d6e00143fff3e
Log:
Merge branch 'PHP-5.5'
Conflicts:
Zend/zend_vm_execute.h
Changed paths:
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
Diff:
diff --cc Zend/zend_vm_execute.h
index c947c3e,f7d7301..a6fec47
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -15796,9 -15804,11 +15822,11 @@@ static int ZEND_FASTCALL ZEND_UNSET_VA
} else if (IS_VAR == IS_VAR || IS_VAR == IS_CV) {
zval_ptr_dtor(&varname);
}
- if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
+ zval_ptr_dtor(&free_op1.var);
- CHECK_EXCEPTION();
- ZEND_VM_NEXT_OPCODE();
+ HANDLE_EXCEPTION();
+ }
+ if (UNEXPECTED(ce == NULL)) {
+ zend_error_noreturn(E_ERROR, "Class '%s' not found",
Z_STRVAL_P(opline->op2.zv));
}
CACHE_PTR(opline->op2.literal->cache_slot, ce);
}
@@@ -20360,9 -20384,11 +20392,11 @@@ static int ZEND_FASTCALL ZEND_UNSET_VA
} else if (IS_VAR == IS_VAR || IS_VAR == IS_CV) {
zval_ptr_dtor(&varname);
}
- if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
+ zval_ptr_dtor(&free_op1.var);
- CHECK_EXCEPTION();
- ZEND_VM_NEXT_OPCODE();
+ HANDLE_EXCEPTION();
+ }
+ if (UNEXPECTED(ce == NULL)) {
+ zend_error_noreturn(E_ERROR, "Class '%s' not found",
Z_STRVAL_P(opline->op2.zv));
}
CACHE_PTR(opline->op2.literal->cache_slot, ce);
}
@@@ -21781,9 -21807,11 +21817,11 @@@ static int ZEND_FASTCALL ZEND_UNSET_VA
} else if (IS_VAR == IS_VAR || IS_VAR == IS_CV) {
zval_ptr_dtor(&varname);
}
- if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
+ zval_ptr_dtor(&free_op1.var);
- CHECK_EXCEPTION();
- ZEND_VM_NEXT_OPCODE();
+ HANDLE_EXCEPTION();
+ }
+ if (UNEXPECTED(ce == NULL)) {
+ zend_error_noreturn(E_ERROR, "Class '%s' not found",
Z_STRVAL_P(opline->op2.zv));
}
CACHE_PTR(opline->op2.literal->cache_slot, ce);
}