diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:57:05 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:57:05 +0000 |
| commit | 78e7472cad31f597134d9fa28c8992d450b47f43 (patch) | |
| tree | 29f363ceb87c33057062ac3064457d3bb2ab31a0 /vm_insnhelper.c | |
| parent | dcc293e053ee845446396b85950fd95cf62bbcb3 (diff) | |
merges r20981 and r20985 from trunk into ruby_1_9_1.
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21034 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 1a8d3df6ec..71a673e37e 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1173,19 +1173,21 @@ static inline VALUE vm_search_normal_superclass(VALUE klass, VALUE recv) { if (BUILTIN_TYPE(klass) == T_CLASS) { - klass = RCLASS_SUPER(klass); + return 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); - break; + return RCLASS_SUPER(k); } k = RCLASS_SUPER(k); } + return rb_cObject; + } + else { + rb_bug("vm_search_normal_superclass: should not be reach here"); } - return klass; } static void |