2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 107cd8021a..442995e60f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  3 11:25:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (load_lock): warn for circular require.  [ruby-core:20794],
+	  [ruby-core:20797]
+
 Tue Feb  3 08:35:12 2009  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/lib/socket.rb (Socket.tcp_server_sockets): extracted from
diff --git a/load.c b/load.c
index 8e533771f1..f642019053 100644
--- a/load.c
+++ b/load.c
@@ -379,6 +379,7 @@ load_lock(const char *ftptr)
 	st_insert(loading_tbl, (st_data_t)ftptr, data);
 	return (char *)ftptr;
     }
+    rb_warning("loading in progress, circular require considered harmful - %s", ftptr);
     return RTEST(rb_barrier_wait((VALUE)data)) ? (char *)ftptr : 0;
 }