kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Revert "Fix dangling path name from fstring"

Browse source 
This reverts commit 5931857281 temporarily,
leaving `TestEval#test_gced_eval_location` to see the impact for missing
the changes.

That's because too many CIs are failing for `require` behaviors:
20190803T063004Z.fail.html.gz
20190803T051806Z.fail.html.gz
20190803T052406Z.fail.html.gz
20190803T111909Z.fail.html.gz
20190803T062506Z.fail.html.gz
20190803T052505Z.fail.html.gz
5d4512c921
5d4512c921
http://ci.rvm.jp/results/trunk_gcc4@silicon-docker/2177591
http://ci.rvm.jp/results/trunk_gcc6@silicon-docker/2177596
http://ci.rvm.jp/results/trunk_clang_60@silicon-docker/2178802
http://ci.rvm.jp/results/trunk-theap-asserts@silicon-docker/2177555
http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/2178747

Mostly `TestRequire#test_race_exception` failures, but in ci.rvm.jp
`require` inside rubyspec hangs very often.
This commit is contained in:
Takashi Kokubun 2019-08-04 08:38:37 +09:00
parent 7adc8c79ea
commit 326c00b6f8
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
parse.y
View file

@ -5812,7 +5812,7 @@ yycompile(VALUE vparser, struct parser_params *p, VALUE fname, int line)
p->ruby_sourcefile = "(none)";
}
else {
p->ruby_sourcefile_string = rb_fstring(fname);
p->ruby_sourcefile_string = rb_str_new_frozen(fname);
p->ruby_sourcefile = StringValueCStr(fname);
}
p->ruby_sourceline = line - 1;
@ -9773,7 +9773,7 @@ gettable(struct parser_params *p, ID id, const YYLTYPE *loc)
if (NIL_P(file))
file = rb_str_new(0, 0);
else
file = rb_str_dup(file);
file = rb_str_dup(rb_fstring(file));
node = NEW_STR(add_mark_object(p, file), loc);
}
return node;

3
vm_eval.c
View file

@ -1284,7 +1284,6 @@ eval_make_iseq(VALUE src, VALUE fname, int line, const rb_binding_t *bind,
}
if (fname != Qundef) {
if (!NIL_P(fname)) fname = rb_fstring(fname);
realpath = fname;
}
else if (bind) {
@ -1294,7 +1293,7 @@ eval_make_iseq(VALUE src, VALUE fname, int line, const rb_binding_t *bind,
rb_parser_warn_location(parser, TRUE);
}
else {
fname = rb_fstring_lit("(eval)");
fname = rb_usascii_str_new_cstr("(eval)");
}
rb_parser_set_context(parser, base_block, FALSE);