diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-14 07:04:09 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-14 07:04:09 +0000 |
| commit | 9120d051e14a69d3c1e439d65d85a4a8060d62fb (patch) | |
| tree | 1263a58684cbdedf82ed343a11b7bae00f441881 /ChangeLog | |
| parent | e6a5f817d613dbd40cf2d19cd0705a1b4c377538 (diff) | |
merge revision(s) 48744,48752: [Backport #10579]
* eval.c (rb_frame_last_func): return the most recent frame method
name.
* thread.c (recursive_list_access): use the last method name,
instead of the current method name which can be unset in some
cases, not to use a symbol by the invalid ID.
[ruby-core:66742] [Bug #10579]
* thread.c (exec_recursive): use the same last method name as
recursive_push in the error message when recursive_pop failed.
[ruby-core:66742] [Bug #10579]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -1,3 +1,19 @@ +Wed Jan 14 15:57:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * thread.c (exec_recursive): use the same last method name as + recursive_push in the error message when recursive_pop failed. + [ruby-core:66742] [Bug #10579] + +Wed Jan 14 15:57:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (rb_frame_last_func): return the most recent frame method + name. + + * thread.c (recursive_list_access): use the last method name, + instead of the current method name which can be unset in some + cases, not to use a symbol by the invalid ID. + [ruby-core:66742] [Bug #10579] + Wed Jan 14 15:54:18 2015 Aaron Patterson <aaron@tenderlovemaking.com> * lib/resolv.rb: fall back if canonicalization fails. |