RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 12:41:49 +01:00
Code Issues Projects Releases Wiki Activity

Disable InstCombine unsafe folding bitcasts of calls w/ varargs.

Browse Source 
Changing arguments from being passed as fixed to varargs is unsafe, as
the ABI may require they be handled differently (stack vs. register, for
example).

Remove two tests which rely on the bitcast being folded into the direct
call, which is exactly the transformation that's unsafe.

llvm-svn: 149457
This commit is contained in:
Jim Grosbach 2012-02-01 00:08:17 +00:00
parent b4cc72d103
commit 6186319c3f
3 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Transforms/InstCombine/InstCombineCalls.cpp
View File

@ -1105,21 +1105,12 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) {
if (FT->isVarArg()!=cast<FunctionType>(APTy->getElementType())->isVarArg())
return false;
}
if (FT->getNumParams() < NumActualArgs && FT->isVarArg() &&
!CallerPAL.isEmpty())
// In this case we have more arguments than the new function type, but we
// won't be dropping them. Check that these extra arguments have attributes
// that are compatible with being a vararg call argument.
for (unsigned i = CallerPAL.getNumSlots(); i; --i) {
if (CallerPAL.getSlot(i - 1).Index <= FT->getNumParams())
break;
Attributes PAttrs = CallerPAL.getSlot(i - 1).Attrs;
if (PAttrs & Attribute::VarArgsIncompatible)
return false;
}
// If we're casting varargs to non-varargs, that may not be allowable
// under the ABI, so conservatively don't do anything.
if (FT->getNumParams() < NumActualArgs && FT->isVarArg())
return false;
// Okay, we decided that this is a safe thing to do: go ahead and start
// inserting cast instructions as necessary.
std::vector<Value*> Args;

23
test/Transforms/InstCombine/2008-01-06-BitCastAttributes.ll
View File

@ -1,23 +0,0 @@
; Ignore stderr, we expect warnings there
; RUN: opt < %s -instcombine 2> /dev/null -S | not grep bitcast
define void @a() {
ret void
}
define signext i32 @b(i32* inreg %x) {
ret i32 0
}
define void @c(...) {
ret void
}
define void @g(i32* %y) {
call void bitcast (void ()* @a to void (i32*)*)( i32* noalias %y )
call <2 x i32> bitcast (i32 (i32*)* @b to <2 x i32> (i32*)*)( i32* inreg null ) ; <<2 x i32>>:1 [#uses=0]
%x = call i64 bitcast (i32 (i32*)* @b to i64 (i32)*)( i32 0 ) ; <i64> [#uses=0]
call void bitcast (void (...)* @c to void (i32)*)( i32 0 )
call void bitcast (void (...)* @c to void (i32)*)( i32 zeroext 0 )
ret void
}

14
test/Transforms/InstCombine/call.ll
View File

@ -30,20 +30,6 @@ define i32 @test2(i32 %A) {
}
; Resolving this should insert a cast from sbyte to int, following the C
; promotion rules.
define void @test3a(i8, ...) {unreachable }
define void @test3(i8 %A, i8 %B) {
call void bitcast (void (i8, ...)* @test3a to void (i8, i8)*)( i8 %A, i8 %B
)
ret void
; CHECK: %1 = zext i8 %B to i32
; CHECK: call void (i8, ...)* @test3a(i8 %A, i32 %1)
; CHECK: ret void
}
; test conversion of return value...
define i8 @test4a() {
ret i8 0