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

Simplifications in Helper Analyses #740

Open
wants to merge 4 commits into
base: development
Choose a base branch
from
Open

Simplifications in Helper Analyses #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
728616c
some changes
fabianbs96 May 17, 2024
2cef28a
minor in CG
fabianbs96 May 21, 2024
7cfe14f
minor
fabianbs96 Dec 15, 2024
fe488ca
Quick-fix LLVMTypeHierarchyTest
fabianbs96 Jun 4, 2024
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 include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
}

[[nodiscard]] llvm::Function *buildCRuntimeGlobalCtorsDtorsModel(
llvm::Module &M, llvm::ArrayRef<llvm::Function *> UserEntryPoints);
LLVMProjectIRDB &IRDB, llvm::ArrayRef<llvm::Function *> UserEntryPoints);

void initialize(LLVMProjectIRDB *IRDB, Resolver &CGResolver,
llvm::ArrayRef<std::string> EntryPoints, Soundness S,
Expand Down
6 changes: 3 additions & 3 deletions include/phasar/PhasarLLVM/TaintConfig/TaintConfigData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ struct FunctionData {

std::string Name;
TaintCategory ReturnCat{};
std::vector<uint32_t> SourceValues;
std::vector<uint32_t> SinkValues;
std::vector<uint32_t> SanitizerValues;
std::vector<uint32_t> SourceValues{};
std::vector<uint32_t> SinkValues{};
std::vector<uint32_t> SanitizerValues{};
bool HasAllSinkParam = false;
};

Expand Down
14 changes: 3 additions & 11 deletions lib/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ static bool fillPossibleTargets(
Resolver::FunctionSetTy &PossibleTargets, Resolver &Res,
const llvm::CallBase *CS,
llvm::DenseMap<const llvm::Instruction *, unsigned int> &IndirectCalls) {
if (const auto *StaticCallee = CS->getCalledFunction()) {
if (const auto *StaticCallee = llvm::dyn_cast<llvm::Function>(
CS->getCalledOperand()->stripPointerCastsAndAliases())) {
PossibleTargets.insert(StaticCallee);

PHASAR_LOG_LEVEL_CAT(DEBUG, "LLVMBasedICFG",
Expand All @@ -115,16 +116,7 @@ static bool fillPossibleTargets(
return true;
}

// still try to resolve the called function statically
const llvm::Value *SV = CS->getCalledOperand()->stripPointerCastsAndAliases();
if (const auto *ValueFunction = llvm::dyn_cast<llvm::Function>(SV)) {
PossibleTargets.insert(ValueFunction);
PHASAR_LOG_LEVEL_CAT(DEBUG, "LLVMBasedICFG",
"Found static call-site: " << llvmIRToString(CS));
return true;
}

if (llvm::isa<llvm::InlineAsm>(SV)) {
if (llvm::isa<llvm::InlineAsm>(CS->getCalledOperand())) {
return true;
}

Expand Down
45 changes: 28 additions & 17 deletions lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,12 @@ LLVMTypeHierarchy::removeStructOrClassPrefix(const llvm::StructType &T) {
std::string
LLVMTypeHierarchy::removeStructOrClassPrefix(llvm::StringRef TypeName) {
if (TypeName.startswith(StructPrefix)) {
return TypeName.drop_front(StructPrefix.size()).str();
TypeName = TypeName.drop_front(StructPrefix.size());
} else if (TypeName.startswith(ClassPrefix)) {
TypeName = TypeName.drop_front(ClassPrefix.size());
}
if (TypeName.startswith(ClassPrefix)) {
return TypeName.drop_front(ClassPrefix.size()).str();
if (TypeName.endswith(".base")) {
TypeName = TypeName.drop_back(llvm::StringRef(".base").size());
}
return TypeName.str();
}
Expand Down Expand Up @@ -231,18 +233,15 @@ LLVMTypeHierarchy::getSubTypes(const llvm::Module & /*M*/,
if (const auto *I =
llvm::dyn_cast<llvm::ConstantStruct>(TI->getInitializer())) {
for (const auto &Op : I->operands()) {
if (auto *CE = llvm::dyn_cast<llvm::ConstantExpr>(Op)) {
if (auto *BC = llvm::dyn_cast<llvm::BitCastOperator>(CE)) {
if (BC->getOperand(0)->hasName()) {
auto Name = BC->getOperand(0)->getName();
if (Name.find(TypeInfoPrefix) != llvm::StringRef::npos) {
auto ClearName =
removeTypeInfoPrefix(llvm::demangle(Name.str()));
if (auto TypeIt = ClearNameTypeMap.find(ClearName);
TypeIt != ClearNameTypeMap.end()) {
SubTypes.push_back(TypeIt->second);
}
}
const auto *CE = Op->stripPointerCastsAndAliases();

if (CE->hasName()) {
auto Name = CE->getName();
if (Name.find(TypeInfoPrefix) != llvm::StringRef::npos) {
auto ClearName = removeTypeInfoPrefix(llvm::demangle(Name.str()));
if (auto TypeIt = ClearNameTypeMap.find(ClearName);
TypeIt != ClearNameTypeMap.end()) {
SubTypes.push_back(TypeIt->second);
}
}
}
Expand Down Expand Up @@ -329,8 +328,9 @@ LLVMTypeHierarchy::getSubTypes(const llvm::StructType *Type) const {
return {};
}

const llvm::StructType *
LLVMTypeHierarchy::getType(llvm::StringRef TypeName) const {
template <typename GraphT>
static const llvm::StructType *getTypeImpl(const GraphT &TypeGraph,
llvm::StringRef TypeName) {
for (auto V : boost::make_iterator_range(boost::vertices(TypeGraph))) {
if (TypeGraph[V].Type->getName() == TypeName) {
return TypeGraph[V].Type;
Expand All @@ -339,6 +339,17 @@ LLVMTypeHierarchy::getType(llvm::StringRef TypeName) const {
return nullptr;
}

const llvm::StructType *
LLVMTypeHierarchy::getType(llvm::StringRef TypeName) const {
if (const auto *Ty = getTypeImpl(TypeGraph, TypeName)) {
return Ty;
}

// Sometimes, clang adds a .base suffix
std::string TN = TypeName.str() + ".base";
return getTypeImpl(TypeGraph, TypeName);
}

std::vector<const llvm::StructType *> LLVMTypeHierarchy::getAllTypes() const {
std::vector<const llvm::StructType *> Types;
Types.reserve(boost::num_vertices(TypeGraph));
Expand Down
20 changes: 4 additions & 16 deletions lib/PhasarLLVM/TypeHierarchy/LLVMVFTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,10 @@ LLVMVFTable::getVFVectorFromIRVTable(const llvm::ConstantStruct &VT) {
// is RTTI
for (const auto *It = std::next(CA->operands().begin(), 2);
It != CA->operands().end(); ++It) {
const auto &COp = *It;
if (const auto *CE = llvm::dyn_cast<llvm::ConstantExpr>(COp)) {
if (const auto *BC = llvm::dyn_cast<llvm::BitCastOperator>(CE)) {
// if the entry is a GlobalAlias, get its Aliasee
auto *Entry = BC->getOperand(0);
while (auto *GA = llvm::dyn_cast<llvm::GlobalAlias>(Entry)) {
Entry = GA->getAliasee();
}
auto *F = llvm::dyn_cast<llvm::Function>(Entry);
VFS.push_back(F);
} else {
VFS.push_back(nullptr);
}
} else {
VFS.push_back(nullptr);
}
const auto *Entry = It->get()->stripPointerCastsAndAliases();

const auto *F = llvm::dyn_cast<llvm::Function>(Entry);
VFS.push_back(F);
}
}
}
Expand Down
8 changes: 3 additions & 5 deletions unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchyTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ TEST(LTHTest, BasicTHReconstruction_1) {
LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles +
"type_hierarchies/type_hierarchy_1_cpp.ll");
LLVMTypeHierarchy LTH(IRDB);
EXPECT_EQ(LTH.hasType(LTH.getType("struct.Base")), true);
EXPECT_EQ(LTH.hasType(LTH.getType("struct.Child")), true);

ASSERT_EQ(LTH.hasType(LTH.getType("struct.Base")), true);
ASSERT_EQ(LTH.hasType(LTH.getType("struct.Child")), true);
EXPECT_EQ(LTH.getAllTypes().size(), 2U);
EXPECT_EQ(
LTH.isSubType(LTH.getType("struct.Base"), LTH.getType("struct.Child")),
Expand Down Expand Up @@ -163,12 +164,10 @@ TEST(LTHTest, BasicTHReconstruction_7) {
LLVMTypeHierarchy LTH(IRDB);
EXPECT_EQ(LTH.hasType(LTH.getType("struct.Base")), true);
EXPECT_EQ(LTH.hasType(LTH.getType("struct.Child")), true);
// has three types because of padding (introduction of intermediate type)
EXPECT_EQ(LTH.getAllTypes().size(), 3U);
EXPECT_EQ(
LTH.isSubType(LTH.getType("struct.Base"), LTH.getType("struct.Child")),
true);

EXPECT_EQ(LTH.getSubTypes(LTH.getType("struct.Base")).size(), 2U);
EXPECT_EQ(LTH.getSubTypes(LTH.getType("struct.Child")).size(), 1U);
auto BaseReachable = LTH.getSubTypes(LTH.getType("struct.Base"));
Expand Down Expand Up @@ -268,7 +267,6 @@ TEST(LTHTest, TransitivelyReachableTypes) {
ASSERT_TRUE(ReachableTypesNonvirtualstruct3.size() == 1U);

ASSERT_TRUE(ReachableTypesBase4.count(TH4.getType("struct.Base")));
ASSERT_FALSE(ReachableTypesBase4.count(TH4.getType("struct.Base.base")));
ASSERT_TRUE(ReachableTypesBase4.count(TH4.getType("struct.Child")));
ASSERT_TRUE(ReachableTypesBase4.size() == 2U);
ASSERT_TRUE(ReachableTypesChild4.count(TH4.getType("struct.Child")));
Expand Down