fix merge conflict

Author: bjjwwang

svf-llvm/lib/CHGBuilder.cpp

@@ -173,6 +173,10 @@ void CHGBuilder::connectInheritEdgeViaCall(const Function* caller, const CallBas
     {
         if (cs->arg_size() < 1 || (cs->arg_size() < 2 && cs->paramHasAttr(0, llvm::Attribute::StructRet)))
             return;
+        if(caller->arg_size() == 0)
+        {
+            return;
+        }
         const Value* csThisPtr = cppUtil::getVCallThisPtr(cs);
         const Argument* consThisPtr = getConstructorThisPtr(caller);
         bool samePtr = isSameThisPtrInConstructor(consThisPtr, csThisPtr);

svf/lib/AE/Svfexe/AbstractInterpretation.cpp

@@ -747,9 +747,12 @@ bool AbstractInterpretation::handleICFGNode(const ICFGNode* node)
         detector->detect(getAbsStateFromTrace(node), node);
     stat->countStateSize();
 
+<<<<<<< HEAD
     // Track this node as analyzed (for coverage statistics across all entry points)
     allAnalyzedNodes.insert(node);
 
+=======
+>>>>>>> root/master
     // Check if state changed (for fixpoint detection)
     // For entry nodes on first visit, always return true to process successors
     if (isFunEntry && !hadPrevState)