From aef35bb11755eb375632991b9f3f8aea66d05928 Mon Sep 17 00:00:00 2001
From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sun, 26 Aug 2018 13:00:14 +0100
Subject: [PATCH] D51108

===================================================================

Gbp-Pq: Name D51108.diff
---
 lib/Target/PowerPC/PPCISelLowering.cpp        | 16 +++++++++----
 .../ppc32-i1-stack-arguments-abi-bug.ll       | 24 +++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll

diff --git a/lib/Target/PowerPC/PPCISelLowering.cpp b/lib/Target/PowerPC/PPCISelLowering.cpp
index 26e9f13f..ac1062df 100644
--- a/lib/Target/PowerPC/PPCISelLowering.cpp
+++ b/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -3351,9 +3351,14 @@ SDValue PPCTargetLowering::LowerFormalArguments_32SVR4(
       // Argument stored in memory.
       assert(VA.isMemLoc());
 
+      // Get the extended size of the argument type in stack
       unsigned ArgSize = VA.getLocVT().getStoreSize();
-      int FI = MFI.CreateFixedObject(ArgSize, VA.getLocMemOffset(),
-                                     isImmutable);
+      // Get the actual size of the argument type
+      unsigned ObjSize = VA.getValVT().getStoreSize();
+      unsigned ArgOffset = VA.getLocMemOffset();
+      // Stack objects in PPC32 are right justified.
+      ArgOffset += ArgSize - ObjSize;
+      int FI = MFI.CreateFixedObject(ArgSize, ArgOffset, isImmutable);
 
       // Create load nodes to retrieve arguments from the stack.
       SDValue FIN = DAG.getFrameIndex(FI, PtrVT);
@@ -5303,10 +5308,11 @@ SDValue PPCTargetLowering::LowerCall_32SVR4(
       Arg = PtrOff;
     }
 
-    if (VA.isRegLoc()) {
-      if (Arg.getValueType() == MVT::i1)
-        Arg = DAG.getNode(ISD::ZERO_EXTEND, dl, MVT::i32, Arg);
+    // Ensure callee will get either 0x00000001 or 0x00000000.
+    if (Arg.getValueType() == MVT::i1)
+      Arg = DAG.getNode(ISD::ZERO_EXTEND, dl, MVT::i32, Arg);
 
+    if (VA.isRegLoc()) {
       seenFloatArg |= VA.getLocVT().isFloatingPoint();
       // Put argument in a physical register.
       RegsToPass.push_back(std::make_pair(VA.getLocReg(), Arg));
diff --git a/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll b/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
new file mode 100644
index 00000000..ccdde450
--- /dev/null
+++ b/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
@@ -0,0 +1,24 @@
+; RUN: llc -verify-machineinstrs < %s -mcpu=ppc32 -mattr=+crbits | FileCheck %s
+target triple = "powerpc-unknown-linux-gnu"
+
+define zeroext i1 @check_callee(
+  i1 zeroext, i1 zeroext, i1 zeroext, i1 zeroext,
+  i1 zeroext, i1 zeroext, i1 zeroext, i1 zeroext,
+  i1 zeroext %s1
+) {
+  call void @check_caller(
+    i1 zeroext true, i1 zeroext true, i1 zeroext true, i1 zeroext true,
+    i1 zeroext true, i1 zeroext true, i1 zeroext true, i1 zeroext true,
+    i1 zeroext %s1)
+  ret i1 true
+}
+
+; CHECK-LABEL: @check_callee
+; CHECK: lbz {{[0-9]+}}, 27(1)
+; CHECK: stw {{[0-9]+}}, 8(1)
+
+declare void @check_caller(
+  i1 zeroext, i1 zeroext, i1 zeroext, i1 zeroext,
+  i1 zeroext, i1 zeroext, i1 zeroext, i1 zeroext,
+  i1 zeroext
+)
-- 
2.30.2