fix

UnitTestBot · Aug 30, 2023 · 1e9661e · 1e9661e
1 parent 4332026
commit 1e9661e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/include/klee/Core/Interpreter.h b/include/klee/Core/Interpreter.h
@@ -147,8 +147,8 @@ class Interpreter {
   setModule(std::vector<std::unique_ptr<llvm::Module>> &userModules,
             std::vector<std::unique_ptr<llvm::Module>> &libsModules,
             const ModuleOptions &opts,
-            std::set<llvm::StringRef> &mainModuleFunctions,
-            std::set<llvm::StringRef> &mainModuleGlobals,
+            std::set<std::string> &mainModuleFunctions,
+            std::set<std::string> &mainModuleGlobals,
             FInstructions &&origInstructions) = 0;
 
   // supply a tree stream writer which the interpreter will use

diff --git a/include/klee/Module/KInstruction.h b/include/klee/Module/KInstruction.h
@@ -23,6 +23,7 @@ DISABLE_WARNING_POP
 
 #include <optional>
 #include <vector>
+#include <unordered_map>
 
 namespace llvm {
 class Instruction;

diff --git a/include/klee/Module/KModule.h b/include/klee/Module/KModule.h
@@ -240,9 +240,8 @@ class KModule {
   // XXX change to KFunction
   std::set<llvm::Function *> escapingFunctions;
 
-  std::set<llvm::StringRef> mainModuleFunctions;
-
-  std::set<llvm::StringRef> mainModuleGlobals;
+  std::set<std::string> mainModuleFunctions;
+  std::set<std::string> mainModuleGlobals;
 
   using FInstructions = std::unordered_map<
       std::string,

diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
@@ -528,8 +528,8 @@ llvm::Module *
 Executor::setModule(std::vector<std::unique_ptr<llvm::Module>> &userModules,
                     std::vector<std::unique_ptr<llvm::Module>> &libsModules,
                     const ModuleOptions &opts,
-                    std::set<llvm::StringRef> &mainModuleFunctions,
-                    std::set<llvm::StringRef> &mainModuleGlobals,
+                    std::set<std::string> &mainModuleFunctions,
+                    std::set<std::string> &mainModuleGlobals,
                     FInstructions &&origInstructions) {
   assert(!kmodule && !userModules.empty() &&
          "can only register one module"); // XXX gross

diff --git a/lib/Core/Executor.h b/lib/Core/Executor.h
@@ -726,8 +726,8 @@ class Executor : public Interpreter {
   setModule(std::vector<std::unique_ptr<llvm::Module>> &userModules,
             std::vector<std::unique_ptr<llvm::Module>> &libsModules,
             const ModuleOptions &opts,
-            std::set<llvm::StringRef> &mainModuleFunctions,
-            std::set<llvm::StringRef> &mainModuleGlobals,
+            std::set<std::string> &mainModuleFunctions,
+            std::set<std::string> &mainModuleGlobals,
             FInstructions &&origInstructions) override;
 
   void useSeeds(const std::vector<struct KTest *> *seeds) override {

diff --git a/lib/Module/KModule.cpp b/lib/Module/KModule.cpp
@@ -388,8 +388,8 @@ void KModule::manifest(InterpreterHandler *ih,
     std::unique_ptr<llvm::raw_fd_ostream> assemblyFS;
     if (OutputSource || forceSourceOutput) {
       assemblyFS = ih->openOutputFile("assembly.ll");
+      asmLineMap = buildInstructionToLineMap(*module, std::move(assemblyFS));
     }
-    asmLineMap = buildInstructionToLineMap(*module, std::move(assemblyFS));
 //    infos = std::make_unique<InstructionInfoTable>(*module);
   }
 

diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp
@@ -1575,15 +1575,16 @@ int main(int argc, char **argv, char **envp) {
     EntryPoint = stubEntryPoint;
   }
 
-  std::set<llvm::StringRef> mainModuleFunctions;
+  //change to StringRef
+  std::set<std::string> mainModuleFunctions;
   for (auto &Function : *mainModule) {
     if (!Function.isDeclaration()) {
-      mainModuleFunctions.insert(Function.getName());
+      mainModuleFunctions.insert(Function.getName().str());
     }
   }
-  std::set<llvm::StringRef> mainModuleGlobals;
+  std::set<std::string> mainModuleGlobals;
   for (const auto &gv : mainModule->globals()) {
-    mainModuleGlobals.insert(gv.getName());
+    mainModuleGlobals.insert(gv.getName().str());
   }
 
   const std::string &module_triple = mainModule->getTargetTriple();