[llvm] da4a2fd - [AArch64ISelLowering] Fix null pointer access in performSVEAndCombine.

[Huihui Zhang via llvm-commits]

Author: Huihui Zhang
Date: 2021-09-10T10:36:43-07:00
New Revision: da4a2fd832a5b2e97f2bb854ab22766db910c994

URL: https://github.com/llvm/llvm-project/commit/da4a2fd832a5b2e97f2bb854ab22766db910c994
DIFF: https://github.com/llvm/llvm-project/commit/da4a2fd832a5b2e97f2bb854ab22766db910c994.diff

LOG: [AArch64ISelLowering] Fix null pointer access in performSVEAndCombine.

When combining 'and' of an unsigned unpack and shuffle instruction,
bail early if shuffle is not constructed from a constant integer.

Reviewed By: paulwalker-arm

Differential Revision: https://reviews.llvm.org/D109556

Added: 
    llvm/test/CodeGen/AArch64/aarch64-sve-and-combine-crash.ll

Modified: 
    llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
index 96bafdbab23b3..375c1df55eccd 100644
--- a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+++ b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
@@ -13333,6 +13333,9 @@ static SDValue performSVEAndCombine(SDNode *N,
 
     SDLoc DL(N);
     ConstantSDNode *C = dyn_cast<ConstantSDNode>(Dup->getOperand(0));
+    if (!C)
+      return SDValue();
+
     uint64_t ExtVal = C->getZExtValue();
 
     // If the mask is fully covered by the unpack, we don't need to push

diff  --git a/llvm/test/CodeGen/AArch64/aarch64-sve-and-combine-crash.ll b/llvm/test/CodeGen/AArch64/aarch64-sve-and-combine-crash.ll
new file mode 100644
index 0000000000000..e612401fcfa29
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/aarch64-sve-and-combine-crash.ll
@@ -0,0 +1,23 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc -mtriple=aarch64-linux-gnu -mattr=+sve < %s | FileCheck %s
+
+target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
+target triple = "aarch64-unknown-linux-gnu"
+
+; Check that this test does not crash at performSVEAndCombine.
+
+define <vscale x 4 x i32> @test(<vscale x 8 x i16> %in1, <vscale x 4 x i32> %in2) {
+; CHECK-LABEL: test:
+; CHECK:       // %bb.0: // %entry
+; CHECK-NEXT:    uunpkhi z0.s, z0.h
+; CHECK-NEXT:    mov z1.s, s1
+; CHECK-NEXT:    and z0.d, z0.d, z1.d
+; CHECK-NEXT:    ret
+entry:
+  %i1 = call <vscale x 4 x i32> @llvm.aarch64.sve.uunpkhi.nxv4i32(<vscale x 8 x i16> %in1)
+  %i2 = shufflevector <vscale x 4 x i32> %in2, <vscale x 4 x i32> undef, <vscale x 4 x i32> zeroinitializer
+  %i3 = and <vscale x 4 x i32> %i1, %i2
+  ret <vscale x 4 x i32> %i3
+}
+
+declare <vscale x 4 x i32> @llvm.aarch64.sve.uunpkhi.nxv4i32(<vscale x 8 x i16>)