diff options
| -rw-r--r-- | lib/Transforms/Utils/CloneFunction.cpp | 33 | ||||
| -rw-r--r-- | test/Transforms/Inline/blockaddress.ll | 27 |
2 files changed, 59 insertions, 1 deletions
diff --git a/lib/Transforms/Utils/CloneFunction.cpp b/lib/Transforms/Utils/CloneFunction.cpp index cf21f1e..c6dfe73 100644 --- a/lib/Transforms/Utils/CloneFunction.cpp +++ b/lib/Transforms/Utils/CloneFunction.cpp @@ -113,8 +113,23 @@ void llvm::CloneFunctionInto(Function *NewFunc, const Function *OldFunc, // Create a new basic block and copy instructions into it! BasicBlock *CBB = CloneBasicBlock(&BB, VMap, NameSuffix, NewFunc, CodeInfo); - VMap[&BB] = CBB; // Add basic block mapping. + // Add basic block mapping. + VMap[&BB] = CBB; + + // It is only legal to clone a function if a block address within that + // function is never referenced outside of the function. Given that, we + // want to map block addresses from the old function to block addresses in + // the clone. (This is different from the generic ValueMapper + // implementation, which generates an invalid blockaddress when + // cloning a function.) + if (BB.hasAddressTaken()) { + Constant *OldBBAddr = BlockAddress::get(const_cast<Function*>(OldFunc), + const_cast<BasicBlock*>(&BB)); + VMap[OldBBAddr] = BlockAddress::get(NewFunc, CBB); + } + + // Note return instructions for the caller. if (ReturnInst *RI = dyn_cast<ReturnInst>(CBB->getTerminator())) Returns.push_back(RI); } @@ -224,6 +239,22 @@ void PruningFunctionCloner::CloneBlock(const BasicBlock *BB, BBEntry = NewBB = BasicBlock::Create(BB->getContext()); if (BB->hasName()) NewBB->setName(BB->getName()+NameSuffix); + // It is only legal to clone a function if a block address within that + // function is never referenced outside of the function. Given that, we + // want to map block addresses from the old function to block addresses in + // the clone. (This is different from the generic ValueMapper + // implementation, which generates an invalid blockaddress when + // cloning a function.) + // + // Note that we don't need to fix the mapping for unreachable blocks; + // the default mapping there is safe. + if (BB->hasAddressTaken()) { + Constant *OldBBAddr = BlockAddress::get(const_cast<Function*>(OldFunc), + const_cast<BasicBlock*>(BB)); + VMap[OldBBAddr] = BlockAddress::get(NewFunc, NewBB); + } + + bool hasCalls = false, hasDynamicAllocas = false, hasStaticAllocas = false; // Loop over all instructions, and copy them over, DCE'ing as we go. This diff --git a/test/Transforms/Inline/blockaddress.ll b/test/Transforms/Inline/blockaddress.ll new file mode 100644 index 0000000..4206312 --- /dev/null +++ b/test/Transforms/Inline/blockaddress.ll @@ -0,0 +1,27 @@ +; RUN: opt -inline -S < %s | FileCheck %s +; PR10162 + +; Make sure the blockaddress is mapped correctly when doit is inlined +; CHECK: store i8* blockaddress(@f, %here.i), i8** @ptr1, align 8 + +@i = global i32 1, align 4 +@ptr1 = common global i8* null, align 8 + +define void @doit(i8** nocapture %pptr, i32 %cond) nounwind uwtable { +entry: + %tobool = icmp eq i32 %cond, 0 + br i1 %tobool, label %if.end, label %here + +here: + store i8* blockaddress(@doit, %here), i8** %pptr, align 8 + br label %if.end + +if.end: + ret void +} + +define void @f(i32 %cond) nounwind uwtable { +entry: + call void @doit(i8** @ptr1, i32 %cond) + ret void +} |