diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-21 16:09:59 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-21 16:09:59 +0000 |
| commit | 4b0a168d7b82d7b9e50f61fe8d7a336dc8d84316 (patch) | |
| tree | 9161530dc3e6a44a168286bfd8165682f49c491c /ChangeLog | |
| parent | 83c5b533e36761141ed4dbd9db28e74520cb0ffd (diff) | |
merge revision(s) r48744,r48752: [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_1@49369 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 @@ +Thu Jan 22 01:02:16 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] + +Thu Jan 22 01:02:16 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] + Thu Jan 22 00:54:00 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (symbol_list): fix the node type of literal symbol list |