diff options
| author | Dan Gohman <gohman@apple.com> | 2008-12-03 01:28:04 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2008-12-03 01:28:04 +0000 |
| commit | e4300e271afd663ada8b808c6d0c4878fb0256ef (patch) | |
| tree | 34a70fedf0b7a4b0710999472e2d5c50333b032e | |
| parent | 7f9b35200bf442c6d8978213f6117fe0d712325e (diff) | |
Fix byval arguments in the fastcc calling convention. The fastcc convention
delegates to the regular x86-32 convention which handles byval, but only
after it handles a few cases, and it's necessary to handle byval before
handling those cases. This fixes PR3122 (and rdar://6400815), llvm-gcc
miscompiling LLVM.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60453 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/X86/X86CallingConv.td | 5 | ||||
| -rw-r--r-- | test/CodeGen/X86/fastcc-byval.ll | 20 | ||||
| -rw-r--r-- | test/CodeGen/X86/tailcallbyval.ll | 3 |
3 files changed, 26 insertions, 2 deletions
diff --git a/lib/Target/X86/X86CallingConv.td b/lib/Target/X86/X86CallingConv.td index 385bd91618..0bda72d919 100644 --- a/lib/Target/X86/X86CallingConv.td +++ b/lib/Target/X86/X86CallingConv.td @@ -321,6 +321,11 @@ def CC_X86_32_FastCall : CallingConv<[ ]>; def CC_X86_32_FastCC : CallingConv<[ + // Handles byval parameters. Note that we can't rely on the delegation + // to CC_X86_32_Common for this because that happens after code that + // handles i32 arguments. + CCIfByVal<CCPassByVal<4, 4>>, + // Promote i8/i16 arguments to i32. CCIfType<[i8, i16], CCPromoteToType<i32>>, diff --git a/test/CodeGen/X86/fastcc-byval.ll b/test/CodeGen/X86/fastcc-byval.ll new file mode 100644 index 0000000000..9f6649c3b1 --- /dev/null +++ b/test/CodeGen/X86/fastcc-byval.ll @@ -0,0 +1,20 @@ +; RUN: llvm-as < %s | llc | grep {movl\[\[:space:\]\]*8(%esp), %eax} | count 2 +; PR3122 +; rdar://6400815 + +; byval requires a copy, even with fastcc. + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128" +target triple = "i386-apple-darwin9.5" + %struct.MVT = type { i32 } + +define fastcc i32 @bar() nounwind { + %V = alloca %struct.MVT + %a = getelementptr %struct.MVT* %V, i32 0, i32 0 + store i32 1, i32* %a + call fastcc void @foo(%struct.MVT* byval %V) nounwind + %t = load i32* %a + ret i32 %t +} + +declare fastcc void @foo(%struct.MVT* byval) diff --git a/test/CodeGen/X86/tailcallbyval.ll b/test/CodeGen/X86/tailcallbyval.ll index 2861bb1258..916be566a1 100644 --- a/test/CodeGen/X86/tailcallbyval.ll +++ b/test/CodeGen/X86/tailcallbyval.ll @@ -1,6 +1,5 @@ ; RUN: llvm-as < %s | llc -march=x86 -tailcallopt | grep TAILCALL -; check for the 2 byval moves -; RUN: llvm-as < %s | llc -march=x86 -tailcallopt | grep movl | grep ecx | grep eax | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=x86 -tailcallopt | grep {movl\[\[:space:\]\]*4(%esp), %eax} | count 1 %struct.s = type {i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 } |