Drop some dead defines

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index ecff23d1cdf9e6c9b08a148ce73cbb23b171ab5c..ef99cd1e3ebde6ca9360ca44d859eb769e7753c5 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -831,16 +831,6 @@ ZEND_API void zend_assert_valid_class_name(const zend_string *const_name);
 #define ZEND_FETCH_CLASS_SILENT      0x0100
 #define ZEND_FETCH_CLASS_EXCEPTION   0x0200
 
-/* variable parsing type (compile-time) */
-#define ZEND_PARSED_MEMBER                             (1<<0)
-#define ZEND_PARSED_METHOD_CALL                        (1<<1)
-#define ZEND_PARSED_STATIC_MEMBER              (1<<2)
-#define ZEND_PARSED_FUNCTION_CALL              (1<<3)
-#define ZEND_PARSED_VARIABLE                   (1<<4)
-#define ZEND_PARSED_REFERENCE_VARIABLE (1<<5)
-#define ZEND_PARSED_NEW                                        (1<<6)
-#define ZEND_PARSED_LIST_EXPR                  (1<<7)
-
 #define ZEND_PARAM_REF      (1<<0)
 #define ZEND_PARAM_VARIADIC (1<<1)
 
@@ -848,9 +838,6 @@ ZEND_API void zend_assert_valid_class_name(const zend_string *const_name);
 #define ZEND_NAME_NOT_FQ   1
 #define ZEND_NAME_RELATIVE 2
 
-/* unset types */
-#define ZEND_UNSET_REG 0
-
 /* var status for backpatching */
 #define BP_VAR_R                       0
 #define BP_VAR_W                       1
@@ -903,8 +890,6 @@ ZEND_API void zend_assert_valid_class_name(const zend_string *const_name);
 
 #define ZEND_FREE_ON_RETURN     (1<<0)
 
-#define ZEND_MEMBER_FUNC_CALL   (1<<0)
-
 #define ZEND_ARG_SEND_BY_REF (1<<0)
 #define ZEND_ARG_COMPILE_TIME_BOUND (1<<1)
 #define ZEND_ARG_SEND_FUNCTION (1<<2)

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 2b18ef95b3e5abcacb72a9e6399776d1cf01d2a5..5abc2ad75af5a472e8296ca2525fc08052932ec2 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -117,21 +117,8 @@ static const zend_internal_function zend_pass_function = {
                zval_ptr_dtor_nogc(should_free); \
        }
 
-/* End of zend_execute_locks.h */
-
 #define CV_DEF_OF(i) (EX(func)->op_array.vars[i])
 
-#define CTOR_CALL_BIT    0x1
-#define CTOR_USED_BIT    0x2
-
-#define IS_CTOR_CALL(ce) (((zend_uintptr_t)(ce)) & CTOR_CALL_BIT)
-#define IS_CTOR_USED(ce) (((zend_uintptr_t)(ce)) & CTOR_USED_BIT)
-
-#define ENCODE_CTOR(ce, used) \
-       ((zend_class_entry*)(((zend_uintptr_t)(ce)) | CTOR_CALL_BIT | ((used) ? CTOR_USED_BIT : 0)))
-#define DECODE_CTOR(ce) \
-       ((zend_class_entry*)(((zend_uintptr_t)(ce)) & ~(CTOR_CALL_BIT|CTOR_USED_BIT)))
-
 #define ZEND_VM_MAIN_STACK_PAGE_SLOTS (16 * 1024) /* should be a power of 2 */
 #define ZEND_VM_GENERATOR_STACK_PAGE_SLOTS (256)