archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 41389: [Backport #8540]

Browse source 
* vm_insnhelper.c (vm_call_method): ensure methods of type
	  VM_METHOD_TYPE_ATTR_SET are called with 1 argument

	* test/ruby/test_module.rb (class TestModule): add test
	[ruby-core:55543] [Bug #8540]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41395 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-06-18 19:40:13 +00:00
parent 12f4488c58
commit f56c0c0631
4 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Wed Jun 19 04:20:31 2013 Charlie Somerville <charliesome@ruby-lang.org>
* vm_insnhelper.c (vm_call_method): ensure methods of type
VM_METHOD_TYPE_ATTR_SET are called with 1 argument
* test/ruby/test_module.rb (class TestModule): add test
[ruby-core:55543] [Bug #8540]
Wed Jun 19 03:54:04 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jun 19 03:54:04 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* defs/id.def (predefined): add "idProc". * defs/id.def (predefined): add "idProc".

8
test/ruby/test_module.rb
View file

@ -1165,6 +1165,14 @@ class TestModule < Test::Unit::TestCase
assert_equal(1, c.x, bug3406) assert_equal(1, c.x, bug3406)
end end
def test_attr_writer_with_no_arguments
bug8540 = "[ruby-core:55543]"
c = Class.new do
attr_writer :foo
end
assert_raise(ArgumentError) { c.new.send :foo= }
end
def test_private_constant def test_private_constant
c = Class.new c = Class.new
c.const_set(:FOO, "foo") c.const_set(:FOO, "foo")

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-06-19" #define RUBY_RELEASE_DATE "2013-06-19"
#define RUBY_PATCHLEVEL 232 #define RUBY_PATCHLEVEL 233
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6

2
vm_insnhelper.c
View file

@ -1750,7 +1750,7 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
CI_SET_FASTPATH(ci, vm_call_cfunc, enable_fastpath); CI_SET_FASTPATH(ci, vm_call_cfunc, enable_fastpath);
return vm_call_cfunc(th, cfp, ci); return vm_call_cfunc(th, cfp, ci);
case VM_METHOD_TYPE_ATTRSET:{ case VM_METHOD_TYPE_ATTRSET:{
rb_check_arity(ci->argc, 0, 1); rb_check_arity(ci->argc, 1, 1);
ci->aux.index = 0; ci->aux.index = 0;
CI_SET_FASTPATH(ci, vm_call_attrset, enable_fastpath && !(ci->flag & VM_CALL_ARGS_SPLAT)); CI_SET_FASTPATH(ci, vm_call_attrset, enable_fastpath && !(ci->flag & VM_CALL_ARGS_SPLAT));
return vm_call_attrset(th, cfp, ci); return vm_call_attrset(th, cfp, ci);