diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-18 16:13:53 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-18 16:13:53 +0000 |
| commit | f79eaf199cc5c5ff1cc5c7774cab13af2a05a18e (patch) | |
| tree | 089025c87c1ba5668700fce1429d5303e237d106 /ChangeLog | |
| parent | 478cdf49d7fcca58de301637dba598d2da69ef3e (diff) | |
merge revision(s) 51292,51439,51440: [Backport #11404] [Backport #11481]
* load.c (rb_load_internal0): do not raise any exceptions but
return the result tag state.
* load.c (rb_load_protect): reduce nested EXEC_TAGs.
* load.c (rb_load_internal0): extra check before returning
TAG_RAISE when a non-local transfer of control happens while
loading and parsing a Ruby source file.
[ruby-core:70169] [Bug #11404]
* load.c (rb_load_internal0): stop separating exits at loading
from exits from execution. TAG_FATAL is the only case that
`errinfo` is a Fixnum, and should continue to exit by JUMP_TAG
but not raising as an ordinary exception.
[ruby-core:70169] [Bug #11404]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 22 |
1 files changed, 22 insertions, 0 deletions
@@ -1,3 +1,25 @@ +Thu Nov 19 01:06:07 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * load.c (rb_load_internal0): stop separating exits at loading + from exits from execution. TAG_FATAL is the only case that + `errinfo` is a Fixnum, and should continue to exit by JUMP_TAG + but not raising as an ordinary exception. + [ruby-core:70169] [Bug #11404] + +Thu Nov 19 01:06:07 2015 Alex Dowad <alexinbeijing@gmail.com> + + * load.c (rb_load_internal0): extra check before returning + TAG_RAISE when a non-local transfer of control happens while + loading and parsing a Ruby source file. + [ruby-core:70169] [Bug #11404] + +Thu Nov 19 01:06:07 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * load.c (rb_load_internal0): do not raise any exceptions but + return the result tag state. + + * load.c (rb_load_protect): reduce nested EXEC_TAGs. + Thu Nov 19 00:41:09 2015 NARUSE, Yui <naruse@ruby-lang.org> * enc/euc_jp.c (mbc_case_fold): check given string is valid or not, |