From 13d84b331e754c71e19700da7687c819093437f7 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Aug 18 2020 17:58:01 +0000
Subject: Fix rust crash on ppc64le compiling firefox


rhbz#1862012

---

diff --git a/0001-PowerPC-PPCBoolRetToInt-Skip-translation-if-there-is.patch b/0001-PowerPC-PPCBoolRetToInt-Skip-translation-if-there-is.patch
new file mode 100644
index 0000000..4489dab
--- /dev/null
+++ b/0001-PowerPC-PPCBoolRetToInt-Skip-translation-if-there-is.patch
@@ -0,0 +1,86 @@
+From cf54ca458afff1f7827bfbbc939429a00496c4f7 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Tue, 18 Aug 2020 10:54:49 -0700
+Subject: [PATCH] [PowerPC] PPCBoolRetToInt: Skip translation if there is
+ ConstantExpr
+
+PPCBoolRetToInt collects PHI, Argument, Call and Constant defs related to an `i1` value which later is translated to an `i32`/`i64` value. The `translate` method expects an `i1` value. However, if the `Constant` is a `ConstantExpr`, the type of the `ConstantExpr` might not be `i1`.
+
+Fixes https://bugs.llvm.org/show_bug.cgi?id=46923 which causes ICE
+```
+llvm-project/llvm/lib/IR/Constants.cpp:1924: static llvm::Constant *llvm::ConstantExpr::getZExt(llvm::Constant *, llvm::Type *, bool): Assertion `C->getType()->getScalarSizeInBits() < Ty->getScalarSizeInBits()&& "SrcTy must be smaller than DestTy for ZExt!"' failed.
+```
+
+Differential Revision: https://reviews.llvm.org/D85007
+---
+ llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp |  8 ++++--
+ llvm/test/CodeGen/PowerPC/pr46923.ll        | 31 +++++++++++++++++++++
+ 2 files changed, 37 insertions(+), 2 deletions(-)
+ create mode 100644 llvm/test/CodeGen/PowerPC/pr46923.ll
+
+diff --git a/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp b/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp
+index 2259a29f838..cfe3b3ce2e9 100644
+--- a/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp
++++ b/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp
+@@ -90,6 +90,9 @@ class PPCBoolRetToInt : public FunctionPass {
+ 
+   // Translate a i1 value to an equivalent i32/i64 value:
+   Value *translate(Value *V) {
++    assert(V->getType() == Type::getInt1Ty(V->getContext()) &&
++           "Expect an i1 value");
++
+     Type *IntTy = ST->isPPC64() ? Type::getInt64Ty(V->getContext())
+                                 : Type::getInt32Ty(V->getContext());
+ 
+@@ -227,8 +230,9 @@ class PPCBoolRetToInt : public FunctionPass {
+     // CallInst. Potentially, bitwise operations (AND, OR, XOR, NOT) and sign
+     // extension could also be handled in the future.
+     for (Value *V : Defs)
+-      if (!isa<PHINode>(V) && !isa<Constant>(V) &&
+-          !isa<Argument>(V) && !isa<CallInst>(V))
++      if ((!isa<PHINode>(V) && !isa<Constant>(V) && !isa<Argument>(V) &&
++           !isa<CallInst>(V)) ||
++          isa<ConstantExpr>(V))
+         return false;
+ 
+     for (Value *V : Defs)
+diff --git a/llvm/test/CodeGen/PowerPC/pr46923.ll b/llvm/test/CodeGen/PowerPC/pr46923.ll
+new file mode 100644
+index 00000000000..d6f65508848
+--- /dev/null
++++ b/llvm/test/CodeGen/PowerPC/pr46923.ll
+@@ -0,0 +1,31 @@
++; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
++; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-unknown \
++; RUN:   -ppc-asm-full-reg-names < %s | FileCheck %s
++
++@bar = external constant i64, align 8
++
++define i1 @foo() {
++; CHECK-LABEL: foo:
++; CHECK:       # %bb.0: # %entry
++; CHECK-NEXT:    crxor 4*cr5+lt, 4*cr5+lt, 4*cr5+lt
++; CHECK-NEXT:    li r3, 0
++; CHECK-NEXT:    li r4, 1
++; CHECK-NEXT:    isel r3, r4, r3, 4*cr5+lt
++; CHECK-NEXT:    blr
++entry:
++  br label %next
++
++next:
++  br i1 undef, label %true, label %false
++
++true:
++  br label %end
++
++false:
++  br label %end
++
++end:
++  %a = phi i1 [ icmp ugt (i64 0, i64 ptrtoint (i64* @bar to i64)), %true ],
++              [ icmp ugt (i64 0, i64 2), %false ]
++  ret i1 %a
++}
+-- 
+2.18.1
+
diff --git a/llvm.spec b/llvm.spec
index f5fd6d3..ff2ec91 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -11,7 +11,7 @@
 %global llvm_libdir %{_libdir}/%{name}
 %global build_llvm_libdir %{buildroot}%{llvm_libdir}
 %global rc_ver 1
-%global baserelease 0.2
+%global baserelease 0.3
 %global llvm_srcdir llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src
 %global maj_ver 11
 %global min_ver 0
@@ -57,6 +57,9 @@ Source2:	lit.fedora.cfg.py
 %endif
 Source4:	https://prereleases.llvm.org/%{version}/hans-gpg-key.asc
 
+# https://reviews.llvm.org/D85007
+# https://bugzilla.redhat.com/show_bug.cgi?id=1862012
+Patch0: 0001-PowerPC-PPCBoolRetToInt-Skip-translation-if-there-is.patch
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
@@ -532,6 +535,10 @@ fi
 %endif
 
 %changelog
+* Tue Aug 18 2020 Tom Stellard <tstellar@redhat.com> - 11.0.0-0.3.rc1
+- Fix rust crash on ppc64le compiling firefox
+- rhbz#1862012
+
 * Tue Aug 11 2020 Tom Stellard <tstellar@redhat.com> - 11.0.0-0.2.rc1
 - Install update_cc_test_checks.py script