From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 24 Jan 2019 09:57:45 +0000 (+0100)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.3RC1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0f97ae7ec89bdfef163e4b76b895ffab84dedba;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

e0f97ae7ec89bdfef163e4b76b895ffab84dedba
diff --cc Zend/zend_compile.h
index a8244d6b5b,47430576ec..f63b3a755d
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@@ -1045,9 -1040,9 +1045,12 @@@ END_EXTERN_C(
  /* disable builtin special case function calls */
  #define ZEND_COMPILE_NO_BUILTINS				(1<<10)
  
 +/* 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<<11)
++#define ZEND_COMPILE_NO_JUMPTABLES				(1<<12)
+ 
  /* The default value for CG(compiler_options) */
  #define ZEND_COMPILE_DEFAULT					ZEND_COMPILE_HANDLE_OP_ARRAY