Remove BasicBlock Values (#1841)

* Remove BasicBlockVal.

* Update node count.

* Don't put basic block in symbol table.

* Remove AsmPCVal.

* Remove TODO

* More thoroughly ignore ASM et al.

* Remove isBasicBlockSym.

* Make a dummy node for unhandled values.

* Go back to just removing basic block vals.

Author: mbarbar

svf-llvm/lib/SVFIRBuilder.cpp

@@ -510,10 +510,6 @@ void SVFIRBuilder::initialiseValVars()
         {
             pag->addConstantAggValNode(iter->second, icfgNode, llvmModuleSet()->getSVFType(llvmValue->getType()));
         }
-        else if (SVFUtil::isa<BasicBlock>(llvmValue))
-        {
-            pag->addBasicBlockValNode(iter->second, llvmModuleSet()->getSVFType(llvmValue->getType()));
-        }
         else if (SVFUtil::isa<InlineAsm>(llvmValue) ||
                  SVFUtil::isa<DSOLocalEquivalent>(llvmValue) ||
                  SVFUtil::isa<NoCFIValue>(llvmValue))

svf-llvm/lib/SymbolTableBuilder.cpp

@@ -298,10 +298,15 @@ void SymbolTableBuilder::collectSym(const Value* val)
 void SymbolTableBuilder::collectVal(const Value* val)
 {
     // collect and record special sym here
-    if (LLVMUtil::isNullPtrSym(val) || LLVMUtil::isBlackholeSym(val))
+    if (
+        LLVMUtil::isNullPtrSym(val) ||
+        LLVMUtil::isBlackholeSym(val) ||
+        SVFUtil::isa<BasicBlock>(val)
+    )
     {
         return;
     }
+
     LLVMModuleSet::ValueToIDMapTy::iterator iter = llvmModuleSet()->valSymMap.find(val);
     if (iter == llvmModuleSet()->valSymMap.end())
     {

svf/include/SVFIR/SVFIR.h

@@ -849,10 +849,6 @@ class SVFIR : public IRGraph
     {
         return addValNode(new IntrinsicValVar(i, type));
     }
-    inline NodeID addBasicBlockValNode(NodeID i, const SVFType* type)
-    {
-        return addValNode(new BasicBlockValVar(i, type));
-    }
     inline NodeID addAsmPCValNode(NodeID i, const SVFType* type)
     {
         return addValNode(new AsmPCValVar(i, type));

svf/include/SVFIR/SVFValue.h

@@ -81,7 +81,6 @@ class SVFValue
         // │   └─ Subclass: DummyValVar
         DummyValNode,            // │   └── Dummy node for uninitialized values
         IntrinsicValNode,        // │   └── LLVM intrinsic call instruction (e.g. llvm.dbg.declare)
-        BasicBlockValNode,       // │   └── LLVM BasicBlock (label operand of br/switch)
         AsmPCValNode,            // │   └── InlineAsm, DSOLocalEquivalent, NoCFIValue
 
         // └─ Subclass: ObjVar (Object variable nodes)
@@ -232,7 +231,7 @@ class SVFValue
 
     static inline bool isSVFVarKind(GNodeK n)
     {
-        static_assert(DummyObjNode - ValNode == 29,
+        static_assert(DummyObjNode - ValNode == 28,
                       "The number of SVFVarKinds has changed, make sure the "
                       "range is correct");
 
@@ -241,7 +240,7 @@ class SVFValue
 
     static inline bool isValVarKinds(GNodeK n)
     {
-        static_assert(AsmPCValNode - ValNode == 16,
+        static_assert(AsmPCValNode - ValNode == 15,
                       "The number of ValVarKinds has changed, make sure the "
                       "range is correct");
         return n <= AsmPCValNode && n >= ValNode;

svf/include/SVFIR/SVFVariables.h

@@ -2220,46 +2220,6 @@ class IntrinsicValVar: public ValVar
     virtual const std::string toString() const;
 };
 
-/*
- * Represents an LLVM BasicBlock (label operand of br/switch).
- * Collected into valSyms as a branch operand but has no ICFGNode.
- */
-class BasicBlockValVar: public ValVar
-{
-    friend class GraphDBClient;
-
-public:
-    static inline bool classof(const BasicBlockValVar*)
-    {
-        return true;
-    }
-    static inline bool classof(const SVFVar* node)
-    {
-        return node->getNodeKind() == SVFVar::BasicBlockValNode;
-    }
-    static inline bool classof(const ValVar* node)
-    {
-        return node->getNodeKind() == SVFVar::BasicBlockValNode;
-    }
-    static inline bool classof(const GenericPAGNodeTy* node)
-    {
-        return node->getNodeKind() == SVFVar::BasicBlockValNode;
-    }
-    static inline bool classof(const SVFValue* node)
-    {
-        return node->getNodeKind() == SVFVar::BasicBlockValNode;
-    }
-
-    BasicBlockValVar(NodeID i, const SVFType* svfType)
-        : ValVar(i, svfType, nullptr, BasicBlockValNode) {}
-
-    inline const std::string getValueName() const
-    {
-        return "basicBlockVal";
-    }
-    virtual const std::string toString() const;
-};
-
 /*
  * Represents InlineAsm, DSOLocalEquivalent, and NoCFIValue.
  * These are non-instruction values related to inline assembly,

svf/lib/SVFIR/SVFVariables.cpp

@@ -104,7 +104,6 @@ ValVar::ValVar(NodeID i, const SVFType* svfType, const ICFGNode* node, PNODEK ty
              SVFUtil::isa<FunValVar>(this) ||
              SVFUtil::isa<DummyValVar>(this) ||
              SVFUtil::isa<IntrinsicValVar>(this) ||
-             SVFUtil::isa<BasicBlockValVar>(this) ||
              SVFUtil::isa<AsmPCValVar>(this))
     {
         // These ValVar subclasses don't require an ICFGNode.
@@ -568,14 +567,6 @@ const std::string IntrinsicValVar::toString() const
     return rawstr.str();
 }
 
-const std::string BasicBlockValVar::toString() const
-{
-    std::string str;
-    std::stringstream rawstr(str);
-    rawstr << "BasicBlockValVar ID: " << getId();
-    return rawstr.str();
-}
-
 const std::string AsmPCValVar::toString() const
 {
     std::string str;