archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Fix incorrect zend_try usage
This commit is contained in:
Nikita Popov 2019-12-10 15:22:46 +01:00
commit c2d92ad971
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/opcache/ZendAccelerator.c
View file

@ -3958,10 +3958,13 @@ static void preload_check_windows_restrictions(zend_class_entry *scope) {
static inline int preload_update_class_constants(zend_class_entry *ce) { static inline int preload_update_class_constants(zend_class_entry *ce) {
/* This is a separate function to work around what appears to be a bug in GCC /* This is a separate function to work around what appears to be a bug in GCC
* maybe-uninitialized analysis. */ * maybe-uninitialized analysis. */
int result;
zend_try { zend_try {
return zend_update_class_constants(ce); result = zend_update_class_constants(ce);
} zend_catch {
result = FAILURE;
} zend_end_try(); } zend_end_try();
return FAILURE; return result;
} }
static zend_class_entry *preload_load_prop_type(zend_property_info *prop, zend_string *name) { static zend_class_entry *preload_load_prop_type(zend_property_info *prop, zend_string *name) {