From 5ddcacac2ebc30d573eb1cb4a121a1c02d61c6aa Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 10 Dec 2019 15:22:31 +0100
Subject: [PATCH] Fix incorrect zend_try usage

---
 ext/opcache/ZendAccelerator.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 3f65123aed6..0b66ab6e6e2 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -3873,10 +3873,13 @@ static void preload_check_windows_restrictions(zend_class_entry *scope) {
 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
 	 * maybe-uninitialized analysis. */
+	int result;
 	zend_try {
-		return zend_update_class_constants(ce);
+		result = zend_update_class_constants(ce);
+	} zend_catch {
+		result = FAILURE;
 	} zend_end_try();
-	return FAILURE;
+	return result;
 }
 
 static zend_class_entry *preload_load_prop_type(zend_property_info *prop, zend_string *name) {