[llvm] r271374 - [Sparc] Allow passing of empty structs.

Chris Dewhurst via llvm-commits llvm-commits at lists.llvm.org
Wed Jun 1 01:48:57 PDT 2016


Author: lerochris
Date: Wed Jun  1 03:48:56 2016
New Revision: 271374

URL: http://llvm.org/viewvc/llvm-project?rev=271374&view=rev
Log:
[Sparc] Allow passing of empty structs.

Passing an empty struct as a function call argument is now supported.

unit tests for various scenarios added.

Added:
    llvm/trunk/test/CodeGen/SPARC/zerostructcall.ll   (with props)
Modified:
    llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp

Modified: llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp?rev=271374&r1=271373&r2=271374&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp Wed Jun  1 03:48:56 2016
@@ -775,16 +775,22 @@ SparcTargetLowering::LowerCall_32(Target
     unsigned Size = Flags.getByValSize();
     unsigned Align = Flags.getByValAlign();
 
-    int FI = MFI->CreateStackObject(Size, Align, false);
-    SDValue FIPtr = DAG.getFrameIndex(FI, getPointerTy(DAG.getDataLayout()));
-    SDValue SizeNode = DAG.getConstant(Size, dl, MVT::i32);
-
-    Chain = DAG.getMemcpy(Chain, dl, FIPtr, Arg, SizeNode, Align,
-                          false,        // isVolatile,
-                          (Size <= 32), // AlwaysInline if size <= 32,
-                          false,        // isTailCall
-                          MachinePointerInfo(), MachinePointerInfo());
-    ByValArgs.push_back(FIPtr);
+    if (Size > 0U) {
+      int FI = MFI->CreateStackObject(Size, Align, false);
+      SDValue FIPtr = DAG.getFrameIndex(FI, getPointerTy(DAG.getDataLayout()));
+      SDValue SizeNode = DAG.getConstant(Size, dl, MVT::i32);
+
+      Chain = DAG.getMemcpy(Chain, dl, FIPtr, Arg, SizeNode, Align,
+                            false,        // isVolatile,
+                            (Size <= 32), // AlwaysInline if size <= 32,
+                            false,        // isTailCall
+                            MachinePointerInfo(), MachinePointerInfo());
+      ByValArgs.push_back(FIPtr);
+    }
+    else {
+      SDValue nullVal;
+      ByValArgs.push_back(nullVal);
+    }
   }
 
   Chain = DAG.getCALLSEQ_START(Chain, DAG.getIntPtrConstant(ArgsSize, dl, true),
@@ -805,8 +811,12 @@ SparcTargetLowering::LowerCall_32(Target
     ISD::ArgFlagsTy Flags = Outs[realArgIdx].Flags;
 
     // Use local copy if it is a byval arg.
-    if (Flags.isByVal())
+    if (Flags.isByVal()) {
       Arg = ByValArgs[byvalArgIdx++];
+      if (!Arg) {
+        continue;
+      }
+    }
 
     // Promote the value if needed.
     switch (VA.getLocInfo()) {

Added: llvm/trunk/test/CodeGen/SPARC/zerostructcall.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SPARC/zerostructcall.ll?rev=271374&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/SPARC/zerostructcall.ll (added)
+++ llvm/trunk/test/CodeGen/SPARC/zerostructcall.ll Wed Jun  1 03:48:56 2016
@@ -0,0 +1,51 @@
+; RUN: llc < %s -march=sparc | FileCheck %s
+
+; CHECK-LABEL: struct_ptr_test
+; CHECK:       call struct_ptr_fn
+; CHECK-NEXT:  st %i0, [%fp+-4]
+; CHECK-NEXT:  ret
+
+%struct.S = type {}
+
+define void @struct_ptr_test(i32 %i) {
+entry:
+  %i.addr = alloca i32, align 4
+  store i32 %i, i32* %i.addr, align 4
+  %0 = bitcast i32* %i.addr to %struct.S*
+  call void @struct_ptr_fn(%struct.S* byval align 1 %0)
+  ret void
+}
+
+declare void @struct_ptr_fn(%struct.S* byval align 1)
+
+; CHECK-LABEL: struct_test
+; CHECK:       call struct_fn
+; CHECK-NEXT:  nop
+; CHECK-NEXT:  ret
+
+%struct.U = type {}
+
+ at a = internal global [1 x %struct.U] zeroinitializer, align 1
+
+define void @struct_test() {
+entry:
+  tail call void @struct_fn(%struct.U* byval align 1 getelementptr inbounds ([1 x %struct.U], [1 x %struct.U]* @a, i32 0, i32 0))
+  ret void
+}
+
+; CHECK-LABEL: struct_arg_test
+; CHECK:       call struct_arg_fn
+; CHECK-NEXT:  nop
+; CHECK-NEXT:  ret
+
+declare void @struct_fn(%struct.U* byval align 1)
+
+ at b = internal global [1 x %struct.U] zeroinitializer, align 1
+
+define void @struct_arg_test() {
+entry:
+  tail call void @struct_arg_fn(%struct.U* byval align 1 getelementptr inbounds ([1 x %struct.U], [1 x %struct.U]* @b, i32 0, i32 0))
+  ret void
+}
+
+declare void @struct_arg_fn(%struct.U* byval align 1)

Propchange: llvm/trunk/test/CodeGen/SPARC/zerostructcall.ll
------------------------------------------------------------------------------
    svn:eol-style = native




More information about the llvm-commits mailing list