[PATCH] D20526: Soften assertion in AMDGPU emitPrologue.

[Nirav Dave via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL270646: Soften assertion in AMDGPU emitPrologue. (authored by niravd).

Changed prior to commit:
  http://reviews.llvm.org/D20526?vs=58104&id=58374#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D20526

Files:
  llvm/trunk/lib/Target/AMDGPU/SIFrameLowering.cpp

Index: llvm/trunk/lib/Target/AMDGPU/SIFrameLowering.cpp
===================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIFrameLowering.cpp
+++ llvm/trunk/lib/Target/AMDGPU/SIFrameLowering.cpp
@@ -184,8 +184,9 @@
         // Pick the first unallocated SGPR. Be careful not to pick an alias of the
         // scratch descriptor, since we haven’t added its uses yet.
         if (!MRI.isPhysRegUsed(Reg)) {
-          assert(MRI.isAllocatable(Reg) &&
-                !TRI->isSubRegisterEq(ScratchRsrcReg, Reg));
+          if (!MRI.isAllocatable(Reg) ||
+              TRI->isSubRegisterEq(ScratchRsrcReg, Reg))
+            continue;
 
           MRI.replaceRegWith(ScratchWaveOffsetReg, Reg);
           ScratchWaveOffsetReg = Reg;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D20526.58374.patch
Type: text/x-patch
Size: 773 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160525/a0d638d5/attachment.bin>