Wrong line numbers inside set_trace_func for end events

[ivoanjo]

Somewhat as a continuation of #4051 there are still some wrong line numbers passed to set_trace_func and in backtraces generated inside of it.

Environment

Running jruby 9.1.3.0-SNAPSHOT (2.3.0) 2016-08-06 3ba469b OpenJDK 64-Bit Server VM 25.91-b14 on 1.8.0_91-8u91-b14-3ubuntu1~15.10.1-b14 [linux-x86_64] (latest master, 3ba469b) on Ubuntu 15.10.

Expected Behavior

Example code:

set_trace_func proc { |type, _, line, *stuff|
  puts "Event #{type} @ #{line}, caller: #{caller.first}" if type == 'end'
}

module Foo
  class Bar
  end
end

Output in MRI 2.3.1:

Event end @ 7, caller: test.rb:7:in `<class:Bar>'
Event end @ 8, caller: test.rb:8:in `<module:Foo>'

Actual Behavior

Output in JRuby:

Event end @ 7, caller: test.rb:6:in `<class:Bar>'
Event end @ 7, caller: test.rb:6:in `<module:Foo>'

You'll notice that neither the lines supplied to caller nor the ones to set_trace_func are correct in this case.