Access extra data stored in zval through macros

diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
index 1f83aeb02601598d170213993a911f6aedf521f7..577de140ef8d82fe0a390aca0b9030f6d063d53b 100644 (file)
--- a/Zend/zend_ast.c
+++ b/Zend/zend_ast.c
@@ -65,7 +65,7 @@ ZEND_API zend_ast *zend_ast_create_zval_with_lineno(zval *zv, zend_ast_attr attr
        ast->kind = ZEND_AST_ZVAL;
        ast->attr = attr;
        ZVAL_COPY_VALUE(&ast->val, zv);
-       ast->val.u2.lineno = lineno;
+       Z_LINENO(ast->val) = lineno;
        return (zend_ast *) ast;
 }
 
@@ -80,7 +80,7 @@ ZEND_API zend_ast *zend_ast_create_constant(zend_string *name, zend_ast_attr att
        ast->kind = ZEND_AST_CONSTANT;
        ast->attr = attr;
        ZVAL_STR(&ast->val, name);
-       ast->val.u2.lineno = CG(zend_lineno);
+       Z_LINENO(ast->val) = CG(zend_lineno);
        return (zend_ast *) ast;
 }
 

diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h
index bde2d65a14fab0a7bf1ba62930671934110e87bd..b9c8ed1b19d26f6d100ef74079d1a7711dda9cc7 100644 (file)
--- a/Zend/zend_ast.h
+++ b/Zend/zend_ast.h
@@ -248,7 +248,7 @@ static zend_always_inline uint32_t zend_ast_get_num_children(zend_ast *ast) {
 static zend_always_inline uint32_t zend_ast_get_lineno(zend_ast *ast) {
        if (ast->kind == ZEND_AST_ZVAL) {
                zval *zv = zend_ast_get_zval(ast);
-               return zv->u2.lineno;
+               return Z_LINENO_P(zv);
        } else {
                return ast->lineno;
        }

diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 9a8a1e195de2722cb156e2a9ab787b4071b93f58..56eb131194f8133a2dfe8fd6fe9735d24b1faff4 100644 (file)
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -222,7 +222,7 @@ static void zend_generator_dtor_storage(zend_object *object) /* {{{ */
                fast_call = ZEND_CALL_VAR(ex, ex->func->op_array.opcodes[finally_op_end].op1.var);
                Z_OBJ_P(fast_call) = EG(exception);
                EG(exception) = NULL;
-               fast_call->u2.lineno = (uint32_t)-1;
+               Z_OPLINE_NUM_P(fast_call) = (uint32_t)-1;
 
                ex->opline = &ex->func->op_array.opcodes[finally_op_num];
                generator->flags |= ZEND_GENERATOR_FORCED_CLOSE;

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 2a029ebfdd6088e7f7eedd9fbab81bef0394375a..414d5eeedcfa5d77becc1cbf57723db70fbafca9 100644 (file)
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -503,17 +503,17 @@ ZEND_API uint32_t *zend_get_property_guard(zend_object *zobj, zend_string *membe
                     /* hash values are always pred-calculated here */
                    (EXPECTED(ZSTR_H(str) == ZSTR_H(member)) &&
                     EXPECTED(zend_string_equal_content(str, member)))) {
-                       return &zv->u2.property_guard;
-               } else if (EXPECTED(zv->u2.property_guard == 0)) {
+                       return &Z_PROPERTY_GUARD_P(zv);
+               } else if (EXPECTED(Z_PROPERTY_GUARD_P(zv) == 0)) {
                        zend_string_release(Z_STR_P(zv));
                        ZVAL_STR_COPY(zv, member);
-                       return &zv->u2.property_guard;
+                       return &Z_PROPERTY_GUARD_P(zv);
                } else {
                        ALLOC_HASHTABLE(guards);
                        zend_hash_init(guards, 8, NULL, zend_property_guard_dtor, 0);
                        /* mark pointer as "special" using low bit */
                        zend_hash_add_new_ptr(guards, str,
-                               (void*)(((zend_uintptr_t)&zv->u2.property_guard) | 1));
+                               (void*)(((zend_uintptr_t)&Z_PROPERTY_GUARD_P(zv)) | 1));
                        zend_string_release(Z_STR_P(zv));
                        ZVAL_ARR(zv, guards);
                }
@@ -528,8 +528,8 @@ ZEND_API uint32_t *zend_get_property_guard(zend_object *zobj, zend_string *membe
                ZEND_ASSERT(Z_TYPE_P(zv) == IS_UNDEF);
                OBJ_FLAGS(zobj) |= IS_OBJ_HAS_GUARDS;
                ZVAL_STR_COPY(zv, member);
-               zv->u2.property_guard = 0;
-               return &zv->u2.property_guard;
+               Z_PROPERTY_GUARD_P(zv) = 0;
+               return &Z_PROPERTY_GUARD_P(zv);
        }
        /* we have to allocate uint32_t separately because ht->arData may be reallocated */
        ptr = (uint32_t*)emalloc(sizeof(uint32_t));

diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index ac814061711ba267de249f166c30d4aee1277707..a284eb2293379859768c0759aba0ebe2f61db30f 100644 (file)
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -193,6 +193,7 @@ struct _zval_struct {
        union {
                uint32_t     next;                 /* hash collision chain */
                uint32_t     cache_slot;           /* literal cache slot */
+               uint32_t     opline_num;           /* opline number (for FAST_CALL) */
                uint32_t     lineno;               /* line number (for ast nodes) */
                uint32_t     num_args;             /* arguments number for EX(This) */
                uint32_t     fe_pos;               /* foreach position */
@@ -413,6 +414,12 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) {
 #define Z_CACHE_SLOT(zval)                     (zval).u2.cache_slot
 #define Z_CACHE_SLOT_P(zval_p)         Z_CACHE_SLOT(*(zval_p))
 
+#define Z_LINENO(zval)                         (zval).u2.lineno
+#define Z_LINENO_P(zval_p)                     Z_LINENO(*(zval_p))
+
+#define Z_OPLINE_NUM(zval)                     (zval).u2.opline_num
+#define Z_OPLINE_NUM_P(zval_p)         Z_OPLINE_NUM(*(zval_p))
+
 #define Z_FE_POS(zval)                         (zval).u2.fe_pos
 #define Z_FE_POS_P(zval_p)                     Z_FE_POS(*(zval_p))
 
@@ -422,6 +429,9 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) {
 #define Z_ACCESS_FLAGS(zval)           (zval).u2.access_flags
 #define Z_ACCESS_FLAGS_P(zval_p)       Z_ACCESS_FLAGS(*(zval_p))
 
+#define Z_PROPERTY_GUARD(zval)         (zval).u2.property_guard
+#define Z_PROPERTY_GUARD_P(zval_p)     Z_PROPERTY_GUARD(*(zval_p))
+
 #define Z_EXTRA(zval)                          (zval).u2.extra
 #define Z_EXTRA_P(zval_p)                      Z_EXTRA(*(zval_p))
 

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 5d129a9ae1ddb853fe435051b60286ef8182f2cf..52e56a9761e2d27ce500795d5437184851caf3b4 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -7003,7 +7003,7 @@ ZEND_VM_HELPER(zend_dispatch_try_catch_finally_helper, ANY, ANY, uint32_t try_ca
                        cleanup_live_vars(execute_data, op_num, try_catch->finally_op);
                        Z_OBJ_P(fast_call) = EG(exception);
                        EG(exception) = NULL;
-                       fast_call->u2.lineno = (uint32_t)-1;
+                       Z_OPLINE_NUM_P(fast_call) = (uint32_t)-1;
                        ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[try_catch->finally_op]);
                        ZEND_VM_CONTINUE();
 
@@ -7011,9 +7011,9 @@ ZEND_VM_HELPER(zend_dispatch_try_catch_finally_helper, ANY, ANY, uint32_t try_ca
                        zval *fast_call = EX_VAR(EX(func)->op_array.opcodes[try_catch->finally_end].op1.var);
 
                        /* cleanup incomplete RETURN statement */
-                       if (fast_call->u2.lineno != (uint32_t)-1
-                        && (EX(func)->op_array.opcodes[fast_call->u2.lineno].op2_type & (IS_TMP_VAR | IS_VAR))) {
-                               zval *return_value = EX_VAR(EX(func)->op_array.opcodes[fast_call->u2.lineno].op2.var);
+                       if (Z_OPLINE_NUM_P(fast_call) != (uint32_t)-1
+                        && (EX(func)->op_array.opcodes[Z_OPLINE_NUM_P(fast_call)].op2_type & (IS_TMP_VAR | IS_VAR))) {
+                               zval *return_value = EX_VAR(EX(func)->op_array.opcodes[Z_OPLINE_NUM_P(fast_call)].op2.var);
 
                                zval_ptr_dtor(return_value);
                        }
@@ -7469,9 +7469,9 @@ ZEND_VM_HANDLER(159, ZEND_DISCARD_EXCEPTION, ANY, ANY)
        SAVE_OPLINE();
 
        /* cleanup incomplete RETURN statement */
-       if (fast_call->u2.lineno != (uint32_t)-1
-        && (EX(func)->op_array.opcodes[fast_call->u2.lineno].op2_type & (IS_TMP_VAR | IS_VAR))) {
-               zval *return_value = EX_VAR(EX(func)->op_array.opcodes[fast_call->u2.lineno].op2.var);
+       if (Z_OPLINE_NUM_P(fast_call) != (uint32_t)-1
+        && (EX(func)->op_array.opcodes[Z_OPLINE_NUM_P(fast_call)].op2_type & (IS_TMP_VAR | IS_VAR))) {
+               zval *return_value = EX_VAR(EX(func)->op_array.opcodes[Z_OPLINE_NUM_P(fast_call)].op2.var);
 
                zval_ptr_dtor(return_value);
        }
@@ -7493,7 +7493,7 @@ ZEND_VM_HANDLER(162, ZEND_FAST_CALL, JMP_ADDR, ANY)
 
        Z_OBJ_P(fast_call) = NULL;
        /* set return address */
-       fast_call->u2.lineno = opline - EX(func)->op_array.opcodes;
+       Z_OPLINE_NUM_P(fast_call) = opline - EX(func)->op_array.opcodes;
        ZEND_VM_SET_OPCODE(OP_JMP_ADDR(opline, opline->op1));
        ZEND_VM_CONTINUE();
 }
@@ -7504,8 +7504,8 @@ ZEND_VM_HANDLER(163, ZEND_FAST_RET, ANY, TRY_CATCH)
        zval *fast_call = EX_VAR(opline->op1.var);
        uint32_t current_try_catch_offset, current_op_num;
 
-       if (fast_call->u2.lineno != (uint32_t)-1) {
-               const zend_op *fast_ret = EX(func)->op_array.opcodes + fast_call->u2.lineno;
+       if (Z_OPLINE_NUM_P(fast_call) != (uint32_t)-1) {
+               const zend_op *fast_ret = EX(func)->op_array.opcodes + Z_OPLINE_NUM_P(fast_call);
 
                ZEND_VM_SET_OPCODE(fast_ret + 1);
                ZEND_VM_CONTINUE();

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index c7b1487967748bf57a8b213d5e48845372793579..ad7f3ba40d65ddb62f984450faad7509ee81e439 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1725,7 +1725,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_dispatch_try_catch_finally_hel
                        cleanup_live_vars(execute_data, op_num, try_catch->finally_op);
                        Z_OBJ_P(fast_call) = EG(exception);
                        EG(exception) = NULL;
-                       fast_call->u2.lineno = (uint32_t)-1;
+                       Z_OPLINE_NUM_P(fast_call) = (uint32_t)-1;
                        ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[try_catch->finally_op]);
                        ZEND_VM_CONTINUE();
 
@@ -1733,9 +1733,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_dispatch_try_catch_finally_hel
                        zval *fast_call = EX_VAR(EX(func)->op_array.opcodes[try_catch->finally_end].op1.var);
 
                        /* cleanup incomplete RETURN statement */
-                       if (fast_call->u2.lineno != (uint32_t)-1
-                        && (EX(func)->op_array.opcodes[fast_call->u2.lineno].op2_type & (IS_TMP_VAR | IS_VAR))) {
-                               zval *return_value = EX_VAR(EX(func)->op_array.opcodes[fast_call->u2.lineno].op2.var);
+                       if (Z_OPLINE_NUM_P(fast_call) != (uint32_t)-1
+                        && (EX(func)->op_array.opcodes[Z_OPLINE_NUM_P(fast_call)].op2_type & (IS_TMP_VAR | IS_VAR))) {
+                               zval *return_value = EX_VAR(EX(func)->op_array.opcodes[Z_OPLINE_NUM_P(fast_call)].op2.var);
 
                                zval_ptr_dtor(return_value);
                        }
@@ -1866,9 +1866,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DISCARD_EXCEPTION_SPEC_HANDLER
        SAVE_OPLINE();
 
        /* cleanup incomplete RETURN statement */
-       if (fast_call->u2.lineno != (uint32_t)-1
-        && (EX(func)->op_array.opcodes[fast_call->u2.lineno].op2_type & (IS_TMP_VAR | IS_VAR))) {
-               zval *return_value = EX_VAR(EX(func)->op_array.opcodes[fast_call->u2.lineno].op2.var);
+       if (Z_OPLINE_NUM_P(fast_call) != (uint32_t)-1
+        && (EX(func)->op_array.opcodes[Z_OPLINE_NUM_P(fast_call)].op2_type & (IS_TMP_VAR | IS_VAR))) {
+               zval *return_value = EX_VAR(EX(func)->op_array.opcodes[Z_OPLINE_NUM_P(fast_call)].op2.var);
 
                zval_ptr_dtor(return_value);
        }
@@ -1890,7 +1890,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FAST_CALL_SPEC_HANDLER(ZEND_OP
 
        Z_OBJ_P(fast_call) = NULL;
        /* set return address */
-       fast_call->u2.lineno = opline - EX(func)->op_array.opcodes;
+       Z_OPLINE_NUM_P(fast_call) = opline - EX(func)->op_array.opcodes;
        ZEND_VM_SET_OPCODE(OP_JMP_ADDR(opline, opline->op1));
        ZEND_VM_CONTINUE();
 }
@@ -1901,8 +1901,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FAST_RET_SPEC_HANDLER(ZEND_OPC
        zval *fast_call = EX_VAR(opline->op1.var);
        uint32_t current_try_catch_offset, current_op_num;
 
-       if (fast_call->u2.lineno != (uint32_t)-1) {
-               const zend_op *fast_ret = EX(func)->op_array.opcodes + fast_call->u2.lineno;
+       if (Z_OPLINE_NUM_P(fast_call) != (uint32_t)-1) {
+               const zend_op *fast_ret = EX(func)->op_array.opcodes + Z_OPLINE_NUM_P(fast_call);
 
                ZEND_VM_SET_OPCODE(fast_ret + 1);
                ZEND_VM_CONTINUE();