kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* vm_method.c (rb_undef): raise a NameError if the original method

Browse source 
of a refined method is not defined.

* vm_insnhelper.c (rb_method_entry_eq): added NULL check to avoid SEGV.

* test/ruby/test_refinement.rb: related test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2013-09-30 01:49:21 +00:00
parent 7eca2a43b9
commit 59f5fa102a
3 changed files with 58 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Mon Sep 30 10:40:20 2013 Shugo Maeda <shugo@ruby-lang.org>
* vm_method.c (rb_undef): raise a NameError if the original method
of a refined method is not defined.
* vm_insnhelper.c (rb_method_entry_eq): added NULL check to avoid SEGV.
* test/ruby/test_refinement.rb: related test.
Sun Sep 29 23:45:42 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Sep 29 23:45:42 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (rb_id_attrset, intern_str): allow junk attrset ID for * parse.y (rb_id_attrset, intern_str): allow junk attrset ID for

44
test/ruby/test_refinement.rb
View file

@ -1016,6 +1016,50 @@ class TestRefinement < Test::Unit::TestCase
assert_not_send([FooSub, :method_defined?, :z]) assert_not_send([FooSub, :method_defined?, :z])
end end
def test_undef_refined_method
bug8966 = '[ruby-core:57466] [Bug #8966]'
assert_in_out_err([], <<-INPUT, ["NameError"], [], bug8966)
module Foo
refine Object do
def foo
puts "foo"
end
end
end
using Foo
class Object
begin
undef foo
rescue Exception => e
p e.class
end
end
INPUT
assert_in_out_err([], <<-INPUT, ["NameError"], [], bug8966)
module Foo
refine Object do
def foo
puts "foo"
end
end
end
# without `using Foo'
class Object
begin
undef foo
rescue Exception => e
p e.class
end
end
INPUT
end
private private
def eval_using(mod, s) def eval_using(mod, s)

8
vm_method.c
View file

@ -868,7 +868,9 @@ rb_undef(VALUE klass, ID id)
me = search_method(klass, id, 0); me = search_method(klass, id, 0);
if (UNDEFINED_METHOD_ENTRY_P(me)) { if (UNDEFINED_METHOD_ENTRY_P(me) ||
(me->def->type == VM_METHOD_TYPE_REFINED &&
UNDEFINED_METHOD_ENTRY_P(me->def->body.orig_me))) {
const char *s0 = " class"; const char *s0 = " class";
VALUE c = klass; VALUE c = klass;
@ -1118,9 +1120,9 @@ rb_method_entry_eq(const rb_method_entry_t *m1, const rb_method_entry_t *m2)
static int static int
rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_definition_t *d2) rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_definition_t *d2)
{ {
if (d1 && d1->type == VM_METHOD_TYPE_REFINED) if (d1 && d1->type == VM_METHOD_TYPE_REFINED && d1->body.orig_me)
d1 = d1->body.orig_me->def; d1 = d1->body.orig_me->def;
if (d2 && d2->type == VM_METHOD_TYPE_REFINED) if (d2 && d2->type == VM_METHOD_TYPE_REFINED && d2->body.orig_me)
d2 = d2->body.orig_me->def; d2 = d2->body.orig_me->def;
if (d1 == d2) return 1; if (d1 == d2) return 1;
if (!d1 || !d2) return 0; if (!d1 || !d2) return 0;