From f7ab09063563af0fca366ba39e7ff21b5231b005 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 9 Aug 2015 05:15:57 +0000 Subject: vm.c: frozen_strings in rb_vm_t * vm.c (Init_vm_objects, rb_vm_fstring_table): use frozen_strings table in rb_vm_t. [ruby-core:70274] [Bug #11423] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 99799978cb..57ab6daaf5 100644 --- a/string.c +++ b/string.c @@ -216,17 +216,11 @@ mustnot_wchar(VALUE str) static int fstring_cmp(VALUE a, VALUE b); -/* in case we restart MVM development, this needs to be per-VM */ -static st_table* frozen_strings; static VALUE register_fstring(VALUE str); -static inline st_table* -rb_vm_fstring_table(void) -{ - return frozen_strings; -} +st_table *rb_vm_fstring_table(void); -static const struct st_hash_type fstring_hash_type = { +const struct st_hash_type rb_fstring_hash_type = { fstring_cmp, rb_str_hash, }; @@ -308,10 +302,11 @@ static VALUE register_fstring(VALUE str) { VALUE ret; + st_table *frozen_strings = rb_vm_fstring_table(); do { ret = str; - st_update(rb_vm_fstring_table(), (st_data_t)str, + st_update(frozen_strings, (st_data_t)str, fstr_update_callback, (st_data_t)&ret); } while (ret == Qundef); @@ -9327,10 +9322,3 @@ Init_String(void) assert(rb_vm_fstring_table()); st_foreach(rb_vm_fstring_table(), fstring_set_class_i, rb_cString); } - -void -Init_frozen_strings(void) -{ - assert(!frozen_strings); - frozen_strings = st_init_table_with_size(&fstring_hash_type, 1000); -} -- cgit v1.2.3