diff options
author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-07 04:58:38 +0000 |
---|---|---|
committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-07 04:58:38 +0000 |
commit | 113b1c76fc9ace9f12f83e5edc7d4dadcc708c17 (patch) | |
tree | 255700898ecb0a81ece8c9a37a8c5b7ccc13db69 | |
parent | 0a4801e768cd93c79666f32460306f132009aa9d (diff) | |
download | ruby-113b1c76fc9ace9f12f83e5edc7d4dadcc708c17.tar.gz |
* variable.c (classname): the name of class that has
non class id should not be nil. This bug was introduced
in r36577.
* test/thread/test_cv.rb: test for change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | test/thread/test_cv.rb | 5 | ||||
-rw-r--r-- | variable.c | 7 |
3 files changed, 18 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Sat Sep 7 13:49:40 2013 Kazuki Tsujimoto <kazuki@callcc.net> + + * variable.c (classname): the name of class that has + non class id should not be nil. This bug was introduced + in r36577. + + * test/thread/test_cv.rb: test for change. + Sat Sep 7 13:29:22 2013 Kazuki Tsujimoto <kazuki@callcc.net> * lib/find.rb (Find.find): respect the encodings of arguments. diff --git a/test/thread/test_cv.rb b/test/thread/test_cv.rb index eeec3b3ea5..9a9b407a5b 100644 --- a/test/thread/test_cv.rb +++ b/test/thread/test_cv.rb @@ -82,20 +82,23 @@ class TestConditionVariable < Test::Unit::TestCase end def test_condvar_wait_deadlock - assert_in_out_err([], <<-INPUT, ["No live threads left. Deadlock?"], []) + assert_in_out_err([], <<-INPUT, ["fatal", "No live threads left. Deadlock?"], []) require "thread" mutex = Mutex.new cv = ConditionVariable.new + klass = nil mesg = nil begin mutex.lock cv.wait mutex mutex.unlock rescue Exception => e + klass = e.class mesg = e.message end + puts klass print mesg INPUT end diff --git a/variable.c b/variable.c index b3d9b3f6e8..3b3189bddc 100644 --- a/variable.c +++ b/variable.c @@ -177,9 +177,14 @@ classname(VALUE klass, int *permanent) path = find_class_path(klass, (ID)0); } if (NIL_P(path)) { - if (!cid || !st_lookup(RCLASS_IV_TBL(klass), (st_data_t)tmp_classpath, &n)) { + if (!cid) { return Qnil; } + if (!st_lookup(RCLASS_IV_TBL(klass), (st_data_t)tmp_classpath, &n)) { + path = rb_str_dup(rb_id2str(cid)); + OBJ_FREEZE(path); + return path; + } *permanent = 0; path = (VALUE)n; return path; |