com php-src: Merge branch 'PHP-7.0': ext/opcache/Optimizer/pass 1_5.c ext/opcache/Optimizer/zend_optimizer.h
| From: | Xinchen Hui | Date: | Fri, 18 Dec 2015 09:42:11 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0': ext/opcache/Optimizer/pass 1_5.c ext/opcache/Optimizer/zend_optimizer.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90333@lists.php.net to get a copy of this message | ||
Commit: af871f61dc8558f368cf908de0df327f9a7e0b91
Author: Xinchen Hui <laruence@gmail.com> Fri, 18 Dec 2015 17:42:11 +0800
Parents: 283cbebe5b80f7e4f69279d72035c235a77c943b 2f47e9872ed8ec9a125862e182f9e0068adf6f5a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af871f61dc8558f368cf908de0df327f9a7e0b91
Log:
Merge branch 'PHP-7.0'
* PHP-7.0:
Improved fix for #71127
Bugs:
https://bugs.php.net/71127
Changed paths:
MM ext/opcache/Optimizer/pass1_5.c
MM ext/opcache/Optimizer/zend_optimizer.h
Diff:
diff --cc ext/opcache/Optimizer/zend_optimizer.h
index ad75ab3,8c1b8ea..6d05315
--- a/ext/opcache/Optimizer/zend_optimizer.h
+++ b/ext/opcache/Optimizer/zend_optimizer.h
@@@ -42,49 -43,6 +43,49 @@@
#define ZEND_OPTIMIZER_ALL_PASSES 0xFFFFFFFF
- #define DEFAULT_OPTIMIZATION_LEVEL "0xFFFFFFFF"
+ #define DEFAULT_OPTIMIZATION_LEVEL "0xFFFFBFFF"
+
+#define ZEND_DUMP_AFTER_PASS_1 ZEND_OPTIMIZER_PASS_1
+#define ZEND_DUMP_AFTER_PASS_2 ZEND_OPTIMIZER_PASS_2
+#define ZEND_DUMP_AFTER_PASS_3 ZEND_OPTIMIZER_PASS_3
+#define ZEND_DUMP_AFTER_PASS_4 ZEND_OPTIMIZER_PASS_4
+#define ZEND_DUMP_AFTER_PASS_5 ZEND_OPTIMIZER_PASS_5
+#define ZEND_DUMP_AFTER_PASS_6 ZEND_OPTIMIZER_PASS_6
+#define ZEND_DUMP_AFTER_PASS_7 ZEND_OPTIMIZER_PASS_7
+#define ZEND_DUMP_AFTER_PASS_8 ZEND_OPTIMIZER_PASS_8
+#define ZEND_DUMP_AFTER_PASS_9 ZEND_OPTIMIZER_PASS_9
+#define ZEND_DUMP_AFTER_PASS_10 ZEND_OPTIMIZER_PASS_10
+#define ZEND_DUMP_AFTER_PASS_11 ZEND_OPTIMIZER_PASS_11
+#define ZEND_DUMP_AFTER_PASS_12 ZEND_OPTIMIZER_PASS_12
+#define ZEND_DUMP_AFTER_PASS_13 ZEND_OPTIMIZER_PASS_13
+#define ZEND_DUMP_AFTER_PASS_14 ZEND_OPTIMIZER_PASS_14
+
+#define ZEND_DUMP_BEFORE_OPTIMIZER (1<<16)
+#define ZEND_DUMP_AFTER_OPTIMIZER (1<<17)
+
+#define ZEND_DUMP_BEFORE_BLOCK_PASS (1<<18)
+#define ZEND_DUMP_AFTER_BLOCK_PASS (1<<19)
+#define ZEND_DUMP_BLOCK_PASS_VARS (1<<20)
+
+#define ZEND_DUMP_BEFORE_DFA_PASS (1<<21)
+#define ZEND_DUMP_AFTER_DFA_PASS (1<<22)
+#define ZEND_DUMP_DFA_CFG (1<<23)
+#define ZEND_DUMP_DFA_DOMINATORS (1<<24)
+#define ZEND_DUMP_DFA_LIVENESS (1<<25)
+#define ZEND_DUMP_DFA_PHI (1<<26)
+#define ZEND_DUMP_DFA_SSA (1<<27)
+#define ZEND_DUMP_DFA_SSA_VARS (1<<28)
+
+typedef struct _zend_script {
+ zend_string *filename;
+ zend_op_array main_op_array;
+ HashTable function_table;
+ HashTable class_table;
+} zend_script;
+
+int zend_optimize_script(zend_script *script, zend_long optimization_level, zend_long
debug_level);
+int zend_optimizer_startup(void);
+int zend_optimizer_shutdown(void);
+
#endif