From 1c19384f35993662139cbd858318115b4fa1eb04 Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Wed, 8 May 2019 11:02:46 +0000 Subject: [PATCH] [Hexagon] Fix cppcheck reduce variable scope warnings. NFCI. Also fixes a static analyzer "Value stored to 'S2' during its initialization is never read" warning. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@360244 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/Hexagon/HexagonStoreWidening.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/Target/Hexagon/HexagonStoreWidening.cpp b/lib/Target/Hexagon/HexagonStoreWidening.cpp index a306c0ddade..b8b61517ff9 100644 --- a/lib/Target/Hexagon/HexagonStoreWidening.cpp +++ b/lib/Target/Hexagon/HexagonStoreWidening.cpp @@ -337,8 +337,7 @@ bool HexagonStoreWidening::selectStores(InstrGroup::iterator Begin, return false; OG.push_back(FirstMI); - MachineInstr *S1 = FirstMI, *S2 = *(Begin+1); - InstrGroup::iterator I = Begin+1; + MachineInstr *S1 = FirstMI; // Pow2Num will be the largest number of elements in OG such that the sum // of sizes of stores 0...Pow2Num-1 will be a power of 2. @@ -350,8 +349,8 @@ bool HexagonStoreWidening::selectStores(InstrGroup::iterator Begin, // does not exceed the limit (MaxSize). // Keep track of when the total size covered is a power of 2, since // this is a size a single store can cover. - while (I != End) { - S2 = *I; + for (InstrGroup::iterator I = Begin + 1; I != End; ++I) { + MachineInstr *S2 = *I; // Stores are sorted, so if S1 and S2 are not adjacent, there won't be // any other store to fill the "hole". if (!storesAreAdjacent(S1, S2)) @@ -371,7 +370,6 @@ bool HexagonStoreWidening::selectStores(InstrGroup::iterator Begin, break; S1 = S2; - ++I; } // The stores don't add up to anything that can be widened. Clean up. -- 2.11.0