From 47bf183848e9abca1fad973439e936ced90b4bbf Mon Sep 17 00:00:00 2001 From: mxHuber Date: Wed, 17 Apr 2024 09:17:52 +0200 Subject: [PATCH] fixed LLVMAliasSetSerializationTest --- lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp | 3 +-- .../Pointer/LLVMAliasSetSerializationTest.cpp | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp index 3fad1896d..d211ee2d0 100644 --- a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp +++ b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp @@ -727,8 +727,6 @@ LLVMAliasSetData LLVMAliasSet::getLLVMAliasSetData() const { LLVMAliasSetData Data; /// Serialize the AliasSets - auto &AliasSetsDataPosition = Data.AliasSets.emplace_back(); - for (const AliasSetTy *PTS : Owner.getAllAliasSets()) { std::vector PtsJson{}; @@ -739,6 +737,7 @@ LLVMAliasSetData LLVMAliasSet::getLLVMAliasSetData() const { } } if (!PtsJson.empty()) { + auto &AliasSetsDataPosition = Data.AliasSets.emplace_back(); for (const auto &Curr : PtsJson) { AliasSetsDataPosition.push_back(Curr); } diff --git a/unittests/PhasarLLVM/Pointer/LLVMAliasSetSerializationTest.cpp b/unittests/PhasarLLVM/Pointer/LLVMAliasSetSerializationTest.cpp index 17d94c767..431c82218 100644 --- a/unittests/PhasarLLVM/Pointer/LLVMAliasSetSerializationTest.cpp +++ b/unittests/PhasarLLVM/Pointer/LLVMAliasSetSerializationTest.cpp @@ -39,7 +39,6 @@ static SetTy makeSet(const nlohmann::json &J) { } static void checkSer(const nlohmann::json &Ser, const GroundTruthTy &Gt) { - ASSERT_TRUE(Ser.count("AliasSets")); ASSERT_TRUE(Ser.count("AnalyzedFunctions")); @@ -77,20 +76,11 @@ static void analyze(llvm::StringRef File, const GroundTruthTy &Gt, ValueAnnotationPass::resetValueID(); LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles + File); - // llvm::outs() << *IRDB.getWPAModule() << '\n'; - LLVMAliasSet PTS(&IRDB, false); LLVMTypeHierarchy TH(IRDB); LLVMBasedICFG ICF(&IRDB, CallGraphAnalysisType::OTF, {EntryPoint.str()}, &TH, &PTS); - auto Ser = PTS.getAsJson(); - checkSer(Ser, Gt); - - LLVMAliasSet Deser(&IRDB, Ser); - checkDeser(*IRDB.getModule(), PTS, Deser); - - // printAsJson serialization std::string SerString; llvm::raw_string_ostream StringStream(SerString); PTS.printAsJson(StringStream);