From 2bcdf1ebc9548e3cfcfc0ff46b3a6c2fac40c799 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Tue, 14 Nov 2017 20:00:34 +0000 Subject: [PATCH] [SystemZ] Do not crash when selecting an OR of two constants In rare cases, common code will attempt to select an OR of two constants. This confuses the logic in splitLargeImmediate, causing an internal error during isel. Fixed by simply leaving this case to common code to handle. This fixes PR34859. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@318187 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/SystemZ/SystemZISelDAGToDAG.cpp | 6 ++++-- test/CodeGen/SystemZ/int-const-02.ll | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp b/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp index 802af1ae861..3073d2fcde1 100644 --- a/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp +++ b/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp @@ -1263,8 +1263,10 @@ void SystemZDAGToDAGISel::Select(SDNode *Node) { // Fall through. or_xor: // If this is a 64-bit operation in which both 32-bit halves are nonzero, - // split the operation into two. - if (Node->getValueType(0) == MVT::i64) + // split the operation into two. If both operands here happen to be + // constant, leave this to common code to optimize. + if (Node->getValueType(0) == MVT::i64 && + Node->getOperand(0).getOpcode() != ISD::Constant) if (auto *Op1 = dyn_cast(Node->getOperand(1))) { uint64_t Val = Op1->getZExtValue(); if (!SystemZ::isImmLF(Val) && !SystemZ::isImmHF(Val)) { diff --git a/test/CodeGen/SystemZ/int-const-02.ll b/test/CodeGen/SystemZ/int-const-02.ll index e71abc69b3b..975fbf8698f 100644 --- a/test/CodeGen/SystemZ/int-const-02.ll +++ b/test/CodeGen/SystemZ/int-const-02.ll @@ -283,3 +283,20 @@ define i64 @f31() { call void @foo(i64 32768, i64 65536, i64 4294967296, i64 281474976710656) ret i64 42 } + +; Verify that we do not crash on OR with two constant inputs +; (this was PR34859). +define i64 @f32(i64 *%ptr) { +; CHECK-LABEL: f32: +; CHECK: llihf %r1, 918324340 +; CHECK: oilf %r1, 1806197964 +; CHECK: la %r0, 1(%r1) + store i64 -1, i64* %ptr, align 8 + %1 = load i64, i64* %ptr, align 8 + %2 = icmp ne i64 %1, 0 + %3 = zext i1 %2 to i64 + %4 = or i64 %3, 3944173009226982604 + store i64 %4, i64* %ptr, align 8 + ret i64 3944173009226982604 +} +