]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 24 Jan 2019 09:57:45 +0000 (10:57 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 24 Jan 2019 09:57:45 +0000 (10:57 +0100)
1  2 
Zend/zend_compile.c
Zend/zend_compile.h

Simple merge
index a8244d6b5be23bbb6382fb4f3a9961c2a6352935,47430576ec11079d7b74ab62d3b8fbab0757c2a0..f63b3a755dec35e0976bab35aeda237e79c6cde8
@@@ -1045,9 -1040,9 +1045,12 @@@ END_EXTERN_C(
  /* disable builtin special case function calls */
  #define ZEND_COMPILE_NO_BUILTINS                              (1<<10)
  
 -#define ZEND_COMPILE_NO_JUMPTABLES                            (1<<11)
 +/* result of compilation may be stored in file cache */
 +#define ZEND_COMPILE_WITH_FILE_CACHE                  (1<<11)
 +
+ /* disable jumptable optimization for switch statements */
++#define ZEND_COMPILE_NO_JUMPTABLES                            (1<<12)
  /* The default value for CG(compiler_options) */
  #define ZEND_COMPILE_DEFAULT                                  ZEND_COMPILE_HANDLE_OP_ARRAY