diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-02 08:07:15 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-02 08:07:15 +0000 |
| commit | db2f9b17e338e6f575310a064e9dd2dafbd93bff (patch) | |
| tree | 360aa438e4af524563d42f2805cd6b43fb31812c | |
| parent | 045c0422acf688ac4702edf85533332c75d14280 (diff) | |
merges r21925 from trunk into ruby_1_9_1.
* variable.c (rb_const_get_0), vm_insnhelper.c (vm_get_ev_const):
avoids infinite self recursion autoload. [ruby-core:21696]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bootstraptest/test_autoload.rb | 8 | ||||
| -rw-r--r-- | variable.c | 3 | ||||
| -rw-r--r-- | vm_insnhelper.c | 3 |
4 files changed, 19 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sun Feb 1 05:19:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * variable.c (rb_const_get_0), vm_insnhelper.c (vm_get_ev_const): + avoids infinite self recursion autoload. [ruby-core:21696] + Fri Jan 30 14:31:14 2009 NAKAMURA Usaku <usa@ruby-lang.org> * tool/make-snapshot (prereq): remove enc.mk from tarball because diff --git a/bootstraptest/test_autoload.rb b/bootstraptest/test_autoload.rb index 048256170e..395153f438 100644 --- a/bootstraptest/test_autoload.rb +++ b/bootstraptest/test_autoload.rb @@ -59,3 +59,11 @@ assert_equal 'okok', %q{ [t1.value, t2.value].join } +assert_finish 5, %q{ + autoload :ZZZ, File.expand_path(__FILE__) + begin + ZZZ + rescue NameError + end +}, '[ruby-core:21696]' + diff --git a/variable.c b/variable.c index 0cc87d7fd3..b920c6797d 100644 --- a/variable.c +++ b/variable.c @@ -1470,8 +1470,11 @@ rb_const_get_0(VALUE klass, ID id, int exclude, int recurse) tmp = klass; retry: while (RTEST(tmp)) { + VALUE am = 0; while (RCLASS_IV_TBL(tmp) && st_lookup(RCLASS_IV_TBL(tmp),id,&value)) { if (value == Qundef) { + if (am == tmp) break; + am = tmp; rb_autoload_load(tmp, id); continue; } diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 7b4fd37979..0e54dddc59 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1082,10 +1082,13 @@ vm_get_ev_const(rb_thread_t *th, const rb_iseq_t *iseq, cref = cref->nd_next; if (!NIL_P(klass)) { + VALUE am = 0; search_continue: if (RCLASS_IV_TBL(klass) && st_lookup(RCLASS_IV_TBL(klass), id, &val)) { if (val == Qundef) { + if (am == klass) break; + am = klass; rb_autoload_load(klass, id); goto search_continue; } |