com php-src: Merge branch 'PHP-7.4': Zend/zend_compile.c Zend/zend_compile.h ext/opcache/Optimizer/zend_dump.c
| From: | Nikita Popov | Date: | Tue, 19 Feb 2019 09:12:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': Zend/zend_compile.c Zend/zend_compile.h ext/opcache/Optimizer/zend_dump.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104721@lists.php.net to get a copy of this message | ||
Commit: f37c70c7fbe87001eaa1490d60dfc067b8c3c0bc
Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 19 Feb 2019 10:12:01 +0100
Parents: 1016e3a927165ec571473ee89eab04512c935f21 32c0cbcbc146deebf5cd3dc35fad630e2ba5bdeb
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f37c70c7fbe87001eaa1490d60dfc067b8c3c0bc
Log:
Merge branch 'PHP-7.4'
Changed paths:
MM Zend/zend_compile.c
MM Zend/zend_compile.h
MM ext/opcache/Optimizer/zend_dump.c
Diff:
diff --cc Zend/zend_compile.h
index 401ebcf,7ff0605..965f4a1
--- a/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