Merge branch 'PHP-7.4'

diff --cc Zend/zend_compile.c
Simple merge

diff --cc Zend/zend_compile.h
index 401ebcfe760bb8d2f40512f9acd167781fb7eaa1,7ff06053578ed8e359827649e70bc93a64d9d3af..965f4a1e0582de9c5bad60f274bb9a423b310f84
--- 1/Zend/zend_compile.h
--- 2/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@@ -1030,40 -1041,43 +1032,40 @@@ END_EXTERN_C(
  /* don't perform early binding for classes inherited form internal ones;
   * in namespaces assume that internal class that doesn't exist at compile-time
   * may apper in run-time */
- #define ZEND_COMPILE_IGNORE_INTERNAL_CLASSES    (1<<3)
+ #define ZEND_COMPILE_IGNORE_INTERNAL_CLASSES    (1<<4)
  
  /* generate ZEND_DECLARE_INHERITED_CLASS_DELAYED opcode to delay early binding */
- #define ZEND_COMPILE_DELAYED_BINDING            (1<<4)
+ #define ZEND_COMPILE_DELAYED_BINDING            (1<<5)
  
  /* disable constant substitution at compile-time */
- #define ZEND_COMPILE_NO_CONSTANT_SUBSTITUTION   (1<<5)
+ #define ZEND_COMPILE_NO_CONSTANT_SUBSTITUTION   (1<<6)
  
 -/* disable usage of builtin instruction for strlen() */
 -#define ZEND_COMPILE_NO_BUILTIN_STRLEN          (1<<7)
 -
  /* disable substitution of persistent constants at compile-time */
- #define ZEND_COMPILE_NO_PERSISTENT_CONSTANT_SUBSTITUTION      (1<<7)
+ #define ZEND_COMPILE_NO_PERSISTENT_CONSTANT_SUBSTITUTION      (1<<8)
  
  /* generate ZEND_INIT_FCALL_BY_NAME for userland functions instead of ZEND_INIT_FCALL */
- #define ZEND_COMPILE_IGNORE_USER_FUNCTIONS      (1<<8)
+ #define ZEND_COMPILE_IGNORE_USER_FUNCTIONS      (1<<9)
  
  /* force ZEND_ACC_USE_GUARDS for all classes */
- #define ZEND_COMPILE_GUARDS                                           (1<<9)
+ #define ZEND_COMPILE_GUARDS                                           (1<<10)
  
  /* disable builtin special case function calls */
- #define ZEND_COMPILE_NO_BUILTINS                              (1<<10)
+ #define ZEND_COMPILE_NO_BUILTINS                              (1<<11)
  
  /* result of compilation may be stored in file cache */
- #define ZEND_COMPILE_WITH_FILE_CACHE                  (1<<11)
+ #define ZEND_COMPILE_WITH_FILE_CACHE                  (1<<12)
  
  /* ignore functions and classes declared in other files */
- #define ZEND_COMPILE_IGNORE_OTHER_FILES                       (1<<12)
+ #define ZEND_COMPILE_IGNORE_OTHER_FILES                       (1<<13)
  
  /* this flag is set when compiler invoked by opcache_compile_file() */
- #define ZEND_COMPILE_WITHOUT_EXECUTION          (1<<13)
+ #define ZEND_COMPILE_WITHOUT_EXECUTION          (1<<14)
  
  /* this flag is set when compiler invoked during preloading */
- #define ZEND_COMPILE_PRELOAD                    (1<<14)
+ #define ZEND_COMPILE_PRELOAD                    (1<<15)
  
  /* disable jumptable optimization for switch statements */
- #define ZEND_COMPILE_NO_JUMPTABLES                            (1<<15)
+ #define ZEND_COMPILE_NO_JUMPTABLES                            (1<<16)
  
  /* The default value for CG(compiler_options) */
  #define ZEND_COMPILE_DEFAULT                                  ZEND_COMPILE_HANDLE_OP_ARRAY

diff --cc ext/opcache/Optimizer/zend_dump.c
Simple merge