archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 09:04:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 51427: [Backport #10969]

Browse source 
* vm_eval.c (send_internal): set method_missing_reason before
	  invoking overriding method_missing method so that the default
	  method_missing can achieve it properly.
	  [ruby-core:68515] [Bug #10969]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52771 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-11-27 21:09:19 +00:00
parent a6eea9be6e
commit 40e0921a17
4 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sat Nov 28 05:50:58 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (send_internal): set method_missing_reason before
invoking overriding method_missing method so that the default
method_missing can achieve it properly.
[ruby-core:68515] [Bug #10969]
Sat Nov 28 05:47:27 2015 Rei Odaira <Rei.Odaira@gmail.com> Sat Nov 28 05:47:27 2015 Rei Odaira <Rei.Odaira@gmail.com>
* test/ruby/test_symbol.rb (test_symbol_fstr_leak): add a warm-up * test/ruby/test_symbol.rb (test_symbol_fstr_leak): add a warm-up

7
test/ruby/test_exception.rb
View file

@ -698,4 +698,11 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status|
raise E raise E
end; end;
end end
def test_method_missing_reason_clear
bug10969 = '[ruby-core:68515] [Bug #10969]'
a = Class.new {def method_missing(*) super end}.new
assert_raise(NameError) {a.instance_eval("foo")}
assert_raise(NoMethodError, bug10969) {a.public_send("bar", true)}
end
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.4" #define RUBY_VERSION "2.2.4"
#define RUBY_RELEASE_DATE "2015-11-28" #define RUBY_RELEASE_DATE "2015-11-28"
#define RUBY_PATCHLEVEL 203 #define RUBY_PATCHLEVEL 204
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 11 #define RUBY_RELEASE_MONTH 11

1
vm_eval.c
View file

@ -926,6 +926,7 @@ send_internal(int argc, const VALUE *argv, VALUE recv, call_type scope)
} }
} }
id = idMethodMissing; id = idMethodMissing;
th->method_missing_reason = 0;
} }
else { else {
argv++; argc--; argv++; argc--;