From a06a46f5d176a7ab1bafe11cd714fc29e4254fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Yves=20P=C3=A9neau?= <pierre-yves.peneau@lirmm.fr>
Date: Wed, 15 Feb 2017 14:56:54 -0600
Subject: [PATCH] mem, misc: fix building issue with CommMonitor (unused
 variables)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre-Yves Péneau <pierre-yves.peneau@lirmm.fr>
Reviewed-by: Andreas Hansson <andreas.hansson@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Signed-off-by: Jason Lowe-Power <jason@lowepower.com>

Reviewed at http://reviews.gem5.org/r/3801/
---
 src/mem/comm_monitor.cc | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/mem/comm_monitor.cc b/src/mem/comm_monitor.cc
index b8fe15ff0..303b1bfa6 100644
--- a/src/mem/comm_monitor.cc
+++ b/src/mem/comm_monitor.cc
@@ -248,8 +248,6 @@ CommMonitor::recvTimingReq(PacketPtr pkt)
     // or even deleted when sendTiming() is called.
     const ProbePoints::PacketInfo pkt_info(pkt);
 
-    const bool is_read = pkt->isRead();
-    const bool is_write = pkt->isWrite();
     const bool expects_response(pkt->needsResponse() &&
                                 !pkt->cacheResponding());
 
@@ -274,8 +272,8 @@ CommMonitor::recvTimingReq(PacketPtr pkt)
     }
 
     if (successful) {
-        DPRINTF(CommMonitor, "Forwarded %s request\n",
-                (is_read ? "read" : (is_write ? "write" : "non read/write")));
+        DPRINTF(CommMonitor, "Forwarded %s request\n", pkt->isRead() ? "read" :
+                pkt->isWrite() ? "write" : "non read/write");
         stats.updateReqStats(pkt_info, false, expects_response);
     }
     return successful;
@@ -291,8 +289,6 @@ CommMonitor::recvTimingResp(PacketPtr pkt)
     // or even deleted when sendTiming() is called.
     const ProbePoints::PacketInfo pkt_info(pkt);
 
-    bool is_read = pkt->isRead();
-    bool is_write = pkt->isWrite();
     Tick latency = 0;
     CommMonitorSenderState* received_state =
         dynamic_cast<CommMonitorSenderState*>(pkt->senderState);
@@ -325,8 +321,8 @@ CommMonitor::recvTimingResp(PacketPtr pkt)
 
     if (successful) {
         ppPktResp->notify(pkt_info);
-        DPRINTF(CommMonitor, "Received %s response\n",
-                (is_read ? "Read" : (is_write ? "Write" : "non read/write")));
+        DPRINTF(CommMonitor, "Received %s response\n", pkt->isRead() ? "read" :
+                pkt->isWrite() ?  "write" : "non read/write");
         stats.updateRespStats(pkt_info, latency, false);
     }
     return successful;