adjust for llvm 14

Signed-off-by: Sidorov, Dmitry <dmitry.sidorov@intel.com>
KhronosGroup · Nov 7, 2024 · 0c84e7c · 0c84e7c
1 parent e19618f
commit 0c84e7c
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/lib/SPIRV/SPIRVReader.cpp b/lib/SPIRV/SPIRVReader.cpp
@@ -3059,10 +3059,14 @@ static void validatePhiPredecessors(Function *F) {
     for (PHINode &Phi : BB.phis()) {
       SmallVector<Value *> Vs;
       SmallVector<BasicBlock *> Bs;
-      for (auto [V, B] : zip(Phi.incoming_values(), Phi.blocks())) {
-        unsigned N = PredsCnt[B];
-        Vs.insert(Vs.end(), N, V);
-        Bs.insert(Bs.end(), N, B);
+      auto Vals = Phi.incoming_values();
+      auto Blocks = Phi.blocks();
+      auto *VIt = Vals.begin();
+      auto *BIt = Blocks.begin();
+      for (; VIt != Vals.end() && BIt != Blocks.end(); ++VIt, ++BIt) {
+        const unsigned N = PredsCnt[*BIt];
+        Vs.insert(Vs.end(), N, *VIt);
+        Bs.insert(Bs.end(), N, *BIt);
       }
       unsigned I = 0;
       for (unsigned N = Phi.getNumIncomingValues(); I < N; ++I) {