Skip to content
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.

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

[PRISM] Make file path and script name distinct #9655

Merged
merged 3 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions iseq.c
Original file line number Diff line number Diff line change
Expand Up @@ -1475,12 +1475,12 @@ iseqw_s_compile_prism(int argc, VALUE *argv, VALUE self)

pm_parser_t parser;

VALUE file_path = Qnil;
pm_string_t input;
if (RB_TYPE_P(src, T_FILE)) {
FilePathValue(src);
file = rb_fstring(src); /* rb_io_t->pathv gets frozen anyways */
file_path = rb_io_path(src); /* rb_io_t->pathv gets frozen anyways */

pm_string_mapped_init(&input, RSTRING_PTR(file));
pm_string_mapped_init(&input, RSTRING_PTR(file_path));
}
else {
Check_Type(src, T_STRING);
Expand All @@ -1493,6 +1493,7 @@ iseqw_s_compile_prism(int argc, VALUE *argv, VALUE self)

rb_iseq_t *iseq = iseq_alloc();
iseqw_s_compile_prism_compile(&parser, opt, iseq, file, path, start_line);
RB_GC_GUARD(file_path);
pm_parser_free(&parser);
pm_options_free(&options);
pm_string_free(&input);
Expand Down Expand Up @@ -1533,7 +1534,7 @@ iseqw_s_compile_file_prism(int argc, VALUE *argv, VALUE self)
}

rb_iseq_t *
rb_iseq_new_main_prism(pm_string_t *input, pm_options_t *options, VALUE path, VALUE optimize)
rb_iseq_new_main_prism(pm_string_t *input, pm_options_t *options, VALUE script_name, VALUE path, VALUE optimize)
{
pm_parser_t parser;
pm_parser_init(&parser, pm_string_source(input), pm_string_length(input), options);
Expand All @@ -1543,7 +1544,7 @@ rb_iseq_new_main_prism(pm_string_t *input, pm_options_t *options, VALUE path, VA
pm_options_line_set(options, start_line);

rb_iseq_t *iseq = iseq_alloc();
iseqw_s_compile_prism_compile(&parser, optimize, iseq, path, path, start_line);
iseqw_s_compile_prism_compile(&parser, optimize, iseq, script_name, path, start_line);

pm_parser_free(&parser);
return iseq;
Expand Down
2 changes: 1 addition & 1 deletion iseq.h
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ 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);
const rb_iseq_t *rb_iseq_load_iseq(VALUE fname);
rb_iseq_t * rb_iseq_new_main_prism(pm_string_t *input, pm_options_t *options, VALUE path, VALUE optimize);
rb_iseq_t * rb_iseq_new_main_prism(pm_string_t *input, pm_options_t *options, VALUE script_name, VALUE path, VALUE optimize);

#if VM_INSN_INFO_TABLE_IMPL == 2
unsigned int *rb_iseq_insns_info_decode_positions(const struct rb_iseq_constant_body *body);
Expand Down
2 changes: 1 addition & 1 deletion load.c
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ load_iseq_eval(rb_execution_context_t *ec, VALUE fname)
pm_parser_t parser;
pm_parser_init(&parser, pm_string_source(&input), pm_string_length(&input), &options);

iseq = rb_iseq_new_main_prism(&input, &options, fname, Qnil);
iseq = rb_iseq_new_main_prism(&input, &options, fname, fname, Qnil);

pm_string_free(&input);
pm_options_free(&options);
Expand Down
2 changes: 1 addition & 1 deletion ruby.c
Original file line number Diff line number Diff line change
Expand Up @@ -2428,7 +2428,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
}

VALUE optimize = dump & DUMP_BIT(insns_without_opt) ? Qfalse : Qnil;
iseq = rb_iseq_new_main_prism(&input, &options, path, optimize);
iseq = rb_iseq_new_main_prism(&input, &options, opt->script_name, path, optimize);
ruby_opt_init(opt);

pm_string_free(&input);
Expand Down
4 changes: 2 additions & 2 deletions tool/prism_btests
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
../src/bootstraptest/test_yjit_30k_methods.rb
../src/bootstraptest/test_yjit_rust_port.rb
../src/bootstraptest/test_exception.rb
# ../src/bootstraptest/test_insns.rb
../src/bootstraptest/test_insns.rb
../src/bootstraptest/test_ractor.rb
# ../src/bootstraptest/test_method.rb
# ../src/bootstraptest/test_ractor.rb
# ../src/bootstraptest/test_yjit.rb