From d3c05ae77c933257f874fe043b4e370a935c1ec3 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 Mar 2016 14:15:17 +0000
Subject: merge revision(s) 53514,53524: [Backport #11928]

	* iseq.c (iseqw_mark): as wrapped iseq is isolated from the call
	  stack, it needs to take care of its parent and ancestors, so
	  that they do not become orphans.  [ruby-core:72620] [Bug #11928]

	* iseq.c (rb_iseq_mark): mark parent iseq to prevent dynamically
	  generated iseq by eval from GC.  [ruby-core:72620] [Bug #11928]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/bug-11928.rb      | 14 ++++++++++++++
 test/ruby/test_exception.rb |  6 ++++++
 test/ruby/test_iseq.rb      | 27 +++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 test/ruby/bug-11928.rb

(limited to 'test/ruby')

diff --git a/test/ruby/bug-11928.rb b/test/ruby/bug-11928.rb
new file mode 100644
index 0000000000..72b3b0f8ed
--- /dev/null
+++ b/test/ruby/bug-11928.rb
@@ -0,0 +1,14 @@
+class Segfault
+  at_exit { Segfault.new.segfault }
+
+  define_method 'segfault' do
+    n = 11928
+    v = nil
+    i = 0
+    while i < n
+      i += 1
+      v = (foo rescue $!).local_variables
+    end
+    assert_equal(%i[i n v], v.sort)
+  end
+end
diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb
index 1148277a1b..91732dd062 100644
--- a/test/ruby/test_exception.rb
+++ b/test/ruby/test_exception.rb
@@ -701,6 +701,12 @@ end.join
     assert_equal(%i[a b c d e f g], e.local_variables.sort)
   end
 
+  def test_name_error_info_parent_iseq_mark
+    assert_separately(['-', File.join(__dir__, 'bug-11928.rb')], <<-'end;')
+      -> {require ARGV[0]}.call
+    end;
+  end
+
   def test_output_string_encoding
     # "\x82\xa0" in cp932 is "\u3042" (Japanese hiragana 'a')
     # change $stderr to force calling rb_io_write() instead of fwrite()
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index 4f7616a0db..7af8c1b11b 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -185,4 +185,31 @@ class TestISeq < Test::Unit::TestCase
     labels = body.select {|op, arg| op == :branchnil}.map {|op, arg| arg}
     assert_equal(1, labels.uniq.size)
   end
+
+  def test_parent_iseq_mark
+    assert_separately([], <<-'end;')
+      ->{
+        ->{
+          ->{
+            eval <<-EOS
+              class Segfault
+                define_method :segfault do
+                  x = nil
+                  GC.disable
+                  1000.times do |n|
+                    n.times do
+                      x = (foo rescue $!).local_variables
+                    end
+                    GC.start
+                  end
+                  x
+                end
+              end
+            EOS
+          }.call
+        }.call
+      }.call
+      at_exit { assert_equal([:n, :x], Segfault.new.segfault.sort) }
+    end;
+  end
 end
-- 
cgit v1.2.3