merge revision(s) 5026f9a5d5012248729a0052cd6cec811748291b: [Backport #17868]

	compile.c: stop the jump-jump optimization if the second has any
	 event

	Fixes [Bug #17868]
	---
	 compile.c                      |  3 ++-
	 test/ruby/test_settracefunc.rb | 15 +++++++++++++++
	 2 files changed, 17 insertions(+), 1 deletion(-)

1 files changed, 15 insertions, 0 deletions

diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index 7821a221dc..b0ac1e6536 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -2324,4 +2324,19 @@ class TestSetTraceFunc < Test::Unit::TestCase
     EOS
     assert_equal [:return, :unpack], event
   end
+
+  def test_while_in_while
+    lines = []
+
+    TracePoint.new(:line){|tp|
+      next unless target_thread?
+      lines << tp.lineno
+    }.enable{
+      n = 3
+      while n > 0
+        n -= 1 while n > 0
+      end
+    }
+    assert_equal [__LINE__ - 5, __LINE__ - 4, __LINE__ - 3], lines, 'Bug #17868'
+  end
 end