Merge branch 'bug69315' of https://github.com/laruence/php-src

diff --cc Zend/zend_compile.c
Simple merge

diff --cc ext/opcache/Optimizer/zend_optimizer.c
index de45bf0cd9224148ba515feb51e73f58b270307d,90aff7e247dacf779fd3a66f8cfad8c163fe7f03..cad023b5ca704b485259058827b53225aaf8d1b8
--- 1/ext/opcache/Optimizer/zend_optimizer.c
--- 2/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@@ -111,6 -111,13 +111,13 @@@ int zend_optimizer_add_literal(zend_op_
        return i;
  }
  
 -      return (fbc->type == ZEND_INTERNAL_FUNCTION &&
+ int zend_optimizer_is_disabled_func(const char *name, size_t len) {
+       zend_function *fbc = (zend_function *)zend_hash_str_find_ptr(EG(function_table), name, len);
+ 
++      return (fbc && fbc->type == ZEND_INTERNAL_FUNCTION &&
+                       fbc->internal_function.handler == ZEND_FN(display_disabled_function));
+ }
+ 
  void zend_optimizer_update_op1_const(zend_op_array *op_array,
                                       zend_op       *opline,
                                       zval          *val)