diff options
Diffstat (limited to 'iseq.h')
| -rw-r--r-- | iseq.h | 57 |
1 files changed, 44 insertions, 13 deletions
@@ -11,7 +11,9 @@ **********************************************************************/ #include "internal/gc.h" +#include "shape.h" #include "vm_core.h" +#include "prism_compile.h" RUBY_EXTERN const int ruby_api_version[]; #define ISEQ_MAJOR_VERSION ((unsigned int)ruby_api_version[0]) @@ -45,6 +47,10 @@ extern const ID rb_iseq_shared_exc_local_tbl[]; #define ISEQ_FLIP_CNT(iseq) ISEQ_BODY(iseq)->variable.flip_count +#define ISEQ_FROZEN_STRING_LITERAL_ENABLED 1 +#define ISEQ_FROZEN_STRING_LITERAL_DISABLED 0 +#define ISEQ_FROZEN_STRING_LITERAL_UNSET -1 + static inline rb_snum_t ISEQ_FLIP_CNT_INCREMENT(const rb_iseq_t *iseq) { @@ -62,10 +68,10 @@ ISEQ_ORIGINAL_ISEQ(const rb_iseq_t *iseq) static inline void ISEQ_ORIGINAL_ISEQ_CLEAR(const rb_iseq_t *iseq) { - void *ptr = ISEQ_BODY(iseq)->variable.original_iseq; - ISEQ_BODY(iseq)->variable.original_iseq = NULL; + VALUE *ptr = (VALUE *)ISEQ_BODY(iseq)->variable.original_iseq; if (ptr) { - ruby_xfree(ptr); + ISEQ_BODY(iseq)->variable.original_iseq = NULL; + SIZED_FREE_N(ptr, ISEQ_BODY(iseq)->iseq_size); } } @@ -82,9 +88,10 @@ ISEQ_ORIGINAL_ISEQ_ALLOC(const rb_iseq_t *iseq, long size) RUBY_EVENT_CALL | \ RUBY_EVENT_RETURN| \ RUBY_EVENT_C_CALL| \ - RUBY_EVENT_C_RETURN| \ - RUBY_EVENT_B_CALL| \ - RUBY_EVENT_B_RETURN| \ + RUBY_EVENT_C_RETURN | \ + RUBY_EVENT_B_CALL | \ + RUBY_EVENT_B_RETURN | \ + RUBY_EVENT_RESCUE | \ RUBY_EVENT_COVERAGE_LINE| \ RUBY_EVENT_COVERAGE_BRANCH) @@ -99,6 +106,16 @@ struct iseq_compile_data { const VALUE err_info; const VALUE catch_table_ary; /* Array */ + /* Mirror fields from ISEQ_BODY so they are accessible during iseq setup */ + unsigned int iseq_size; + VALUE *iseq_encoded; /* half-encoded iseq (insn addr and operands) */ + bool is_single_mark_bit; /* identifies whether mark bits are single or a list */ + + union { + iseq_bits_t * list; /* Find references for GC */ + iseq_bits_t single; + } mark_bits; + /* GC is not needed */ struct iseq_label_data *start_label; struct iseq_label_data *end_label; @@ -125,6 +142,7 @@ struct iseq_compile_data { struct rb_id_table *ivar_cache_table; const struct rb_builtin_function *builtin_function_table; const NODE *root_node; + bool catch_except_p; // If a frame of this ISeq may catch exception, set true. #if OPT_SUPPORT_JOKE st_table *labels_table; #endif @@ -158,7 +176,12 @@ ISEQ_COMPILE_DATA_CLEAR(rb_iseq_t *iseq) static inline rb_iseq_t * iseq_imemo_alloc(void) { - return (rb_iseq_t *)rb_imemo_new(imemo_iseq, 0, 0, 0, 0); + rb_iseq_t *iseq = SHAREABLE_IMEMO_NEW(rb_iseq_t, imemo_iseq, 0); + + // Clear out the whole iseq except for the flags. + memset((char *)iseq + sizeof(VALUE), 0, sizeof(rb_iseq_t) - sizeof(VALUE)); + + return iseq; } VALUE rb_iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt); @@ -168,8 +191,12 @@ const rb_iseq_t *rb_iseq_ibf_load_bytes(const char *cstr, size_t); VALUE rb_iseq_ibf_load_extra_data(VALUE str); void rb_iseq_init_trace(rb_iseq_t *iseq); int rb_iseq_add_local_tracepoint_recursively(const rb_iseq_t *iseq, rb_event_flag_t turnon_events, VALUE tpval, unsigned int target_line, bool target_bmethod); -int rb_iseq_remove_local_tracepoint_recursively(const rb_iseq_t *iseq, VALUE tpval); +int rb_iseq_remove_local_tracepoint_recursively(const rb_iseq_t *iseq, VALUE tpval, rb_ractor_t *r); const rb_iseq_t *rb_iseq_load_iseq(VALUE fname); +const rb_iseq_t *rb_iseq_compile_iseq(VALUE str, VALUE fname); +int rb_iseq_opt_frozen_string_literal(void); +rb_hook_list_t *rb_iseq_local_hooks(const rb_iseq_t *iseq, rb_ractor_t *r, bool create); + #if VM_INSN_INFO_TABLE_IMPL == 2 unsigned int *rb_iseq_insns_info_decode_positions(const struct rb_iseq_constant_body *body); @@ -186,7 +213,7 @@ VALUE *rb_iseq_original_iseq(const rb_iseq_t *iseq); void rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE args, VALUE exception, VALUE body); -void rb_iseq_mark_insn_storage(struct iseq_compile_data_storage *arena); +void rb_iseq_mark_and_move_insn_storage(struct iseq_compile_data_storage *arena); VALUE rb_iseq_load(VALUE data, VALUE parent, VALUE opt); VALUE rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc); @@ -224,8 +251,7 @@ struct rb_compile_option_struct { unsigned int specialized_instruction: 1; unsigned int operands_unification: 1; unsigned int instructions_unification: 1; - unsigned int stack_caching: 1; - unsigned int frozen_string_literal: 1; + signed int frozen_string_literal: 2; /* -1: not specified, 0: false, 1: true */ unsigned int debug_frozen_string_literal: 1; unsigned int coverage_enabled: 1; int debug_level; @@ -270,10 +296,11 @@ struct iseq_catch_table_entry { unsigned int sp; }; -PACKED_STRUCT_UNALIGNED(struct iseq_catch_table { +RBIMPL_ATTR_PACKED_STRUCT_UNALIGNED_BEGIN() +struct iseq_catch_table { unsigned int size; struct iseq_catch_table_entry entries[FLEX_ARY_LEN]; -}); +} RBIMPL_ATTR_PACKED_STRUCT_UNALIGNED_END(); static inline int iseq_catch_table_bytes(int n) @@ -324,6 +351,10 @@ VALUE rb_iseq_defined_string(enum defined_type type); /* vm.c */ VALUE rb_iseq_local_variables(const rb_iseq_t *iseq); +attr_index_t rb_estimate_iv_count(VALUE klass, const rb_iseq_t * initialize_iseq); + +void rb_free_encoded_insn_data(void); + RUBY_SYMBOL_EXPORT_END #endif /* RUBY_ISEQ_H */ |