From: Jason Power <power.jg@gmail.com>
Date: Thu, 25 Jun 2015 16:58:28 +0000 (-0500)
Subject: Ruby: Remove assert in RubyPort retry list logic
X-Git-Tag: stable_2015_09_03
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=refs%2Ftags%2Fstable_2015_09_03;p=gem5.git

Ruby: Remove assert in RubyPort retry list logic

Remove the assert when adding a port to the RubyPort retry list.
Instead of asserting, just ignore the added port, since it's
already on the list.
Without this patch, Ruby+detailed fails for even the simplest tests
---

diff --git a/src/mem/ruby/system/RubyPort.hh b/src/mem/ruby/system/RubyPort.hh
index 2fb31ca09..e68af6dab 100644
--- a/src/mem/ruby/system/RubyPort.hh
+++ b/src/mem/ruby/system/RubyPort.hh
@@ -188,8 +188,8 @@ class RubyPort : public MemObject
   private:
     void addToRetryList(MemSlavePort * port)
     {
-        assert(std::find(retryList.begin(), retryList.end(), port) ==
-               retryList.end());
+        if (std::find(retryList.begin(), retryList.end(), port) !=
+               retryList.end()) return;
         retryList.push_back(port);
     }