Merge pull request #528 from secure-software-engineering/f-FixIDEEdgeFunctions

Fix IDE edge functions

Author: pdschubert

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h

@@ -119,7 +119,7 @@ class AllTop : public EdgeFunction<L>,
   const L TopElement;
 
 public:
-  AllTop(const L TopElement) : TopElement(std::move(TopElement)) {}
+  AllTop(L TopElement) : TopElement(std::move(TopElement)) {}
 
   ~AllTop() override = default;
 
@@ -160,33 +160,18 @@ class AllBottom : public EdgeFunction<L>,
   const L BottomElement;
 
 public:
-  AllBottom(const L BottomElement) : BottomElement(std::move(BottomElement)) {}
+  AllBottom(L BottomElement) : BottomElement(std::move(BottomElement)) {}
 
   ~AllBottom() override = default;
 
   L computeTarget(L /*Source*/) override { return BottomElement; }
 
-  EdgeFunctionPtrType composeWith(EdgeFunctionPtrType SecondFunction) override {
-    if (auto *AB = dynamic_cast<AllBottom<L> *>(SecondFunction.get())) {
-      return this->shared_from_this();
-    }
-    if (auto *EI = dynamic_cast<EdgeIdentity<L> *>(SecondFunction.get())) {
-      return this->shared_from_this();
-    }
-    return SecondFunction->composeWith(this->shared_from_this());
+  EdgeFunctionPtrType
+  composeWith(EdgeFunctionPtrType /*SecondFunction*/) override {
+    return this->shared_from_this();
   }
 
-  EdgeFunctionPtrType joinWith(EdgeFunctionPtrType OtherFunction) override {
-    if (OtherFunction.get() == this ||
-        OtherFunction->equal_to(this->shared_from_this())) {
-      return this->shared_from_this();
-    }
-    if (auto *Alltop = dynamic_cast<AllTop<L> *>(OtherFunction.get())) {
-      return this->shared_from_this();
-    }
-    if (auto *EI = dynamic_cast<EdgeIdentity<L> *>(OtherFunction.get())) {
-      return this->shared_from_this();
-    }
+  EdgeFunctionPtrType joinWith(EdgeFunctionPtrType /*OtherFunction*/) override {
     return this->shared_from_this();
   }
 

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h

@@ -936,7 +936,7 @@ class IDEInstInteractionAnalysisT
     //                     0
     //
     if (isZeroValue(CurrNode) && isZeroValue(SuccNode)) {
-      return std::make_shared<AllBottom<l_t>>(bottomElement());
+      return EdgeIdentity<l_t>::getInstance();
     }
     // check if the user has registered a fact generator function
     l_t UserEdgeFacts = BitVectorSet<e_t>();

include/phasar/PhasarLLVM/Utils/LLVMShorthands.h

@@ -24,13 +24,12 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/ModuleSlotTracker.h"
 #include "llvm/IR/Value.h"
+#include "llvm/Support/Compiler.h"
 
 #include "phasar/Utils/Utilities.h"
 
 namespace psr {
 
-static inline void deleteValue(llvm::Value *V) { V->deleteValue(); }
-
 /**
  * @brief Checks if the given LLVM Value is a LLVM Function Pointer.
  * @param V LLVM Value.
@@ -73,6 +72,9 @@ std::string llvmIRToStableString(const llvm::Value *V);
  */
 std::string llvmIRToShortString(const llvm::Value *V);
 
+LLVM_DUMP_METHOD void dumpIRValue(const llvm::Value *V);
+LLVM_DUMP_METHOD void dumpIRValue(const llvm::Instruction *V);
+
 /**
  * @brief Returns all LLVM Global Values that are used in the given LLVM
  * Function.

lib/Controller/CMakeLists.txt

@@ -10,6 +10,7 @@ set(PHASAR_LINK_LIBS
   phasar_phasarllvm_utils
   phasar_utils
   phasar_analysis_strategy
+  phasar_taintconfig
 )
 
 set(LLVM_LINK_COMPONENTS

lib/PhasarClang/CMakeLists.txt

@@ -4,6 +4,7 @@ include_directories(${CLANG_INCLUDE_DIRS})
 
 set(PHASAR_LINK_LIBS
   phasar_utils
+  phasar_taintconfig
 )
 
 set(LLVM_LINK_COMPONENTS

lib/PhasarLLVM/ControlFlow/Resolver/DTAResolver.cpp

@@ -22,6 +22,7 @@
 #include "llvm/IR/InstIterator.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Module.h"
+#include "llvm/IR/Operator.h"
 
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/DTAResolver.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
@@ -113,10 +114,7 @@ bool DTAResolver::heuristicAntiConstructorVtablePos(
         if (BitcastExpr->isCast()) {
           if (auto *ConstGep = llvm::dyn_cast<llvm::ConstantExpr>(
                   BitcastExpr->getOperand(0))) {
-            std::unique_ptr<llvm::Instruction, decltype(&deleteValue)>
-                GepAsInst(ConstGep->getAsInstruction(), &deleteValue);
-            if (auto *Gep =
-                    llvm::dyn_cast<llvm::GetElementPtrInst>(GepAsInst.get())) {
+            if (auto *Gep = llvm::dyn_cast<llvm::GEPOperator>(ConstGep)) {
               if (auto *Vtable = llvm::dyn_cast<llvm::Constant>(
                       Gep->getPointerOperand())) {
                 // We can here assume that we found a vtable

lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.cpp

@@ -35,7 +35,7 @@ BinaryEdgeFunction::composeWith(
   if (dynamic_cast<AllBottom<IDEGeneralizedLCA::l_t> *>(SecondFunction.get())) {
     // print(std::cout << "Compose ");
     // std::cout << " with ALLBOT" << std::endl;
-    return shared_from_this();
+    return SecondFunction;
   }
   return std::make_shared<LCAEdgeFunctionComposer>(this->shared_from_this(),
                                                    SecondFunction, MaxSize);

lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.cpp

@@ -39,8 +39,7 @@ std::shared_ptr<EdgeFunction<IDEGeneralizedLCA::l_t>> GenConstant::composeWith(
     std::shared_ptr<EdgeFunction<IDEGeneralizedLCA::l_t>> SecondFunction) {
   // std::cout << "GenConstant composing" << std::endl;
   if (dynamic_cast<EdgeIdentity<IDEGeneralizedLCA::l_t> *>(
-          SecondFunction.get()) ||
-      dynamic_cast<AllBottom<IDEGeneralizedLCA::l_t> *>(SecondFunction.get())) {
+          SecondFunction.get())) {
 
     return shared_from_this();
   }

lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.cpp

@@ -301,8 +301,7 @@ IDEGeneralizedLCA::getNormalEdgeFunction(IDEGeneralizedLCA::n_t Curr,
 
   // All_Bottom for zero value
   if (isZeroValue(CurrNode) && isZeroValue(SuccNode)) {
-    static auto AllBot = std::make_shared<AllBottom<l_t>>(bottomElement());
-    return AllBot;
+    return EdgeIdentity<l_t>::getInstance();
   }
   // Check store instruction
   if (const auto *Store = llvm::dyn_cast<llvm::StoreInst>(Curr)) {

lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.cpp

@@ -63,7 +63,8 @@ JoinEdgeFunction::composeWith(
     std::shared_ptr<EdgeFunction<IDEGeneralizedLCA::l_t>> SecondFunction) {
   // std::cout << "JoinFn composing" << std::endl;
   // TODO be more precise here
-  if (dynamic_cast<GenConstant *>(SecondFunction.get())) {
+  if (dynamic_cast<GenConstant *>(SecondFunction.get()) ||
+      AllBot::isBot(SecondFunction)) {
     return SecondFunction;
   }
   if (dynamic_cast<EdgeIdentity<IDEGeneralizedLCA::l_t> *>(
@@ -81,7 +82,7 @@ JoinEdgeFunction::joinWith(
     return shared_from_this();
   }
   if (AllBot::isBot(OtherFunction)) {
-    return AllBot::getInstance();
+    return OtherFunction;
   }
 
   return std::make_shared<JoinEdgeFunction>(shared_from_this(), OtherFunction,