[PATCH] D36021: IPRA: Don't crash on null getCallPreservedMask

[Matt Arsenault via Phabricator via llvm-commits]

arsenm created this revision.
Herald added subscribers: nhaehnle, wdng.

Kernels aren't callable, so they don't have a call preserved mask.


https://reviews.llvm.org/D36021

Files:
  lib/CodeGen/RegUsageInfoCollector.cpp
  test/CodeGen/AMDGPU/ipra.ll


Index: test/CodeGen/AMDGPU/ipra.ll
===================================================================
--- /dev/null
+++ test/CodeGen/AMDGPU/ipra.ll
@@ -0,0 +1,12 @@
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -verify-machineinstrs -enable-ipra < %s | FileCheck -check-prefix=GCN %s
+
+; Kernels are not called, so there is no call preserved mask.
+; GCN-LABEL: {{^}}kernel:
+; GCN: flat_store_dword
+define amdgpu_kernel void @kernel(i32 addrspace(1)* %out) #0 {
+entry:
+  store i32 0, i32 addrspace(1)* %out
+  ret void
+}
+
+attributes #0 = { nounwind }
Index: lib/CodeGen/RegUsageInfoCollector.cpp
===================================================================
--- lib/CodeGen/RegUsageInfoCollector.cpp
+++ lib/CodeGen/RegUsageInfoCollector.cpp
@@ -128,9 +128,11 @@
   if (!TargetFrameLowering::isSafeForNoCSROpt(F)) {
     const uint32_t *CallPreservedMask =
         TRI->getCallPreservedMask(MF, F->getCallingConv());
-    // Set callee saved register as preserved.
-    for (unsigned i = 0; i < RegMaskSize; ++i)
-      RegMask[i] = RegMask[i] | CallPreservedMask[i];
+    if (CallPreservedMask) {
+      // Set callee saved register as preserved.
+      for (unsigned i = 0; i < RegMaskSize; ++i)
+        RegMask[i] = RegMask[i] | CallPreservedMask[i];
+    }
   } else {
     ++NumCSROpt;
     DEBUG(dbgs() << MF.getName()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D36021.108716.patch
Type: text/x-patch
Size: 1335 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170728/c00c58d3/attachment.bin>