Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.11.2 #1654

Merged
merged 2 commits into from
Feb 11, 2025
Merged

2.11.2 #1654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a351c7
rename svfvalue to svfllvmvalue
jumormt Feb 11, 2025
593fd74
rename svfbasenode to svfvalue
jumormt Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion svf-llvm/include/SVF-LLVM/BreakConstantExpr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef BREAKCONSTANTGEPS_H
#define BREAKCONSTANTGEPS_H

#include "SVF-LLVM/SVFValue.h"
#include "SVF-LLVM/SVFLLVMValue.h"

namespace SVF
{
Expand Down
2 changes: 1 addition & 1 deletion svf-llvm/include/SVF-LLVM/CppUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#ifndef CPPUtil_H_
#define CPPUtil_H_

#include "SVF-LLVM/SVFValue.h"
#include "SVF-LLVM/SVFLLVMValue.h"
#include "SVF-LLVM/BasicTypes.h"

namespace SVF
Expand Down
24 changes: 12 additions & 12 deletions svf-llvm/include/SVF-LLVM/LLVMModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#define INCLUDE_SVF_FE_LLVMMODULE_H_

#include "SVF-LLVM/BasicTypes.h"
#include "SVF-LLVM/SVFValue.h"
#include "SVF-LLVM/SVFLLVMValue.h"
#include "SVF-LLVM/SVFModule.h"
#include "Util/Options.h"
#include "Graphs/BasicBlockG.h"
Expand Down Expand Up @@ -61,8 +61,8 @@ class LLVMModuleSet
typedef Map<const Argument*, SVFArgument*> LLVMArgument2SVFArgumentMap;
typedef Map<const Constant*, SVFConstant*> LLVMConst2SVFConstMap;
typedef Map<const Value*, SVFOtherValue*> LLVMValue2SVFOtherValueMap;
typedef Map<const SVFValue*, const Value*> SVFValue2LLVMValueMap;
typedef Map<const SVFBaseNode*, const Value*> SVFBaseNode2LLVMValueMap;
typedef Map<const SVFLLVMValue*, const Value*> SVFValue2LLVMValueMap;
typedef Map<const SVFValue*, const Value*> SVFBaseNode2LLVMValueMap;
typedef Map<const Type*, SVFType*> LLVMType2SVFTypeMap;
typedef Map<const Type*, StInfo*> Type2TypeInfoMap;
typedef Map<std::string, std::vector<std::string>> Fun2AnnoMap;
Expand All @@ -75,7 +75,7 @@ class LLVMModuleSet

/// llvm value to sym id map
/// local (%) and global (@) identifiers are pointer types which have a value node id.
typedef OrderedMap<const SVFValue*, NodeID> ValueToIDMapTy;
typedef OrderedMap<const SVFLLVMValue*, NodeID> ValueToIDMapTy;

typedef OrderedMap<const SVFFunction*, NodeID> FunToIDMapTy;

Expand Down Expand Up @@ -208,13 +208,13 @@ class LLVMModuleSet

/// Get SVFIR Node according to LLVM value
///getNode - Return the node corresponding to the specified pointer.
NodeID getValueNode(const SVFValue* V);
NodeID getValueNode(const SVFLLVMValue* V);

bool hasValueNode(const SVFValue* V);
bool hasValueNode(const SVFLLVMValue* V);

/// getObject - Return the obj node id refer to the memory object for the
/// specified global, heap or alloca instruction according to llvm value.
NodeID getObjectNode(const SVFValue* V);
NodeID getObjectNode(const SVFLLVMValue* V);

void dumpSymTable();

Expand Down Expand Up @@ -285,16 +285,16 @@ class LLVMModuleSet
setValueAttr(ov,svfov);
}

SVFValue* getSVFValue(const Value* value);
SVFLLVMValue* getSVFValue(const Value* value);

const Value* getLLVMValue(const SVFValue* value) const
const Value* getLLVMValue(const SVFLLVMValue* value) const
{
SVFValue2LLVMValueMap::const_iterator it = SVFValue2LLVMValue.find(value);
assert(it!=SVFValue2LLVMValue.end() && "can't find corresponding llvm value!");
return it->second;
}

const Value* getLLVMValue(const SVFBaseNode* value) const
const Value* getLLVMValue(const SVFValue* value) const
{
SVFBaseNode2LLVMValueMap ::const_iterator it = SVFBaseNode2LLVMValue.find(value);
assert(it != SVFBaseNode2LLVMValue.end() && "can't find corresponding llvm value!");
Expand Down Expand Up @@ -536,8 +536,8 @@ class LLVMModuleSet
void initSVFFunction();
void initSVFBasicBlock(const Function* func);
void initDomTree(SVFFunction* func, const Function* f);
void setValueAttr(const Value* val, SVFValue* value);
void addToSVFVar2LLVMValueMap(const Value* val, SVFBaseNode* svfBaseNode);
void setValueAttr(const Value* val, SVFLLVMValue* value);
void addToSVFVar2LLVMValueMap(const Value* val, SVFValue* svfBaseNode);
void buildFunToFunMap();
void buildGlobalDefToRepMap();
/// Invoke llvm passes to modify module
Expand Down
4 changes: 2 additions & 2 deletions svf-llvm/include/SVF-LLVM/LLVMUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include "Util/SVFUtil.h"
#include "SVF-LLVM/BasicTypes.h"
#include "SVF-LLVM/SVFValue.h"
#include "SVF-LLVM/SVFLLVMValue.h"
#include "Util/ThreadAPI.h"

namespace SVF
Expand Down Expand Up @@ -377,7 +377,7 @@ inline bool isConstDataOrAggData(const Value* val)
const Value* getGlobalRep(const Value* val);

/// Check whether this value points-to a constant object
bool isConstantObjSym(const SVFValue* val);
bool isConstantObjSym(const SVFLLVMValue* val);

/// Check whether this value points-to a constant object
bool isConstantObjSym(const Value* val);
Expand Down
2 changes: 1 addition & 1 deletion svf-llvm/include/SVF-LLVM/ObjTypeInference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include "Util/SVFUtil.h"
#include "SVF-LLVM/BasicTypes.h"
#include "SVF-LLVM/SVFValue.h"
#include "SVF-LLVM/SVFLLVMValue.h"
#include "Util/ThreadAPI.h"

namespace SVF
Expand Down
12 changes: 6 additions & 6 deletions svf-llvm/include/SVF-LLVM/SVFIRBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class SVFIRBuilder: public llvm::InstVisitor<SVFIRBuilder>
SVFIR* pag;
SVFModule* svfModule;
const SVFBasicBlock* curBB; ///< Current basic block during SVFIR construction when visiting the module
const SVFValue* curVal; ///< Current Value during SVFIR construction when visiting the module
const SVFLLVMValue* curVal; ///< Current Value during SVFIR construction when visiting the module

public:
/// Constructor
Expand Down Expand Up @@ -93,14 +93,14 @@ class SVFIRBuilder: public llvm::InstVisitor<SVFIRBuilder>
processCE(V);

// strip off the constant cast and return the value node
SVFValue* svfVal = llvmModuleSet()->getSVFValue(V);
SVFLLVMValue* svfVal = llvmModuleSet()->getSVFValue(V);
return llvmModuleSet()->getValueNode(svfVal);
}

/// GetObject - Return the object node (stack/global/heap/function) according to a LLVM Value
inline NodeID getObjectNode(const Value* V)
{
SVFValue* svfVal = llvmModuleSet()->getSVFValue(V);
SVFLLVMValue* svfVal = llvmModuleSet()->getSVFValue(V);
return llvmModuleSet()->getObjectNode(svfVal);
}

Expand Down Expand Up @@ -246,12 +246,12 @@ class SVFIRBuilder: public llvm::InstVisitor<SVFIRBuilder>
curBB = (bb == nullptr? nullptr : llvmModuleSet()->getSVFBasicBlock(bb));
curVal = (val == nullptr ? nullptr: llvmModuleSet()->getSVFValue(val));
}
inline void setCurrentLocation(const SVFValue* val, const SVFBasicBlock* bb)
inline void setCurrentLocation(const SVFLLVMValue* val, const SVFBasicBlock* bb)
{
curBB = bb;
curVal = val;
}
inline const SVFValue* getCurrentValue() const
inline const SVFLLVMValue* getCurrentValue() const
{
return curVal;
}
Expand All @@ -263,7 +263,7 @@ class SVFIRBuilder: public llvm::InstVisitor<SVFIRBuilder>
/// Add global black hole Address edge
void addGlobalBlackHoleAddrEdge(NodeID node, const ConstantExpr *int2Ptrce)
{
const SVFValue* cval = getCurrentValue();
const SVFLLVMValue* cval = getCurrentValue();
const SVFBasicBlock* cbb = getCurrentBB();
setCurrentLocation(int2Ptrce,nullptr);
addBlackHoleAddrEdge(node);
Expand Down
Loading
Loading