Merge pull request #54 from bjjwwang/main

sync with latest SVF

Author: bjjwwang

Assignment-2/Test2.cpp

@@ -34,10 +34,10 @@ void Test1()
 
     std::vector<std::string> moduleNameVec = {"./Assignment-2/testcase/bc/test1.ll"};
 
-    SVFModule *svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
+    LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
 
     /// Build Program Assignment Graph (SVFIR)
-    SVFIRBuilder builder(svfModule);
+    SVFIRBuilder builder;
     SVFIR *pag = builder.build();
     ICFG *icfg = pag->getICFG();
     // If you want to test your own case, plase change the dump name
@@ -63,10 +63,10 @@ void Test2()
     //    Your current workingspace dir}/Assignment-2/testCase/
     std::vector<std::string> moduleNameVec = {"./Assignment-2/testcase/bc/test2.ll"};
 
-    SVFModule *svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
+    LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
 
     /// Build Program Assignment Graph (SVFIR)
-    SVFIRBuilder builder(svfModule);
+    SVFIRBuilder builder;
     SVFIR *pag = builder.build();
     ICFG *icfg = pag->getICFG();
     // If you want to test your own case, plase change the dump name
@@ -93,10 +93,10 @@ void Test3()
     //    Your current workingspace dir}/Assignment-2/testCase/
     std::vector<std::string> moduleNameVec = {"./Assignment-2/testcase/bc/test3.ll"};
 
-    SVFModule *svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
+    LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
 
     /// Build Program Assignment Graph (SVFIR)
-    SVFIRBuilder builder(svfModule);
+    SVFIRBuilder builder;
     SVFIR *pag = builder.build();
     ICFG *icfg = pag->getICFG();
     // If you want to test your own case, plase change the dump name

Assignment-3/Test3.cpp

@@ -38,9 +38,9 @@
 void Test1()
 {
 
-    SVF::SVFModule *svfModule = SVF::LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-3/testcase/bc/no_alias.ll"});
+    SVF::LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-3/testcase/bc/no_alias.ll"});
     /// Build Program Assignment Graph (SVFIR)
-    SVF::SVFIRBuilder builder(svfModule);
+    SVF::SVFIRBuilder builder;
     SVF::SVFIR *pag = builder.build();
     pag->dump ("./Assignment-3/testcase/dot/no_alias_init");
     AndersenPTA *andersenPTA = new AndersenPTA(pag);
@@ -54,9 +54,9 @@ void Test1()
 void Test2()
 {
 
-    SVF::SVFModule *svfModule = SVF::LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-3/testcase/bc/CI-global.ll"});
+    SVF::LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-3/testcase/bc/CI-global.ll"});
     /// Build Program Assignment Graph (SVFIR)
-    SVF::SVFIRBuilder builder(svfModule);
+    SVF::SVFIRBuilder builder;
     SVF::SVFIR *pag = builder.build();
     pag->dump ("./Assignment-3/testcase/dot/CI-global_init");
     AndersenPTA *andersenPTA = new AndersenPTA(pag);
@@ -69,9 +69,9 @@ void Test2()
 
 void Test3()
 {
-    SVF::SVFModule *svfModule = SVF::LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-3/testcase/bc/CI-local.ll"});
+    SVF::LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-3/testcase/bc/CI-local.ll"});
     /// Build Program Assignment Graph (SVFIR)
-    SVF::SVFIRBuilder builder(svfModule);
+    SVF::SVFIRBuilder builder;
     SVF::SVFIR *pag = builder.build();
     pag->dump ("./Assignment-3/testcase/dot/CI-local_init");
     AndersenPTA *andersenPTA = new AndersenPTA(pag);

Assignment-4/Test4.cpp

@@ -39,9 +39,9 @@ using namespace std;
 void Test1()
 {
     cout << "\n running test1: " << endl;
-    SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-4/testcase/bc/test1.ll"});
+    LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-4/testcase/bc/test1.ll"});
     /// Build Program Assignment Graph (SVFIR)
-    SVF::SVFIRBuilder builder(svfModule);
+    SVF::SVFIRBuilder builder;
     SVF::SVFIR *pag = builder.build();
     TaintGraphTraversal* taint = new TaintGraphTraversal(pag);
     taint->taintChecking();
@@ -54,9 +54,9 @@ void Test1()
 void Test2()
 {
     cout << "\n running test2 :" << endl;
-    SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-4/testcase/bc/test2.ll"});
+    LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-4/testcase/bc/test2.ll"});
     /// Build Program Assignment Graph (SVFIR)
-    SVF::SVFIRBuilder builder(svfModule);
+    SVF::SVFIRBuilder builder;
     SVF::SVFIR *pag = builder.build();
 
     TaintGraphTraversal* taint = new TaintGraphTraversal(pag);
@@ -71,9 +71,9 @@ void Test2()
 void Test3()
 {
     cout << "\n running test3 :" << endl;
-    SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-4/testcase/bc/test3.ll"});
+    LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-4/testcase/bc/test3.ll"});
     /// Build Program Assignment Graph (SVFIR)
-    SVF::SVFIRBuilder builder(svfModule);
+    SVF::SVFIRBuilder builder;
     SVF::SVFIR *pag = builder.build();
 
     TaintGraphTraversal* taint = new TaintGraphTraversal(pag);
@@ -89,9 +89,9 @@ void Test3()
 void Test4()
 {
     cout << "\n running test4 :" << endl;
-    SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-4/testcase/bc/test4.ll"});
+    LLVMModuleSet::getLLVMModuleSet()->buildSVFModule({"./Assignment-4/testcase/bc/test4.ll"});
     /// Build Program Assignment Graph (SVFIR)
-    SVF::SVFIRBuilder builder(svfModule);
+    SVF::SVFIRBuilder builder;
     SVF::SVFIR *pag = builder.build();
 
     TaintGraphTraversal* taint = new TaintGraphTraversal(pag);

CodeGraph/CodeGraph.cpp

@@ -55,10 +55,10 @@ int main(int argc, char ** argv) {
             arg_num, arg_value, "Teaching-Software-Analysis Assignment 4", "[options]"
     );
 
-    SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
+    LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
 
     /// Build Program Assignment Graph (SVFIR or PAG)
-    SVFIRBuilder builder(svfModule);
+    SVFIRBuilder builder;
     SVFIR *pag = builder.build();
     //dump pag
     pag->dump(PAG::getPAG()->getModuleIdentifier() + ".pag");