From 0a33abdfd215336ed0bd1c3dde78036f65f156c9 Mon Sep 17 00:00:00 2001 From: Nicolai Haehnle Date: Mon, 21 Mar 2016 22:54:02 +0000 Subject: [PATCH] AMDGPU: Fix dangling references introduced by r263982 Fixes Valgrind errors on the test cases that were reported as failing by buildbots. llvm-svn: 264000 --- llvm/lib/Target/AMDGPU/SIWholeQuadMode.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/llvm/lib/Target/AMDGPU/SIWholeQuadMode.cpp b/llvm/lib/Target/AMDGPU/SIWholeQuadMode.cpp index d735d38..1b1d422 100644 --- a/llvm/lib/Target/AMDGPU/SIWholeQuadMode.cpp +++ b/llvm/lib/Target/AMDGPU/SIWholeQuadMode.cpp @@ -184,14 +184,16 @@ char SIWholeQuadMode::scanInstructions(const MachineFunction &MF, void SIWholeQuadMode::propagateInstruction(const MachineInstr &MI, std::vector& Worklist) { const MachineBasicBlock &MBB = *MI.getParent(); - InstrInfo &II = Instructions[&MI]; + InstrInfo II = Instructions[&MI]; // take a copy to prevent dangling references BlockInfo &BI = Blocks[&MBB]; // Control flow-type instructions that are followed by WQM computations // must themselves be in WQM. if ((II.OutNeeds & StateWQM) && !(II.Needs & StateWQM) && - (MI.isBranch() || MI.isTerminator() || MI.getOpcode() == AMDGPU::SI_KILL)) + (MI.isBranch() || MI.isTerminator() || MI.getOpcode() == AMDGPU::SI_KILL)) { + Instructions[&MI].Needs = StateWQM; II.Needs = StateWQM; + } // Propagate to block level BI.Needs |= II.Needs; @@ -253,7 +255,7 @@ void SIWholeQuadMode::propagateInstruction(const MachineInstr &MI, void SIWholeQuadMode::propagateBlock(const MachineBasicBlock &MBB, std::vector& Worklist) { - BlockInfo &BI = Blocks[&MBB]; + BlockInfo BI = Blocks[&MBB]; // take a copy to prevent dangling references // Propagate through instructions if (!MBB.empty()) { -- 2.7.4