* parse.y (symbols_i): delete garbage symbols for Symbol.all_symbols.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46763 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 15 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d249cc1e7..630a61619b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul  9 12:21:55 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (symbols_i): delete garbage symbols for Symbol.all_symbols.
+
 Wed Jul  9 05:49:08 2014  Eric Wong  <e@80x24.org>
 
 	* thread_pthread.h (struct rb_global_vm_lock_struct):
diff --git a/parse.y b/parse.y
index 79c9e342d9..7b47522583 100644
--- a/parse.y
+++ b/parse.y
@@ -10891,11 +10891,18 @@ static int
 symbols_i(VALUE key, ID value, VALUE ary)
 {
     VALUE sym = ID2SYM(value);
-    if (ID_DYNAMIC_SYM_P(value)) {
-	sym = dsymbol_check(sym);
+
+    if (DYNAMIC_SYM_P(sym) && !SYMBOL_PINNED_P(sym) && rb_objspace_garbage_object_p(sym)) {
+	st_data_t sym_data = (st_data_t)sym;
+	st_delete(global_symbols.id_str, &sym_data, NULL);
+	RSYMBOL(sym)->fstr = 0;
+	return ST_DELETE;
     }
-    rb_ary_push(ary, sym);
-    return ST_CONTINUE;
+    else {
+	rb_ary_push(ary, sym);
+	return ST_CONTINUE;
+    }
+
 }
 
 /*
@@ -10918,7 +10925,6 @@ VALUE
 rb_sym_all_symbols(void)
 {
     VALUE ary = rb_ary_new2(global_symbols.str_id->num_entries);
-
     st_foreach(global_symbols.str_id, symbols_i, ary);
     return ary;
 }