summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2011-05-04 20:38:27 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2011-05-04 20:38:27 -0500
commit89e7bcca822a4690f630393cd400cf3468298fb1 (patch)
tree3f035c6927bd1d04c7db9bac3460ea00579f4378 /src
parent974a776b31492158a9fee6cce4581041509d3e18 (diff)
downloadgem5-89e7bcca822a4690f630393cd400cf3468298fb1.tar.xz
O3: Remove assertion for case that is actually handled in code.
If an nonspeculative instruction has a fault it might not be in the nonSpecInsts map.
Diffstat (limited to 'src')
-rw-r--r--src/cpu/o3/inst_queue_impl.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/o3/inst_queue_impl.hh b/src/cpu/o3/inst_queue_impl.hh
index 8592cd6b1..09e925e1d 100644
--- a/src/cpu/o3/inst_queue_impl.hh
+++ b/src/cpu/o3/inst_queue_impl.hh
@@ -1199,7 +1199,7 @@ InstructionQueue<Impl>::doSquash(ThreadID tid)
!squashed_inst->isCompleted()) {
NonSpecMapIt ns_inst_it =
nonSpecInsts.find(squashed_inst->seqNum);
- assert(ns_inst_it != nonSpecInsts.end());
+
if (ns_inst_it == nonSpecInsts.end()) {
assert(squashed_inst->getFault() != NoFault);
} else {