Skip to content

zend: introducing ZEND_ELEMENT_COUNT for struct's dynamic arrays. #12650

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

Merged
merged 3 commits into from
Nov 13, 2023
Merged

zend: introducing ZEND_ELEMENT_COUNT for struct's dynamic arrays. #12650

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6aa289
zend: introducing ZEND_ELEMENT_COUNT for struct's dynamic arrays.
devnexen Nov 10, 2023
5ebb06e
adding to a handful of flexible arrays as well
devnexen Nov 10, 2023
9a43fee
few more except zend_inheritance_cache_entry since the count info is …
devnexen Nov 13, 2023
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
8 changes: 8 additions & 0 deletions Zend/zend_portability.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,14 @@ char *alloca();
# define HAVE_BUILTIN_CONSTANT_P
#endif

#if __has_attribute(element_count)
#define ZEND_ELEMENT_COUNT(m) __attribute__((element_count(m)))
#elif __has_attribute(counted_by)
#define ZEND_ELEMENT_COUNT(m) __attribute__((counted_by(m)))
#else
#define ZEND_ELEMENT_COUNT(m)
#endif

#ifdef HAVE_BUILTIN_CONSTANT_P
# define ZEND_CONST_COND(_condition, _default) \
(__builtin_constant_p(_condition) ? (_condition) : (_default))
Expand Down
4 changes: 2 additions & 2 deletions Zend/zend_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ typedef struct {

typedef struct {
uint32_t num_types;
zend_type types[1];
zend_type types[1] ZEND_ELEMENT_COUNT(num_types);
} zend_type_list;

#define _ZEND_TYPE_EXTRA_FLAGS_SHIFT 25
Expand Down Expand Up @@ -374,7 +374,7 @@ struct _zend_string {
zend_refcounted_h gc;
zend_ulong h; /* hash value */
size_t len;
char val[1];
char val[1] ZEND_ELEMENT_COUNT(len);
};

typedef struct _Bucket {
Expand Down
2 changes: 1 addition & 1 deletion sapi/fpm/fpm/fpm_scoreboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ struct fpm_scoreboard_s {
int free_proc;
unsigned long int slow_rq;
struct fpm_scoreboard_s *shared;
struct fpm_scoreboard_proc_s procs[];
struct fpm_scoreboard_proc_s procs[] ZEND_ELEMENT_COUNT(nprocs);
};

int fpm_scoreboard_init_main(void);
Expand Down
2 changes: 1 addition & 1 deletion sapi/phpdbg/phpdbg_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ typedef struct {
size_t len;
zend_op_array op_array;
uint32_t lines;
uint32_t line[1];
uint32_t line[1] ZEND_ELEMENT_COUNT(lines);
} phpdbg_file_source;

#endif /* PHPDBG_LIST_H */