Merge pull request #96 from OpenXiangShan/fix-iter-erase

cpu-o3: Fix invalid iter de-reference when squashing inst
OpenXiangShan · Oct 27, 2023 · 6a85ffb · 6a85ffb
2 parents 83e80d3 + 502a64f
commit 6a85ffb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/cpu/o3/rob.cc b/src/cpu/o3/rob.cc
@@ -367,6 +367,7 @@ ROB::doSquash(ThreadID tid)
 
         // printf("[ROB] squash seqNum %ld\n", (*squashIt[tid])->seqNum);
 
+        auto prevIt = std::prev(squashIt[tid]);
         instList[tid].erase(squashIt[tid]);
         --numInstsInROB;
         --threadEntries[tid];
@@ -392,7 +393,7 @@ ROB::doSquash(ThreadID tid)
         if ((*squashIt[tid]) == (*tail_thread))
             robTailUpdate = true;
 
-        squashIt[tid]--;
+        squashIt[tid] = prevIt;
     }