diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-13 12:44:17 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-13 12:44:17 +0000 |
commit | 7ad9975fe7e8e22de841b26ed549652326d08c65 (patch) | |
tree | 673600ac2e387fb3164c8480164d5a4a70f776a0 /iseq.h | |
parent | 879df66d96ea7d822de2ea06602a1bba0ee5cb52 (diff) |
iseq.h (struct iseq_catch_table_entry, iseq_compile_data_storage): Use FLEX_ARY_LEN
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'iseq.h')
-rw-r--r-- | iseq.h | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -249,7 +249,7 @@ struct iseq_catch_table_entry { PACKED_STRUCT_UNALIGNED(struct iseq_catch_table { unsigned int size; - struct iseq_catch_table_entry entries[1]; /* flexible array */ + struct iseq_catch_table_entry entries[FLEX_ARY_LEN]; }); static inline int @@ -260,7 +260,7 @@ iseq_catch_table_bytes(int n) }; if (n > catch_table_entries_max) rb_fatal("too large iseq_catch_table - %d", n); return (int)(sizeof(struct iseq_catch_table) + - (n - 1) * sizeof(struct iseq_catch_table_entry)); + n * sizeof(struct iseq_catch_table_entry)); } #define INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE (512) @@ -269,13 +269,9 @@ struct iseq_compile_data_storage { struct iseq_compile_data_storage *next; unsigned int pos; unsigned int size; - char buff[1]; /* flexible array */ + char buff[FLEX_ARY_LEN]; }; -/* account for flexible array */ -#define SIZEOF_ISEQ_COMPILE_DATA_STORAGE \ - (sizeof(struct iseq_compile_data_storage) - 1) - /* defined? */ enum defined_type { |