fix llvm upgrade bugs

panda-re · Aug 12, 2024 · 51f2824 · 51f2824
1 parent 5f2cf80
commit 51f2824
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tools/lavaTool/include/MatchFinder.h b/tools/lavaTool/include/MatchFinder.h
@@ -160,11 +160,11 @@ class LavaMatchFinder : public MatchFinder, public SourceFileCallbacks {
 	);
     }
 
-    // TODO: WARNING, I HAVE REMOVED OVERRIDE, I REALLY HOPE I DON'T REGRET THIS!
-    virtual bool handleBeginSource(CompilerInstance &CI, StringRef Filename) {
+    virtual bool handleBeginSource(CompilerInstance &CI) override {
         Insert.clear();
         Mod.Reset(&CI.getLangOpts(), &CI.getSourceManager());
         TUReplace.Replacements.clear();
+        std::string Filename = CI.getSourceManager().getFileEntryForID(CI.getSourceManager().getMainFileID())->getName().str(); // Convert StringRef to std::string
         TUReplace.MainSourceFile = Filename;
         CurrentCI = &CI;
 

diff --git a/tools/lavaTool/src/lavaFnTool.cpp b/tools/lavaTool/src/lavaFnTool.cpp
@@ -156,7 +156,7 @@ class CallPrinter : public MatchFinder::MatchCallback {
             std::string fun_name = get_containing_function_name(Result, *call);
             outfile << "   containing_function: " << fun_name << "\n";
 
-            QualType rt = call->getDirectCallee()->getReturnType();
+            QualType rt = call->getCallReturnType(*Result.Context);
             spit_type( "   ret_type: ", rt);
             outfile << "   args: \n";
             for (auto it = call->arg_begin(); it != call->arg_end(); ++it) {