From 90b70738427567dc065ad75b32fa932b280c304a Mon Sep 17 00:00:00 2001
From: nari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 26 Mar 2014 04:57:47 +0000
Subject: * parse.y: support Symbol GC. [ruby-trunk Feature #9634]   See this
 ticket about Symbol GC.

* include/ruby/ruby.h:
  Declare few functions.
  * rb_sym2id: almost same as old SYM2ID but support dynamic symbols.
  * rb_id2sym: almost same as old ID2SYM but support dynamic symbols.
  * rb_sym2str: almost same as `rb_id2str(SYM2ID(sym))` but not
    pin down a dynamic symbol.
  Declare a new struct.
  * struct RSymbol: represents a dynamic symbol as object in
    Ruby's heaps.
  Add few macros.
  * STATIC_SYM_P: check a static symbol.
  * DYNAMIC_SYM_P: check a dynamic symbol.
  * RSYMBOL: cast to RSymbol

* gc.c: declare RSymbol. support T_SYMBOL.

* internal.h: Declare few functions.
  * rb_gc_free_dsymbol: free up a dynamic symbol. GC call this
    function at a sweep phase.
  * rb_str_dynamic_intern: convert a string to a dynamic symbol.
  * rb_check_id_without_pindown: not pinning function.
  * rb_sym2id_without_pindown: ditto.
  * rb_check_id_cstr_without_pindown: ditto.

* string.c (Init_String): String#intern and String#to_sym use
  rb_str_dynamic_intern.

* template/id.h.tmpl: use LSB of ID as a flag for determining a
  static symbol, so we shift left other ruby_id_types.

* string.c: use rb_sym2str instead `rb_id2str(SYM2ID(sym))` to
  avoid pinning.

* load.c: use xx_without_pindown function at creating temporary ID
  to avoid pinning.

* object.c: ditto.

* sprintf.c: ditto.

* struct.c: ditto.

* thread.c: ditto.

* variable.c: ditto.

* vm_method.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 template/id.h.tmpl | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'template/id.h.tmpl')

diff --git a/template/id.h.tmpl b/template/id.h.tmpl
index 9df7947214..0a480f438f 100644
--- a/template/id.h.tmpl
+++ b/template/id.h.tmpl
@@ -29,18 +29,20 @@ types = ids.keys.grep(/^[A-Z]/)
 #define RUBY_ID_H
 
 enum ruby_id_types {
+    RUBY_ID_STATIC_SYM  = 0x01,
     RUBY_ID_LOCAL       = 0x00,
-    RUBY_ID_INSTANCE    = 0x01,
-    RUBY_ID_GLOBAL      = 0x03,
-    RUBY_ID_ATTRSET     = 0x04,
-    RUBY_ID_CONST       = 0x05,
-    RUBY_ID_CLASS       = 0x06,
-    RUBY_ID_JUNK        = 0x07,
+    RUBY_ID_INSTANCE    = (0x01<<1),
+    RUBY_ID_GLOBAL      = (0x03<<1),
+    RUBY_ID_ATTRSET     = (0x04<<1),
+    RUBY_ID_CONST       = (0x05<<1),
+    RUBY_ID_CLASS       = (0x06<<1),
+    RUBY_ID_JUNK        = (0x07<<1),
     RUBY_ID_INTERNAL    = RUBY_ID_JUNK,
-    RUBY_ID_SCOPE_SHIFT = 3,
-    RUBY_ID_SCOPE_MASK  = ~(~0U<<RUBY_ID_SCOPE_SHIFT)
+    RUBY_ID_SCOPE_SHIFT = 4,
+    RUBY_ID_SCOPE_MASK  = (~(~0U<<(RUBY_ID_SCOPE_SHIFT-1))<<1)
 };
 
+#define ID_STATIC_SYM  RUBY_ID_STATIC_SYM
 #define ID_SCOPE_SHIFT RUBY_ID_SCOPE_SHIFT
 #define ID_SCOPE_MASK  RUBY_ID_SCOPE_MASK
 #define ID_LOCAL       RUBY_ID_LOCAL
@@ -99,7 +101,7 @@ enum ruby_method_ids {
 % types.each do |type|
 %   types = ids[type] or next
 %   types.empty? and next
-#define TOKEN2<%=type%>ID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_<%=type%>)
+#define TOKEN2<%=type%>ID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_<%=type%>|ID_STATIC_SYM)
 %   types.each do |token|
     TOKEN2<%=type%>ID(<%=token%>),
 %   end
-- 
cgit v1.2.1