svf-lib 1.0.1029 → 1.0.1032

package/SVF-linux/include/SVF-FE/LLVMUtil.h

@@ -104,6 +104,16 @@ inline bool isHeapAllocExtFunViaArg(const SVFFunction* fun)
     return fun && ExtAPI::getExtAPI()->is_arg_alloc(fun);
 }
 
+static inline Type *getPtrElementType(const PointerType* pty)
+{
+#if (LLVM_VERSION_MAJOR < 14)
+    return pty->getElementType();
+#else
+    assert(!pty->isOpaque() && "Opaque Pointer is used, please recompile the source adding '-Xclang -no-opaque-pointer'");
+    return pty->getNonOpaquePointerElementType();
+#endif
+}
+
 /// interfaces to be used externally
 inline bool isHeapAllocExtCallViaRet(const CallSite cs)
 {
@@ -248,7 +258,7 @@ inline const PointerType *getRefTypeOfHeapAllocOrStatic(const CallSite cs)
         int argPos = getHeapAllocHoldingArgPosition(cs);
         const Value *arg = cs.getArgument(argPos);
         if (const PointerType *argType = SVFUtil::dyn_cast<PointerType>(arg->getType()))
-            refType = SVFUtil::dyn_cast<PointerType>(argType->getElementType());
+            refType = SVFUtil::dyn_cast<PointerType>(getPtrElementType(argType));
     }
     // Case 2: heap/static object held by return value.
     else

package/SVF-linux/include/Util/BasicTypes.h

@@ -51,6 +51,10 @@
 #include <llvm/ADT/GraphTraits.h>		// for Graphtraits
 #include <llvm/Transforms/Utils/Local.h>	// for FindDbgAddrUses
 
+#if (LLVM_VERSION_MAJOR >= 14)
+#include <llvm/BinaryFormat/Dwarf.h>
+#endif
+
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/IR/CFG.h"
 #include "llvm/BinaryFormat/Dwarf.h"

package/SVF-osx/include/MSSA/MSSAMuChi.h

@@ -716,7 +716,7 @@ public:
     }
 };
 
-llvm::raw_ostream& operator<<(llvm::raw_ostream &o, const MRVer& mrver);
+std::ostream& operator<<(std::ostream &o, const MRVer& mrver);
 } // End namespace SVF
 
 #endif /* MSSAMUCHI_H_ */

package/SVF-osx/include/SVF-FE/LLVMUtil.h

@@ -104,6 +104,16 @@ inline bool isHeapAllocExtFunViaArg(const SVFFunction* fun)
     return fun && ExtAPI::getExtAPI()->is_arg_alloc(fun);
 }
 
+static inline Type *getPtrElementType(const PointerType* pty)
+{
+#if (LLVM_VERSION_MAJOR < 14)
+    return pty->getElementType();
+#else
+    assert(!pty->isOpaque() && "Opaque Pointer is used, please recompile the source adding '-Xclang -no-opaque-pointer'");
+    return pty->getNonOpaquePointerElementType();
+#endif
+}
+
 /// interfaces to be used externally
 inline bool isHeapAllocExtCallViaRet(const CallSite cs)
 {
@@ -248,7 +258,7 @@ inline const PointerType *getRefTypeOfHeapAllocOrStatic(const CallSite cs)
         int argPos = getHeapAllocHoldingArgPosition(cs);
         const Value *arg = cs.getArgument(argPos);
         if (const PointerType *argType = SVFUtil::dyn_cast<PointerType>(arg->getType()))
-            refType = SVFUtil::dyn_cast<PointerType>(argType->getElementType());
+            refType = SVFUtil::dyn_cast<PointerType>(getPtrElementType(argType));
     }
     // Case 2: heap/static object held by return value.
     else

package/SVF-osx/include/Util/BasicTypes.h

@@ -51,6 +51,10 @@
 #include <llvm/ADT/GraphTraits.h>		// for Graphtraits
 #include <llvm/Transforms/Utils/Local.h>	// for FindDbgAddrUses
 
+#if (LLVM_VERSION_MAJOR >= 14)
+#include <llvm/BinaryFormat/Dwarf.h>
+#endif
+
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/IR/CFG.h"
 #include "llvm/BinaryFormat/Dwarf.h"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.1029",
+  "version": "1.0.1032",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {