From 16e804117ca644a2ab14ba639d9d0313ba64de87 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 13 Mar 2017 09:12:05 +0000
Subject: string.c: $; is a GC-root

* string.c (Init_String): $; must be a GC-root, not to be
  collected.  [ruby-core:79582]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 string.c                 |  1 +
 test/ruby/test_string.rb | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/string.c b/string.c
index 4901c38d51..ceab6ea42d 100644
--- a/string.c
+++ b/string.c
@@ -10191,6 +10191,7 @@ Init_String(void)
     rb_fs = Qnil;
     rb_define_hooked_variable("$;", &rb_fs, 0, rb_fs_setter);
     rb_define_hooked_variable("$-F", &rb_fs, 0, rb_fs_setter);
+    rb_gc_register_address(&rb_fs);
 
     rb_cSymbol = rb_define_class("Symbol", rb_cObject);
     rb_include_module(rb_cSymbol, rb_mComparable);
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index 39cfc9a220..7dbf27e552 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -1451,6 +1451,17 @@ CODE
     assert_raise_with_message(TypeError, /\$;/) {
       $; = []
     }
+
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    bug = '[ruby-core:79582] $; must not be GCed'
+    begin;
+      $; = " "
+      $a = nil
+      alias $; $a
+      alias $-F $a
+      GC.start
+      assert_equal([], "".split, bug)
+    end;
   end
 
   def test_split_encoding
-- 
cgit v1.2.3