[前][次][番号順一覧][スレッド一覧]

ruby-changes:31655

From: ko1 <ko1@a...>
Date: Wed, 20 Nov 2013 17:41:02 +0900 (JST)
Subject: [ruby-changes:31655] ko1:r43734 (trunk): * parse.y (rb_gc_mark_symbols): set global_symbols.minor_marked only

ko1	2013-11-20 17:40:56 +0900 (Wed, 20 Nov 2013)

  New Revision: 43734

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43734

  Log:
    * parse.y (rb_gc_mark_symbols): set global_symbols.minor_marked only
      when full_mark is 0.
      rb_gc_mark_symbols() (with full_mark == 1) can be called by other
      than GC (such as rb_objspace_reachable_objects_from_root()).

  Modified files:
    trunk/ChangeLog
    trunk/parse.y
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43733)
+++ ChangeLog	(revision 43734)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Nov 20 17:34:13 2013  Koichi Sasada  <ko1@a...>
+
+	* parse.y (rb_gc_mark_symbols): set global_symbols.minor_marked only
+	  when full_mark is 0.
+	  rb_gc_mark_symbols() (with full_mark == 1) can be called by other
+	  than GC (such as rb_objspace_reachable_objects_from_root()).
+
 Wed Nov 20 11:46:38 2013  NARUSE, Yui  <naruse@r...>
 
 	* ext/json: merge JSON 1.8.1.
Index: parse.y
===================================================================
--- parse.y	(revision 43733)
+++ parse.y	(revision 43734)
@@ -10155,7 +10155,8 @@ rb_gc_mark_symbols(int full_mark) https://github.com/ruby/ruby/blob/trunk/parse.y#L10155
 	rb_mark_tbl(global_symbols.id_str);
 	rb_gc_mark_locations(global_symbols.op_sym,
 			     global_symbols.op_sym + numberof(global_symbols.op_sym));
-	global_symbols.minor_marked = 1;
+
+	if (!full_mark) global_symbols.minor_marked = 1;
     }
 }
 #endif /* !RIPPER */

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]