From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Thu, 5 May 2011 01:38:27 +0000 (-0500)
Subject: O3: Remove assertion for case that is actually handled in code.
X-Git-Tag: stable_2012_02_02~349
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=89e7bcca822a4690f630393cd400cf3468298fb1;p=gem5.git

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.
---

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 {