From a8409c5f523cd500b20c79130df560cdb25fbc52 Mon Sep 17 00:00:00 2001
From: vsc <vsc@b08c6af1-5177-4d33-ba66-4b1c6b8b522a>
Date: Wed, 21 Mar 2007 23:49:41 +0000
Subject: [PATCH] fix fixes

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1854 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
---
 C/heapgc.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/C/heapgc.c b/C/heapgc.c
index 23f4c6841..5cd231329 100644
--- a/C/heapgc.c
+++ b/C/heapgc.c
@@ -157,8 +157,8 @@ gc_growtrail(int committed, tr_fr_ptr begsTR, cont *old_cont_top0)
 	begsTR = newsTR;
 	sTR += 2;
       } 
-      set_conditionals(sTR);
     }
+    set_conditionals(sTR);
 #endif
     /* could not find more trail */
     save_machine_regs();
@@ -3366,6 +3366,7 @@ set_conditionals(tr_fr_ptr str) {
     cptr = (CELL *)TrailTerm(str+1);
     *cptr = TrailTerm(str);
   } 
+  sTR = sTR0 = NULL;
 }
 #endif
 
@@ -3598,7 +3599,6 @@ do_gc(Int predarity, CELL *current_env, yamop *nextop)
     /* we cannot recover, fail system */
     restore_machine_regs();    
     sz = Yap_TrailTop-(ADDR)OldTR;
-    fprintf(stderr,"sz=%d\n",sz);
     /* ask for double the size */
     sz = 2*sz;
     TR = OldTR;
@@ -3623,6 +3623,9 @@ do_gc(Int predarity, CELL *current_env, yamop *nextop)
 #endif
     }
   }
+#if EASY_SHUNTING
+  sTR0 = sTR = NULL;
+#endif
   total_marked = 0;
   total_oldies = 0;
 #ifdef COROUTING