summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--load.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f5c5426..99c8954 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 9 21:43:32 2013 Masaki Matsushita <glass.saga@gmail.com>
+
+ * load.c (load_lock): revert r38744. it should acquire new thread
+ shield.
+
Wed Jan 9 15:40:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (th_init, ruby_thread_init): initialize root_svar with Qnil,
diff --git a/load.c b/load.c
index 147307d..70e3ee8 100644
--- a/load.c
+++ b/load.c
@@ -668,6 +668,9 @@ load_lock(const char *ftptr)
}
switch (rb_thread_shield_wait((VALUE)data)) {
case Qfalse:
+ data = (st_data_t)ftptr;
+ st_delete(loading_tbl, &data, 0);
+ return 0;
case Qnil:
return 0;
}