Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2f4973f

Browse files
committed
Revert GH-10279
Cf. <#10220 (comment)>. This reverts commit 45a128c. This reverts commit 1eb71c3. This reverts commit 492523a. This reverts commit c7a4633. This reverts commit 308adb9. This reverts commit cd27d5e. This reverts commit c593340. This reverts commit 46371f4. This reverts commit 623e2e9. This reverts commit e7434c1. This reverts commit d28d323. This reverts commit 1a067b8. This reverts commit a55c0c5. This reverts commit b5aeb3a. This reverts commit f061a03. This reverts commit b088575. This reverts commit b1d4877. This reverts commit 94f9a20. This reverts commit 4831e48. This reverts commit cd985de. This reverts commit 9521d21. This reverts commit d613615.
1 parent bf1cfc0 commit 2f4973f

34 files changed

+59
-139
lines changed

‎Zend/Optimizer/dce.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "Optimizer/zend_ssa.h"
2323
#include "Optimizer/zend_func_info.h"
2424
#include "Optimizer/zend_call_graph.h"
25-
#include "zend_arena.h"
2625
#include "zend_bitset.h"
2726

2827
/* This pass implements a form of dead code elimination (DCE). The algorithm optimistically assumes

‎Zend/Optimizer/sccp.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@
1818
*/
1919

2020
#include "zend_API.h"
21-
#include "zend_arena.h"
22-
#include "zend_multiply.h" // for zend_safe_address_guarded()
2321
#include "zend_exceptions.h"
2422
#include "zend_ini.h"
25-
#include "zend_optimizer.h"
2623
#include "zend_type_info.h"
2724
#include "Optimizer/zend_optimizer_internal.h"
2825
#include "Optimizer/zend_call_graph.h"

‎Zend/Optimizer/scdf.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
+----------------------------------------------------------------------+
1717
*/
1818

19-
#include "Optimizer/scdf.h"
2019
#include "Optimizer/zend_optimizer_internal.h"
21-
#include "zend_arena.h"
20+
#include "Optimizer/scdf.h"
2221

2322
/* This defines a generic framework for sparse conditional dataflow propagation. The algorithm is
2423
* based on "Sparse conditional constant propagation" by Wegman and Zadeck. We're using a

‎Zend/Optimizer/scdf.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
#define _SCDF_H
2121

2222
#include "zend_bitset.h"
23-
#include "zend_long.h"
24-
#include "zend_ssa.h"
25-
26-
typedef struct _zend_op_array zend_op_array;
27-
typedef struct _zend_optimizer_ctx zend_optimizer_ctx;
2823

2924
typedef struct _scdf_ctx {
3025
zend_op_array *op_array;

‎Zend/Optimizer/zend_call_graph.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@
1616
+----------------------------------------------------------------------+
1717
*/
1818

19+
#include "zend_compile.h"
20+
#include "zend_extensions.h"
21+
#include "Optimizer/zend_optimizer.h"
22+
#include "zend_optimizer_internal.h"
23+
#include "zend_inference.h"
1924
#include "zend_call_graph.h"
20-
#include "zend_arena.h"
21-
#include "zend_bitset.h"
2225
#include "zend_func_info.h"
23-
#include "zend_optimizer_internal.h"
26+
#include "zend_inference.h"
27+
#include "zend_call_graph.h"
2428

2529
static void zend_op_array_calc(zend_op_array *op_array, void *context)
2630
{

‎Zend/Optimizer/zend_call_graph.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
#define ZEND_CALL_GRAPH_H
2121

2222
#include "zend_ssa.h"
23-
24-
typedef struct _zend_func_info zend_func_info;
25-
typedef struct _zend_call_info zend_call_info;
23+
#include "zend_func_info.h"
24+
#include "zend_optimizer.h"
2625

2726
typedef struct _zend_send_arg_info {
2827
zend_op *opline;

‎Zend/Optimizer/zend_cfg.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
+----------------------------------------------------------------------+
1717
*/
1818

19+
#include "zend_compile.h"
1920
#include "zend_cfg.h"
20-
#include "zend_func_info.h" // for ZEND_FUNC_FREE_LOOP_VAR
21-
#include "zend_globals.h" // struct _zend_executor_globals
22-
#include "zend_globals_macros.h" // for EG()
23-
#include "zend_optimizer_internal.h"
21+
#include "zend_func_info.h"
2422
#include "zend_worklist.h"
23+
#include "zend_optimizer.h"
24+
#include "zend_optimizer_internal.h"
25+
#include "zend_sort.h"
2526

2627
static void zend_mark_reachable(zend_op *opcodes, zend_cfg *cfg, zend_basic_block *b) /* {{{ */
2728
{

‎Zend/Optimizer/zend_cfg.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@
1919
#ifndef ZEND_CFG_H
2020
#define ZEND_CFG_H
2121

22-
#include "zend_portability.h" // for BEGIN_EXTERN_C
23-
24-
#include <stdint.h>
25-
26-
typedef struct _zend_arena zend_arena;
27-
typedef struct _zend_op_array zend_op_array;
28-
2922
/* zend_basic_block.flags */
3023
#define ZEND_BB_START (1<<0) /* first block */
3124
#define ZEND_BB_FOLLOW (1<<1) /* follows the next block */

‎Zend/Optimizer/zend_inference.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616
+----------------------------------------------------------------------+
1717
*/
1818

19+
#include "zend_compile.h"
20+
#include "zend_generators.h"
1921
#include "zend_inference.h"
20-
#include "zend_closures.h" // for zend_ce_closure
21-
#include "zend_generators.h" // for zend_ce_generator
2222
#include "zend_func_info.h"
23-
#include "zend_globals.h" // struct _zend_executor_globals
24-
#include "zend_globals_macros.h" // for EG()
2523
#include "zend_call_graph.h"
24+
#include "zend_closures.h"
2625
#include "zend_worklist.h"
27-
#include "zend_optimizer.h"
2826
#include "zend_optimizer_internal.h"
2927

3028
/* The used range inference algorithm is described in:

‎Zend/Optimizer/zend_inference.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919
#ifndef ZEND_INFERENCE_H
2020
#define ZEND_INFERENCE_H
2121

22-
#include "zend_cfg.h" // for CRT_CONSTANT()
23-
#include "zend_compile.h" // for struct _zend_op
24-
#include "zend_portability.h" // for BEGIN_EXTERN_C
22+
#include "zend_optimizer.h"
2523
#include "zend_ssa.h"
26-
#include "zend_type_info.h" // for MAY_BE_*
24+
#include "zend_bitset.h"
25+
26+
/* Bitmask for type inference (zend_ssa_var_info.type) */
27+
#include "zend_type_info.h"
2728

2829
#define MAY_BE_PACKED_GUARD (1<<27) /* needs packed array guard */
2930
#define MAY_BE_CLASS_GUARD (1<<27) /* needs class guard */

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /