Skip to content

zend_ast: Keep const-ness for zend_ast_get*() #22391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TimWolla wants to merge 1 commit into
base: master
Choose a base branch
from
+52 −20
Open

zend_ast: Keep const-ness for zend_ast_get*() #22391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 51 additions & 17 deletions Zend/zend_ast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,30 +372,64 @@ static zend_always_inline bool zend_ast_is_decl(const zend_ast *ast) {
static zend_always_inline bool zend_ast_is_list(const zend_ast *ast) {
return (ast->kind >> ZEND_AST_IS_LIST_SHIFT) & 1;
}
static zend_always_inline zend_ast_list *zend_ast_get_list(zend_ast *ast) {
ZEND_ASSERT(zend_ast_is_list(ast));
return (zend_ast_list *) ast;
}

static zend_always_inline zval *zend_ast_get_zval(zend_ast *ast) {
ZEND_ASSERT(ast->kind == ZEND_AST_ZVAL);
return &((zend_ast_zval *) ast)->val;
#if __cplusplus
extern "C++" {
static inline const zend_ast_list *zend_ast_get_list(const zend_ast *ast) {
ZEND_ASSERT(zend_ast_is_list(ast));
return reinterpret_cast<const zend_ast_list *>(ast);
}
static inline zend_ast_list *zend_ast_get_list(zend_ast *ast) {
ZEND_ASSERT(zend_ast_is_list(ast));
return reinterpret_cast<zend_ast_list *>(ast);
}
static inline const zval *zend_ast_get_zval(const zend_ast *ast) {
ZEND_ASSERT(ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_CONSTANT);
return &reinterpret_cast<const zend_ast_zval *>(ast)->val;
}
static inline zval *zend_ast_get_zval(zend_ast *ast) {
ZEND_ASSERT(ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_CONSTANT);
return &reinterpret_cast<zend_ast_zval *>(ast)->val;
}
static inline const zend_ast_op_array *zend_ast_get_op_array(const zend_ast *ast) {
ZEND_ASSERT(ast->kind == ZEND_AST_OP_ARRAY);
return reinterpret_cast<const zend_ast_op_array *>(ast);
}
static inline zend_ast_op_array *zend_ast_get_op_array(zend_ast *ast) {
ZEND_ASSERT(ast->kind == ZEND_AST_OP_ARRAY);
return reinterpret_cast<zend_ast_op_array *>(ast);
}
}
static zend_always_inline zend_string *zend_ast_get_str(zend_ast *ast) {
#else
# define zend_ast_get_list(ast) (ZEND_ASSERT(zend_ast_is_list(ast)), _Generic( \
(ast), \
const zend_ast *: ((const zend_ast_list *) ast), \
zend_ast *: ((zend_ast_list *) ast) \
))

# define zend_ast_get_zval(ast) (ZEND_ASSERT((ast)->kind == ZEND_AST_ZVAL || (ast)->kind == ZEND_AST_CONSTANT), _Generic( \
(ast), \
const zend_ast *: (&((const zend_ast_zval *) ast)->val), \
zend_ast *: (&((zend_ast_zval *) ast)->val) \
))

# define zend_ast_get_op_array(ast) (ZEND_ASSERT((ast)->kind == ZEND_AST_OP_ARRAY), _Generic( \
(ast), \
const zend_ast *: ((const zend_ast_op_array *) ast), \
zend_ast *: ((zend_ast_op_array *) ast) \
))
#endif

static zend_always_inline zend_string *zend_ast_get_str(const zend_ast *ast) {
const zval *zv = zend_ast_get_zval(ast);
ZEND_ASSERT(Z_TYPE_P(zv) == IS_STRING);
return Z_STR_P(zv);
}

static zend_always_inline zend_ast_op_array *zend_ast_get_op_array(zend_ast *ast) {
ZEND_ASSERT(ast->kind == ZEND_AST_OP_ARRAY);
return (zend_ast_op_array *) ast;
}

static zend_always_inline zend_string *zend_ast_get_constant_name(zend_ast *ast) {
ZEND_ASSERT(ast->kind == ZEND_AST_CONSTANT);
ZEND_ASSERT(Z_TYPE(((zend_ast_zval *) ast)->val) == IS_STRING);
return Z_STR(((zend_ast_zval *) ast)->val);
static zend_always_inline zend_string *zend_ast_get_constant_name(const zend_ast *ast) {
const zval *zv = zend_ast_get_zval(ast);
ZEND_ASSERT(Z_TYPE_P(zv) == IS_STRING);
return Z_STR_P(zv);
}

static zend_always_inline uint32_t zend_ast_get_num_children(const zend_ast *ast) {
Expand Down
4 changes: 1 addition & 3 deletions Zend/zend_portability.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@
# pragma clang diagnostic ignored "-Wassume"
# define ZEND_ASSUME(c) __builtin_assume(c)
#elif defined(PHP_HAVE_BUILTIN_UNREACHABLE) && defined(PHP_HAVE_BUILTIN_EXPECT)
# define ZEND_ASSUME(c) do { \
if (__builtin_expect(!(c), 0)) __builtin_unreachable(); \
} while (0)
# define ZEND_ASSUME(c) ((void)(__builtin_expect(!(c), 0) ? __builtin_unreachable() : (void)false))
#else
# define ZEND_ASSUME(c)
#endif
Expand Down