matz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 28 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index c2e73e4e38..53c5355c6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Mon Nov 20 13:45:21 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* gc.c (gc_sweep): defer finalization in GC during compilation or
+	  interrupt prohibit section.
+
+	* gc.c (gc_sweep): mark all nodes before sweeping if GC happened
+	  during compilation.
+
 	* eval.c (rb_eval): should treat class variables specially in a
 	  method defined in the singleton class.
 
diff --git a/gc.c b/gc.c
index ac05c11c22..8af89c922d 100644
--- a/gc.c
+++ b/gc.c
@@ -235,6 +235,7 @@ typedef struct RVALUE {
 } RVALUE;
 
 static RVALUE *freelist = 0;
+static RVALUE *deferred_final_list = 0;
 
 #define HEAPS_INCREMENT 10
 static RVALUE **heaps;
@@ -659,8 +660,21 @@ gc_sweep()
     int freed = 0;
     int i, used = heaps_used;
 
+    if (ruby_in_compile) {
+	/* sould not reclaim nodes during compilation */
+	for (i = 0; i < used; i++) {
+	    p = heaps[i]; pend = p + HEAP_SLOTS;
+	    while (p < pend) {
+		if (!(p->as.basic.flags&FL_MARK) && BUILTIN_TYPE(p) == T_NODE)
+		    rb_gc_mark(p);
+		p++;
+	    }
+	}
+    }
+
     freelist = 0;
-    final_list = 0;
+    final_list = deferred_final_list;
+    deferred_final_list = 0;
     for (i = 0; i < used; i++) {
 	int n = 0;
 
@@ -699,9 +713,14 @@ gc_sweep()
     during_gc = 0;
 
     /* clear finalization list */
-    if (need_call_final) {
+    if (need_call_final && final_list) {
 	RVALUE *tmp;
 
+	if (rb_prohibit_interrupt || ruby_in_compile) {
+	    deferred_final_list = final_list;
+	    return;
+	}
+
 	for (p = final_list; p; p = tmp) {
 	    tmp = p->as.free.next;
 	    run_final((VALUE)p);
@@ -914,7 +933,7 @@ rb_gc()
 # define STACK_END (stack_end)
 #endif
 
-    if (dont_gc || during_gc || rb_prohibit_interrupt || ruby_in_compile) {
+    if (dont_gc || during_gc) {
 	if (!freelist || malloc_memories > GC_MALLOC_LIMIT) {
 	    malloc_memories = 0;
 	    add_heap();