diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 04:19:33 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 04:19:33 +0000 |
| commit | 834e9bdf1c0f4d7bd85466fd4cc6b52f5bae7a3d (patch) | |
| tree | c101181cba914978b278be820642bd4fd86b2320 /vm_insnhelper.c | |
| parent | 8f21d253f5ed2b73c01318b3d8de25c4aff14569 (diff) | |
| download | ruby-834e9bdf1c0f4d7bd85466fd4cc6b52f5bae7a3d.tar.gz ruby-834e9bdf1c0f4d7bd85466fd4cc6b52f5bae7a3d.tar.xz ruby-834e9bdf1c0f4d7bd85466fd4cc6b52f5bae7a3d.zip | |
* vm_insnhelper.c (vm_method_search): return rb_cObject if there is no
super class. [ruby-dev:37587]
* bootstraptest/test_method.rb: add tests for above.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20981 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 13bd03dc6..b1fa08818 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1172,20 +1172,24 @@ vm_method_search(VALUE id, VALUE klass, IC ic) static inline VALUE vm_search_normal_superclass(VALUE klass, VALUE recv) { + VALUE sk = 0; + if (BUILTIN_TYPE(klass) == T_CLASS) { - klass = RCLASS_SUPER(klass); + sk = RCLASS_SUPER(klass); } else if (BUILTIN_TYPE(klass) == T_MODULE) { VALUE k = CLASS_OF(recv); while (k) { if (BUILTIN_TYPE(k) == T_ICLASS && RBASIC(k)->klass == klass) { - klass = RCLASS_SUPER(k); + sk = RCLASS_SUPER(k); break; } k = RCLASS_SUPER(k); } + sk = rb_cObject; } - return klass; + + return sk; } static void |