From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 23 Jul 2005 19:14:59 +0000 (+0000)
Subject: (MAYBE_GC): Test gc_cons_threshold and gc_relative_threshold, one by one.
X-Git-Tag: emacs-pretest-22.0.90~7893
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3414f2d82b82cd71dba20c11289204716127c16f;p=emacs.git

(MAYBE_GC): Test gc_cons_threshold and gc_relative_threshold, one by one.
---

diff --git a/src/bytecode.c b/src/bytecode.c
index ee89e9e8d7b..3069e0a6ac3 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -355,13 +355,14 @@ unmark_byte_stack ()
 /* Garbage collect if we have consed enough since the last time.
    We do this at every branch, to avoid loops that never GC.  */
 
-#define MAYBE_GC()				     \
-  if (consing_since_gc > gc_cons_combined_threshold) \
-    {						     \
-      BEFORE_POTENTIAL_GC ();			     \
-      Fgarbage_collect ();			     \
-      AFTER_POTENTIAL_GC ();			     \
-    }						     \
+#define MAYBE_GC()					\
+  if (consing_since_gc > gc_cons_threshold		\
+      && consing_since_gc > gc_relative_threshold)	\
+    {							\
+      BEFORE_POTENTIAL_GC ();				\
+      Fgarbage_collect ();				\
+      AFTER_POTENTIAL_GC ();				\
+    }							\
   else
 
 /* Check for jumping out of range.  */