Fixed ASan and MSan

Author: sava-cska

.github/workflows/build.yaml

@@ -43,17 +43,17 @@ jobs:
                 "LLVM 7",
                 "LLVM 6",
                 "LLVM 5",
-                #"ASan",
+                "ASan",
                 "UBSan",
-                #"MSan",
+                "MSan",
                 "Z3 only",
                 "metaSMT STP",
                 "metaSMT Boolector",
                 "STP master",
                 "Latest klee-uclibc",
                 "Asserts enabled",
                 "No TCMalloc, optimised runtime",
-              ]
+            ]
         include:
           - name: "LLVM 11"
             env:
@@ -77,22 +77,22 @@ jobs:
             env:
               LLVM_VERSION: 5
           # Sanitizer builds. Do unoptimized build otherwise the optimizer might remove problematic code
-#          - name: "ASan"
-#            env:
-#              SANITIZER_BUILD: address
-#              ENABLE_OPTIMIZED: 0
-#              USE_TCMALLOC: 0
+          - name: "ASan"
+            env:
+              SANITIZER_BUILD: address
+              ENABLE_OPTIMIZED: 0
+              USE_TCMALLOC: 0
           - name: "UBSan"
             env:
               SANITIZER_BUILD: undefined
               ENABLE_OPTIMIZED: 0
               USE_TCMALLOC: 0
-#          - name: "MSan"
-#            env:
-#              SANITIZER_BUILD: memory
-#              ENABLE_OPTIMIZED: 0
-#              USE_TCMALLOC: 0
-#              SOLVERS: STP
+          - name: "MSan"
+            env:
+              SANITIZER_BUILD: memory
+              ENABLE_OPTIMIZED: 0
+              USE_TCMALLOC: 0
+              SOLVERS: STP
             # Test just using Z3 only
           - name: "Z3 only"
             env:

.gitignore

@@ -33,6 +33,4 @@ autoconf/aclocal.m4
 autoconf/autom4te.cache/
 autom4te.cache/
 
-test/
-examples/
 .vscode

include/klee/Module/KModule.h

@@ -75,8 +75,6 @@ namespace klee {
     KBlock(const KBlock &) = delete;
     KBlock &operator=(const KBlock &) = delete;
 
-    ~KBlock();
-
     unsigned getArgRegister(unsigned index) const { return index; }
     void handleKInstruction(std::map<llvm::Instruction*, unsigned> &registerMap,
                             llvm::Instruction *inst, KModule *km, KInstruction *ki);
@@ -105,11 +103,11 @@ namespace klee {
     unsigned numBlocks;
     KInstruction **instructions;
 
-    std::map<llvm::Instruction*, KInstruction*> instructionMap;
+    std::map<llvm::Instruction *, KInstruction *> instructionMap;
     std::vector<std::unique_ptr<KBlock>> blocks;
     std::map<llvm::BasicBlock*, KBlock*> blockMap;
     KBlock *entryKBlock;
-    std::vector<KBlock*> finalKBlocks;
+    std::vector<KBlock *> finalKBlocks;
     std::vector<KCallBlock*> kCallBlocks;
 
     /// Whether instructions in this function should count as