SVF-tools · yuleisui · Aug 16, 2023 · Aug 14, 2023 · Aug 14, 2023 · Aug 15, 2023
diff --git a/.config.in b/.config.in
@@ -2,5 +2,6 @@
 #define CONFIG_H_IN
 
 #define PROJECT_PATH "@CMAKE_CURRENT_SOURCE_DIR@"
+#define EXTAPI_PATH PROJECT_PATH "/@CMAKE_BUILD_TYPE@-build/include/Util"
 
 #endif
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,3 +87,10 @@ install(
   DESTINATION include/svf
   FILES_MATCHING
   PATTERN "**/*.h")
+
+# Compile extapi.c to extapi.bc
+find_path(LLVM_CLANG_DIR NAMES clang PATH_SUFFIXES bin)
+add_custom_target(extapi_ir ALL
+    COMMAND ${LLVM_CLANG_DIR}/clang -w -S -c -Xclang -disable-O0-optnone -fno-discard-value-names -emit-llvm ${PROJECT_SOURCE_DIR}/svf/lib/Util/extapi.c -o ${PROJECT_BINARY_DIR}/include/Util/extapi.bc
+    DEPENDS ${PROJECT_SOURCE_DIR}/svf/lib/Util/extapi.c
+)
diff --git a/build.sh b/build.sh
@@ -115,7 +115,7 @@ function build_llvm_from_source {
     mkdir llvm-build
     cd llvm-build
     # /*/ is a dirty hack to get llvm-project-llvmorg-version...
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$SVFHOME/$LLVMHome" ../llvm-source/*/llvm
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$SVFHOME/$LLVMHome" -DLLVM_ENABLE_PROJECTS=clang ../llvm-source/*/llvm
     cmake --build . -j ${jobs}
     cmake --install .
 

diff --git a/svf-llvm/include/SVF-LLVM/LLVMModule.h b/svf-llvm/include/SVF-LLVM/LLVMModule.h
@@ -34,6 +34,7 @@
 #include "Util/CppUtil.h"
 #include "SVFIR/SVFValue.h"
 #include "SVFIR/SVFModule.h"
+#include "Util/Options.h"
 
 namespace SVF
 {
@@ -74,6 +75,8 @@ class LLVMModuleSet
     FunDeclToDefMapTy FunDeclToDefMap;
     /// Function definition to function declaration map
     FunDefToDeclsMapTy FunDefToDeclsMap;
+    /// Record some "sse_" function declarations used in other ext function definition, e.g., svf_ext_foo(), and svf_ext_foo() used in app functions
+    FunctionSetType ExtFuncsVec;
     /// Global definition to a rep definition map
     GlobalDefToRepMapTy GlobalDefToRepMap;
 
@@ -233,6 +236,20 @@ class LLVMModuleSet
 
     SVFOtherValue* getSVFOtherValue(const Value* ov);
 
+    /// Remove unused function in extapi.bc module
+    bool isUsedExtFunction(Function* func)
+    {
+        /// if this function func defined in extapi.bc but never used in application code (without any corresponding declared functions).
+        if (func->getParent()->getName().str() == Options::ExtAPIInput() 
+                && func->getName().str() != "svf__main" 
+                && FunDefToDeclsMap.find(func) == FunDefToDeclsMap.end()
+                && std::find(ExtFuncsVec.begin(), ExtFuncsVec.end(), func) == ExtFuncsVec.end())
+        {
+            return true;
+        }
+        return false;
+    }
+
     /// Get the corresponding Function based on its name
     inline const SVFFunction* getSVFFunction(const std::string& name)
     {

diff --git a/svf-llvm/include/SVF-LLVM/LLVMUtil.h b/svf-llvm/include/SVF-LLVM/LLVMUtil.h
@@ -34,7 +34,6 @@
 #include "SVF-LLVM/BasicTypes.h"
 #include "SVF-LLVM/LLVMModule.h"
 #include "SVFIR/SVFValue.h"
-#include "Util/ExtAPI.h"
 #include "Util/ThreadAPI.h"
 
 namespace SVF
@@ -373,6 +372,20 @@ const std::string getSourceLocOfFunction(const Function* F);
 bool isIntrinsicInst(const Instruction* inst);
 bool isIntrinsicFun(const Function* func);
 
+/// Get all called funcions in a parent function
+std::vector<const Function *> getCalledFunctions(const Function *F);
+std::vector<std::string> getFunAnnotations(const Function* fun);
+void removeFunAnnotations(std::vector<Function*>& removedFuncList);
+
+inline void removeUnusedFuncsAndAnnotations(std::vector<Function*> removedFuncList)
+{
+    /// Remove unused function annotations in extapi.bc
+    LLVMUtil::removeFunAnnotations(removedFuncList);
+    /// Remove unused function in extapi.bc
+    for (Function* func : removedFuncList)
+        func->eraseFromParent();
+}
+
 /// Get the corresponding Function based on its name
 inline const SVFFunction* getFunction(const std::string& name)
 {

diff --git a/svf-llvm/include/SVF-LLVM/SVFIRBuilder.h b/svf-llvm/include/SVF-LLVM/SVFIRBuilder.h
@@ -31,10 +31,10 @@
 #define PAGBUILDER_H_
 
 #include "SVFIR/SVFIR.h"
-#include "Util/ExtAPI.h"
 #include "SVF-LLVM/BasicTypes.h"
 #include "SVF-LLVM/ICFGBuilder.h"
 #include "SVF-LLVM/LLVMModule.h"
+#include "SVF-LLVM/LLVMUtil.h"
 
 namespace SVF
 {
@@ -232,18 +232,9 @@ class SVFIRBuilder: public llvm::InstVisitor<SVFIRBuilder>
 
     /// Handle external call
     //@{
-    virtual SVFCallInst* addSVFExtCallInst(const SVFCallInst* svfInst, SVFBasicBlock* svfBB, const SVFFunction* svfCaller, const SVFFunction* svfCallee);
-    virtual void addSVFExtRetInst(SVFCallInst* svfCall, SVFBasicBlock* svfBB, SVFFunction* svfCaller);
-    virtual SVFInstruction* addSVFExtInst(const std::string& instName, const SVFCallInst* svfInst, SVFBasicBlock* svfBB, SVF::ExtAPI::OperationType opType, const SVFType* svfType);
-    virtual void extFuncAtomaticOperation(ExtAPI::Operand& atomicOp, const SVFCallInst* svfInst);
-    virtual SVFBasicBlock* extFuncInitialization(const SVFCallInst* svfInst, SVFFunction* svfCaller);
-    virtual void handleExtCallStat(ExtAPI::ExtFunctionOps &extFunctionOps, const SVFCallInst* svfInst);
-    virtual NodeID getExtID(ExtAPI::OperationType operationType, const std::string &s, const SVFCallInst* svfCall);
-    virtual void parseAtomaticOp(SVF::ExtAPI::Operand &atomaticOp, const SVFCallInst* svfCall, std::map<std::string, NodeID> &nodeIDMap);
-    virtual void parseExtFunctionOps(ExtAPI::ExtFunctionOps &extFunctionOps, const SVFCallInst* svfCall);
-    virtual void preProcessExtCall(CallBase* cs);
-    virtual void handleExtCall(const SVFInstruction* svfInst, const SVFFunction* svfCallee);
-    void addComplexConsForExt(const SVFValue* D, const SVFValue* S, const SVFValue* sz);
+    virtual const Type *getBaseTypeAndFlattenedFields(const Value *V, std::vector<AccessPath> &fields, const Value* szValue);
+    virtual void addComplexConsForExt(Value *D, Value *S, const Value* sz);
+    virtual void handleExtCall(const CallBase* cs, const SVFFunction* svfCallee);
     //@}
 
     /// Set current basic block in order to keep track of control flow information
@@ -287,7 +278,7 @@ class SVFIRBuilder: public llvm::InstVisitor<SVFIRBuilder>
         return nullPtr;
     }
 
-    NodeID getGepValVar(const SVFValue* val, const AccessPath& ap, const SVFType* baseType);
+    NodeID getGepValVar(const Value* val, const AccessPath& ap, const SVFType* elementType);
 
     void setCurrentBBAndValueForPAGEdge(PAGEdge* edge);