From 9bfdfeb20404a0b84bb8c33307a56af644819a33 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Sun, 31 Jul 2016 04:32:41 -0500
Subject: [PATCH] Abolish removes too much information

---
 C/qlyr.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/C/qlyr.c b/C/qlyr.c
index acd436d7e..61c83a48a 100755
--- a/C/qlyr.c
+++ b/C/qlyr.c
@@ -910,7 +910,15 @@ static void read_clauses(FILE *stream, PredEntry *pp, UInt nclauses,
       }
       return;
     }
-    Yap_Abolish(pp);
+    if (pp->cs.p_code.NOfClauses) {
+      StaticClause *cl;
+      cl = ClauseCodeToStaticClause(pp->cs.p_code.FirstClause);
+      do {
+        StaticClause *ncl = cl->ClNext;
+        Yap_EraseStaticClause(cl, pp, CurrentModule);
+        cl = ncl;
+      } while (cl != NULL);
+    }
     for (i = 0; i < nclauses; i++) {
       char *base = (void *)read_UInt(stream);
       UInt size = read_UInt(stream);
@@ -1062,7 +1070,7 @@ static Int qload_program(USES_REGS1) {
   return true;
 }
 
-int Yap_Restore(const char *s, const char *lib_dir) {
+YAP_file_type_t Yap_Restore(const char *s, const char *lib_dir) {
   CACHE_REGS
 
   FILE *stream = Yap_OpenRestore(s, lib_dir);
@@ -1070,13 +1078,13 @@ int Yap_Restore(const char *s, const char *lib_dir) {
     return -1;
   GLOBAL_RestoreFile = s;
   if (do_header(stream) == NIL)
-    return FALSE;
+    return YAP_BOOT_PL;
   read_module(stream);
   setBooleanGlobalPrologFlag(SAVED_PROGRAM_FLAG, true);
   fclose(stream);
   GLOBAL_RestoreFile = NULL;
   LOCAL_SourceModule = CurrentModule = USER_MODULE;
-  return DO_ONLY_CODE;
+  return YAP_QLY;
 }
 
 void Yap_InitQLYR(void) {
@@ -1086,7 +1094,7 @@ void Yap_InitQLYR(void) {
                 SyncPredFlag | HiddenPredFlag);
   Yap_InitCPred("$qload_program", 1, qload_program,
                 SyncPredFlag | HiddenPredFlag);
-    Yap_InitCPred("$q_header", 2, get_header, SyncPredFlag | HiddenPredFlag);
+  Yap_InitCPred("$q_header", 2, get_header, SyncPredFlag | HiddenPredFlag);
   if (FALSE) {
     restore_codes();
   }