commit 0f9c84cd936b6532495673613d9390efdc85cb3c
author Alexander Timofeev <Alexander.Timofeev@amd.com> Thu Jun 15 19:33:10 2017 +0000
committer Alexander Timofeev <Alexander.Timofeev@amd.com> Thu Jun 15 19:33:10 2017 +0000
tree f21751f18521ab02ca6f4075169926ff7399333a
parent f2d3e6d3d50ea7f16ffaf12bfbb03384d019d3b2

DivergencyAnalysis patch for review

llvm-svn: 305494

llvm/lib/Target/AMDGPU/AMDGPUAnnotateUniformValues.cpp

diff --git a/llvm/lib/Target/AMDGPU/AMDGPUAnnotateUniformValues.cpp b/llvm/lib/Target/AMDGPU/AMDGPUAnnotateUniformValues.cpp
index 3c788fa..6f00286 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUAnnotateUniformValues.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUAnnotateUniformValues.cpp
@@ -107,7 +107,7 @@
 
   DFS(Start, Checklist);
   for (auto &BB : Checklist) {
-    BasicBlock::iterator StartIt = (BB == Load->getParent()) ?
+    BasicBlock::iterator StartIt = (!L && (BB == Load->getParent())) ?
      BasicBlock::iterator(Load) : BB->end();
      if (MDR->getPointerDependencyFrom(MemoryLocation(Ptr),
        true, StartIt, BB, Load).isClobber())