Author: hans
Date: Wed Jul 20 09:09:21 2016
New Revision: 276116
URL: http://llvm.org/viewvc/llvm-project?rev=276116&view=rev
Log:
Merging r275935:
------------------------------------------------------------------------
r275935 | arsenm | 2016-07-18 17:35:22 -0700 (Mon, 18 Jul 2016) | 6 lines
AMDGPU/SI: Fix SI scheduler refcount issue
Without this fix, releaseSuccessors when InOrOutBlock is
false could release SUs outside the schedule BasicBlock.
Patch by Axel Davy
------------------------------------------------------------------------
Modified:
llvm/branches/release_39/ (props changed)
llvm/branches/release_39/lib/Target/AMDGPU/SIMachineScheduler.cpp
Propchange: llvm/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 20 09:09:21 2016
@@ -1,3 +1,3 @@
/llvm/branches/Apple/Pertwee:110850,110961
/llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,275870,275879,275898
+/llvm/trunk:155241,275870,275879,275898,275935,275946
Modified: llvm/branches/release_39/lib/Target/AMDGPU/SIMachineScheduler.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/lib/Target/AMDGPU/SIMachineScheduler.cpp?rev=276116&r1=276115&r2=276116&view=diff
==============================================================================
--- llvm/branches/release_39/lib/Target/AMDGPU/SIMachineScheduler.cpp (original)
+++ llvm/branches/release_39/lib/Target/AMDGPU/SIMachineScheduler.cpp Wed Jul
20 09:09:21 2016
@@ -464,6 +464,9 @@ void SIScheduleBlock::releaseSuccessors(
for (SDep& Succ : SU->Succs) {
SUnit *SuccSU = Succ.getSUnit();
+ if (SuccSU->NodeNum >= DAG->SUnits.size())
+ continue;
+
if (BC->isSUInBlock(SuccSU, ID) != InOrOutBlock)
continue;
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
