diff options
author | Chris Lattner <sabre@nondot.org> | 2010-02-01 18:11:34 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-02-01 18:11:34 +0000 |
commit | d569561835b0fa4dbbb0fca1b1f0a8de6c01439a (patch) | |
tree | f0bf9cfda7327d5f4b3bc6bc62e68caa8d7b1f4e /lib/Transforms | |
parent | 830f3f205d8a77acbf8838fe78c2c733ca924d9c (diff) | |
download | external_llvm-d569561835b0fa4dbbb0fca1b1f0a8de6c01439a.zip external_llvm-d569561835b0fa4dbbb0fca1b1f0a8de6c01439a.tar.gz external_llvm-d569561835b0fa4dbbb0fca1b1f0a8de6c01439a.tar.bz2 |
fix rdar://7590304, a miscompilation of objc apps on arm. The caller
of objc message send was getting marked arm_apcscc, but the prototype
isn't. This is fine at runtime because objcmsgsend is implemented in
assembly. Only turn a mismatched caller and callee into 'unreachable'
if the callee is a definition.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94986 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms')
-rw-r--r-- | lib/Transforms/InstCombine/InstCombineCalls.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/Transforms/InstCombine/InstCombineCalls.cpp b/lib/Transforms/InstCombine/InstCombineCalls.cpp index 9c420c8..5de846e 100644 --- a/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -692,10 +692,14 @@ Instruction *InstCombiner::visitCallSite(CallSite CS) { Value *Callee = CS.getCalledValue(); if (Function *CalleeF = dyn_cast<Function>(Callee)) - if (CalleeF->getCallingConv() != CS.getCallingConv()) { + // If the call and callee calling conventions don't match, this call must + // be unreachable, as the call is undefined. + if (CalleeF->getCallingConv() != CS.getCallingConv() && + // Only do this for calls to a function with a body. A prototype may + // not actually end up matching the implementation's calling conv for a + // variety of reasons (e.g. it may be written in assembly). + !CalleeF->isDeclaration()) { Instruction *OldCall = CS.getInstruction(); - // If the call and callee calling conventions don't match, this call must - // be unreachable, as the call is undefined. new StoreInst(ConstantInt::getTrue(Callee->getContext()), UndefValue::get(Type::getInt1PtrTy(Callee->getContext())), OldCall); |