1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

string.c: mark frozen string

Browse Source 
* string.c (rb_fstring): because of lazy sweep, str may be unmaked
  already and swept at next time, so mark it for the time being.
  [ruby-core:57756]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-10-09 08:40:18 +00:00
parent b1b4724ea0
commit a28de81aec
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Oct 9 17:40:16 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_fstring): because of lazy sweep, str may be unmaked
already and swept at next time, so mark it for the time being.
[ruby-core:57756]
Wed Oct 9 13:53:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Oct 9 13:53:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compar.c (cmp_eq): fail if recursion. [ruby-core:57736] [Bug #9003] * compar.c (cmp_eq): fail if recursion. [ruby-core:57736] [Bug #9003]

3
string.c
View File

@ -146,6 +146,9 @@ rb_fstring(VALUE str)
st_data_t fstr; st_data_t fstr;
if (st_lookup(frozen_strings, (st_data_t)str, &fstr)) { if (st_lookup(frozen_strings, (st_data_t)str, &fstr)) {
str = (VALUE)fstr; str = (VALUE)fstr;
/* because of lazy sweep, str may be unmaked already and swept
* at next time */
rb_gc_mark(str);
} }
else { else {
str = rb_str_new_frozen(str); str = rb_str_new_frozen(str);