From a28de81aec2cb6af9199891f2fba17efc6f1ebc8 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 9 Oct 2013 08:40:18 +0000 Subject: [PATCH] string.c: mark frozen string * 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 --- ChangeLog | 6 ++++++ string.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0e05b9e058..25382d68bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Oct 9 17:40:16 2013 Nobuyoshi Nakada + + * 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 * compar.c (cmp_eq): fail if recursion. [ruby-core:57736] [Bug #9003] diff --git a/string.c b/string.c index 7bf4006fdf..6512fe4092 100644 --- a/string.c +++ b/string.c @@ -146,6 +146,9 @@ rb_fstring(VALUE str) st_data_t fstr; if (st_lookup(frozen_strings, (st_data_t)str, &fstr)) { str = (VALUE)fstr; + /* because of lazy sweep, str may be unmaked already and swept + * at next time */ + rb_gc_mark(str); } else { str = rb_str_new_frozen(str);