Nigel
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CrossDSOCFI] Change the pass so that it doesn't require doInitialization() 

Differential Revision:  http://reviews.llvm.org/D21357

llvm-svn: 274910
This commit is contained in:
Davide Italiano 2016-07-08 19:30:06 +00:00
parent 6091492e2c
commit b4b9db81f2
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
llvm/lib/Transforms/IPO/CrossDSOCFI.cpp
View File

@ -46,13 +46,10 @@ struct CrossDSOCFI : public ModulePass {
initializeCrossDSOCFIPass(*PassRegistry::getPassRegistry()); initializeCrossDSOCFIPass(*PassRegistry::getPassRegistry());
} }
Module *M;
MDNode *VeryLikelyWeights; MDNode *VeryLikelyWeights;
ConstantInt *extractNumericTypeId(MDNode *MD); ConstantInt *extractNumericTypeId(MDNode *MD);
void buildCFICheck(); void buildCFICheck(Module &M);
bool doInitialization(Module &M) override;
bool runOnModule(Module &M) override; bool runOnModule(Module &M) override;
}; };
@ -65,14 +62,6 @@ char CrossDSOCFI::ID = 0;
ModulePass *llvm::createCrossDSOCFIPass() { return new CrossDSOCFI; } ModulePass *llvm::createCrossDSOCFIPass() { return new CrossDSOCFI; }
bool CrossDSOCFI::doInitialization(Module &Mod) {
M = &Mod;
VeryLikelyWeights =
MDBuilder(M->getContext()).createBranchWeights((1U << 20) - 1, 1);
return false;
}
/// Extracts a numeric type identifier from an MDNode containing type metadata. /// Extracts a numeric type identifier from an MDNode containing type metadata.
ConstantInt *CrossDSOCFI::extractNumericTypeId(MDNode *MD) { ConstantInt *CrossDSOCFI::extractNumericTypeId(MDNode *MD) {
// This check excludes vtables for classes inside anonymous namespaces. // This check excludes vtables for classes inside anonymous namespaces.
@ -88,12 +77,12 @@ ConstantInt *CrossDSOCFI::extractNumericTypeId(MDNode *MD) {
} }
/// buildCFICheck - emits __cfi_check for the current module. /// buildCFICheck - emits __cfi_check for the current module.
void CrossDSOCFI::buildCFICheck() { void CrossDSOCFI::buildCFICheck(Module &M) {
// FIXME: verify that __cfi_check ends up near the end of the code section, // FIXME: verify that __cfi_check ends up near the end of the code section,
// but before the jump slots created in LowerTypeTests. // but before the jump slots created in LowerTypeTests.
llvm::DenseSet<uint64_t> TypeIds; llvm::DenseSet<uint64_t> TypeIds;
SmallVector<MDNode *, 2> Types; SmallVector<MDNode *, 2> Types;
for (GlobalObject &GO : M->global_objects()) { for (GlobalObject &GO : M.global_objects()) {
Types.clear(); Types.clear();
GO.getMetadata(LLVMContext::MD_type, Types); GO.getMetadata(LLVMContext::MD_type, Types);
for (MDNode *Type : Types) { for (MDNode *Type : Types) {
@ -105,8 +94,8 @@ void CrossDSOCFI::buildCFICheck() {
} }
} }
LLVMContext &Ctx = M->getContext(); LLVMContext &Ctx = M.getContext();
Constant *C = M->getOrInsertFunction( Constant *C = M.getOrInsertFunction(
"__cfi_check", Type::getVoidTy(Ctx), Type::getInt64Ty(Ctx), "__cfi_check", Type::getVoidTy(Ctx), Type::getInt64Ty(Ctx),
Type::getInt8PtrTy(Ctx), Type::getInt8PtrTy(Ctx), nullptr); Type::getInt8PtrTy(Ctx), Type::getInt8PtrTy(Ctx), nullptr);
Function *F = dyn_cast<Function>(C); Function *F = dyn_cast<Function>(C);
@ -125,7 +114,7 @@ void CrossDSOCFI::buildCFICheck() {
BasicBlock *TrapBB = BasicBlock::Create(Ctx, "fail", F); BasicBlock *TrapBB = BasicBlock::Create(Ctx, "fail", F);
IRBuilder<> IRBFail(TrapBB); IRBuilder<> IRBFail(TrapBB);
Constant *CFICheckFailFn = M->getOrInsertFunction( Constant *CFICheckFailFn = M.getOrInsertFunction(
"__cfi_check_fail", Type::getVoidTy(Ctx), Type::getInt8PtrTy(Ctx), "__cfi_check_fail", Type::getVoidTy(Ctx), Type::getInt8PtrTy(Ctx),
Type::getInt8PtrTy(Ctx), nullptr); Type::getInt8PtrTy(Ctx), nullptr);
IRBFail.CreateCall(CFICheckFailFn, {&CFICheckFailData, &Addr}); IRBFail.CreateCall(CFICheckFailFn, {&CFICheckFailData, &Addr});
@ -140,7 +129,7 @@ void CrossDSOCFI::buildCFICheck() {
ConstantInt *CaseTypeId = ConstantInt::get(Type::getInt64Ty(Ctx), TypeId); ConstantInt *CaseTypeId = ConstantInt::get(Type::getInt64Ty(Ctx), TypeId);
BasicBlock *TestBB = BasicBlock::Create(Ctx, "test", F); BasicBlock *TestBB = BasicBlock::Create(Ctx, "test", F);
IRBuilder<> IRBTest(TestBB); IRBuilder<> IRBTest(TestBB);
Function *BitsetTestFn = Intrinsic::getDeclaration(M, Intrinsic::type_test); Function *BitsetTestFn = Intrinsic::getDeclaration(&M, Intrinsic::type_test);
Value *Test = IRBTest.CreateCall( Value *Test = IRBTest.CreateCall(
BitsetTestFn, {&Addr, MetadataAsValue::get( BitsetTestFn, {&Addr, MetadataAsValue::get(
@ -157,8 +146,10 @@ bool CrossDSOCFI::runOnModule(Module &M) {
if (skipModule(M)) if (skipModule(M))
return false; return false;
VeryLikelyWeights =
MDBuilder(M.getContext()).createBranchWeights((1U << 20) - 1, 1);
if (M.getModuleFlag("Cross-DSO CFI") == nullptr) if (M.getModuleFlag("Cross-DSO CFI") == nullptr)
return false; return false;
buildCFICheck(); buildCFICheck(M);
return true; return true;
} }