diff options
Diffstat (limited to 'ext/opcache/Optimizer/zend_optimizer_internal.h')
| -rw-r--r-- | ext/opcache/Optimizer/zend_optimizer_internal.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ext/opcache/Optimizer/zend_optimizer_internal.h b/ext/opcache/Optimizer/zend_optimizer_internal.h index c20634087f..7f8962e3ab 100644 --- a/ext/opcache/Optimizer/zend_optimizer_internal.h +++ b/ext/opcache/Optimizer/zend_optimizer_internal.h @@ -22,7 +22,14 @@ #ifndef ZEND_OPTIMIZER_INTERNAL_H #define ZEND_OPTIMIZER_INTERNAL_H -#include "ZendAccelerator.h" +#define ZEND_RESULT_TYPE(opline) (opline)->result_type +#define ZEND_RESULT(opline) (opline)->result +#define ZEND_OP1_TYPE(opline) (opline)->op1_type +#define ZEND_OP1(opline) (opline)->op1 +#define ZEND_OP1_LITERAL(opline) (op_array)->literals[(opline)->op1.constant] +#define ZEND_OP2_TYPE(opline) (opline)->op2_type +#define ZEND_OP2(opline) (opline)->op2 +#define ZEND_OP2_LITERAL(opline) (op_array)->literals[(opline)->op2.constant] #define VAR_NUM(v) EX_VAR_TO_NUM(v) #define NUM_VAR(v) ((uint32_t)(zend_uintptr_t)ZEND_CALL_VAR_NUM(0, v)) @@ -51,8 +58,9 @@ typedef struct _zend_optimizer_ctx { zend_arena *arena; - zend_persistent_script *script; + zend_script *script; HashTable *constants; + zend_long optimization_level; } zend_optimizer_ctx; typedef struct _zend_code_block zend_code_block; @@ -87,9 +95,6 @@ struct _zend_block_source { zend_block_source *next; }; -#define OPTIMIZATION_LEVEL \ - ZCG(accel_directives).optimization_level - #define LITERAL_LONG(op, val) do { \ zval _c; \ ZVAL_LONG(&_c, val); \ |