[llvm] r175635 - Fix bug 14779 for passing anonymous aggregates [patch by Kai Nacke].
Bill Schmidt
wschmidt at linux.vnet.ibm.com
Wed Feb 20 09:31:42 PST 2013
Author: wschmidt
Date: Wed Feb 20 11:31:41 2013
New Revision: 175635
URL: http://llvm.org/viewvc/llvm-project?rev=175635&view=rev
Log:
Fix bug 14779 for passing anonymous aggregates [patch by Kai Nacke].
The PPC backend doesn't handle these correctly. This patch uses logic
similar to that in the X86 and ARM backends to track these arguments
properly.
Added:
llvm/trunk/test/CodeGen/PowerPC/anon_aggr.ll
Modified:
llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
Modified: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp?rev=175635&r1=175634&r2=175635&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp Wed Feb 20 11:31:41 2013
@@ -2163,13 +2163,16 @@ PPCTargetLowering::LowerFormalArguments_
SmallVector<SDValue, 8> MemOps;
unsigned nAltivecParamsAtEnd = 0;
Function::const_arg_iterator FuncArg = MF.getFunction()->arg_begin();
- for (unsigned ArgNo = 0, e = Ins.size(); ArgNo != e; ++ArgNo, ++FuncArg) {
+ unsigned CurArgIdx = 0;
+ for (unsigned ArgNo = 0, e = Ins.size(); ArgNo != e; ++ArgNo) {
SDValue ArgVal;
bool needsLoad = false;
EVT ObjectVT = Ins[ArgNo].VT;
unsigned ObjSize = ObjectVT.getSizeInBits()/8;
unsigned ArgSize = ObjSize;
ISD::ArgFlagsTy Flags = Ins[ArgNo].Flags;
+ std::advance(FuncArg, Ins[ArgNo].OrigArgIndex - CurArgIdx);
+ CurArgIdx = Ins[ArgNo].OrigArgIndex;
unsigned CurArgOffset = ArgOffset;
@@ -2504,6 +2507,9 @@ PPCTargetLowering::LowerFormalArguments_
SmallVector<SDValue, 8> MemOps;
unsigned nAltivecParamsAtEnd = 0;
+ // FIXME: FuncArg and Ins[ArgNo] must reference the same argument.
+ // When passing anonymous aggregates, this is currently not true.
+ // See LowerFormalArguments_64SVR4 for a fix.
Function::const_arg_iterator FuncArg = MF.getFunction()->arg_begin();
for (unsigned ArgNo = 0, e = Ins.size(); ArgNo != e; ++ArgNo, ++FuncArg) {
SDValue ArgVal;
Added: llvm/trunk/test/CodeGen/PowerPC/anon_aggr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/anon_aggr.ll?rev=175635&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/anon_aggr.ll (added)
+++ llvm/trunk/test/CodeGen/PowerPC/anon_aggr.ll Wed Feb 20 11:31:41 2013
@@ -0,0 +1,99 @@
+; RUN: llc -O0 -mcpu=pwr7 -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s
+
+; Test case for PR 14779: anonymous aggregates are not handled correctly.
+; The bug is triggered by passing a byval structure after an anonymous
+; aggregate.
+
+%tarray = type { i64, i8* }
+
+define i8* @func1({ i64, i8* } %array, i8* %ptr) {
+entry:
+ %array_ptr = extractvalue {i64, i8* } %array, 1
+ %cond = icmp eq i8* %array_ptr, %ptr
+ br i1 %cond, label %equal, label %unequal
+equal:
+ ret i8* %array_ptr
+unequal:
+ ret i8* %ptr
+}
+
+; CHECK: func1:
+; CHECK: cmpld {{[0-9]+}}, 4, 5
+; CHECK: std 4, -[[OFFSET1:[0-9]+]]
+; CHECK: std 5, -[[OFFSET2:[0-9]+]]
+; CHECK: ld 3, -[[OFFSET1]](1)
+; CHECK: ld 3, -[[OFFSET2]](1)
+
+
+define i8* @func2({ i64, i8* } %array1, %tarray* byval %array2) {
+entry:
+ %array1_ptr = extractvalue {i64, i8* } %array1, 1
+ %tmp = getelementptr inbounds %tarray* %array2, i32 0, i32 1
+ %array2_ptr = load i8** %tmp
+ %cond = icmp eq i8* %array1_ptr, %array2_ptr
+ br i1 %cond, label %equal, label %unequal
+equal:
+ ret i8* %array1_ptr
+unequal:
+ ret i8* %array2_ptr
+}
+
+; CHECK: func2:
+; CHECK: addi [[REG1:[0-9]+]], 1, 64
+; CHECK: ld [[REG2:[0-9]+]], 8([[REG1]])
+; CHECK: cmpld {{[0-9]+}}, 4, [[REG2]]
+; CHECK: std [[REG2]], -[[OFFSET1:[0-9]+]]
+; CHECK: std 4, -[[OFFSET2:[0-9]+]]
+; CHECK: ld 3, -[[OFFSET2]](1)
+; CHECK: ld 3, -[[OFFSET1]](1)
+
+define i8* @func3({ i64, i8* }* byval %array1, %tarray* byval %array2) {
+entry:
+ %tmp1 = getelementptr inbounds { i64, i8* }* %array1, i32 0, i32 1
+ %array1_ptr = load i8** %tmp1
+ %tmp2 = getelementptr inbounds %tarray* %array2, i32 0, i32 1
+ %array2_ptr = load i8** %tmp2
+ %cond = icmp eq i8* %array1_ptr, %array2_ptr
+ br i1 %cond, label %equal, label %unequal
+equal:
+ ret i8* %array1_ptr
+unequal:
+ ret i8* %array2_ptr
+}
+
+; CHECK: func3:
+; CHECK: addi [[REG1:[0-9]+]], 1, 64
+; CHECK: addi [[REG2:[0-9]+]], 1, 48
+; CHECK: ld [[REG3:[0-9]+]], 8([[REG1]])
+; CHECK: ld [[REG4:[0-9]+]], 8([[REG2]])
+; CHECK: cmpld {{[0-9]+}}, [[REG4]], [[REG3]]
+; CHECK: std [[REG3]], -[[OFFSET1:[0-9]+]](1)
+; CHECK: std [[REG4]], -[[OFFSET2:[0-9]+]](1)
+; CHECK: ld 3, -[[OFFSET2]](1)
+; CHECK: ld 3, -[[OFFSET1]](1)
+
+define i8* @func4(i64 %p1, i64 %p2, i64 %p3, i64 %p4,
+ i64 %p5, i64 %p6, i64 %p7, i64 %p8,
+ { i64, i8* } %array1, %tarray* byval %array2) {
+entry:
+ %array1_ptr = extractvalue {i64, i8* } %array1, 1
+ %tmp = getelementptr inbounds %tarray* %array2, i32 0, i32 1
+ %array2_ptr = load i8** %tmp
+ %cond = icmp eq i8* %array1_ptr, %array2_ptr
+ br i1 %cond, label %equal, label %unequal
+equal:
+ ret i8* %array1_ptr
+unequal:
+ ret i8* %array2_ptr
+}
+
+; CHECK: func4:
+; CHECK: addi [[REG1:[0-9]+]], 1, 128
+; CHECK: ld [[REG2:[0-9]+]], 120(1)
+; CHECK: ld [[REG3:[0-9]+]], 8([[REG1]])
+; CHECK: cmpld {{[0-9]+}}, [[REG2]], [[REG3]]
+; CHECK: std [[REG2]], -[[OFFSET1:[0-9]+]](1)
+; CHECK: std [[REG3]], -[[OFFSET2:[0-9]+]](1)
+; CHECK: ld 3, -[[OFFSET1]](1)
+; CHECK: ld 3, -[[OFFSET2]](1)
+
More information about the llvm-commits
mailing list