commit d218a53f11ea465d01ad3e490c72ceac537617dc
author Robert O'Callahan <robert@ocallahan.org> Mon Aug 07 17:20:51 2017 +1200
committer Robert O'Callahan <robert@ocallahan.org> Mon Aug 07 17:26:16 2017 +1200
tree a143e441a561e0020b943a7a7070b7b419e9e7d7
parent a7bc217ab678d95569c387f76d1799a89bd20297

Use DEBUG_ASSERT instead of assert

src/AutoRemoteSyscalls.cc

diff --git a/src/AutoRemoteSyscalls.cc b/src/AutoRemoteSyscalls.cc
index d8d9aa5..5322718 100644
--- a/src/AutoRemoteSyscalls.cc
+++ b/src/AutoRemoteSyscalls.cc
@@ -12,6 +12,7 @@
 #include "ReplaySession.h"
 #include "Session.h"
 #include "Task.h"
+#include "core.h"
 #include "kernel_metadata.h"
 #include "log.h"
 #include "util.h"
@@ -50,7 +51,7 @@
 }
 
 AutoRestoreMem::~AutoRestoreMem() {
-  assert(saved_sp == remote.regs().sp() + len);
+  DEBUG_ASSERT(saved_sp == remote.regs().sp() + len);
 
   remote.task()->write_bytes_helper(addr, len, data.data());
 
@@ -131,7 +132,7 @@
   }
 
   fixed_sp = found_stack.end();
-  assert(!fixed_sp.is_null());
+  DEBUG_ASSERT(!fixed_sp.is_null());
   initial_regs.set_sp(fixed_sp);
 }
 
@@ -286,9 +287,9 @@
   typename Arch::sockaddr_un addr;
   memset(&addr, 0, sizeof(addr)); // Make valgrind happy.
   addr.sun_family = AF_UNIX;
-  assert(strlen(path) < sizeof(addr.sun_path));
+  DEBUG_ASSERT(strlen(path) < sizeof(addr.sun_path));
   // Skip leading '/' since we're going to access this relative to the root
-  assert(path[0] == '/');
+  DEBUG_ASSERT(path[0] == '/');
   strcpy(addr.sun_path, path + 1);
 
   auto tmp_buf_end = buf_end;
@@ -429,10 +430,10 @@
   }
 
   struct cmsghdr* cmsg = CMSG_FIRSTHDR(&msg);
-  assert(cmsg && cmsg->cmsg_level == SOL_SOCKET &&
-         cmsg->cmsg_type == SCM_RIGHTS);
+  DEBUG_ASSERT(cmsg && cmsg->cmsg_level == SOL_SOCKET &&
+               cmsg->cmsg_type == SCM_RIGHTS);
   int our_fd = *(int*)CMSG_DATA(cmsg);
-  assert(our_fd >= 0);
+  DEBUG_ASSERT(our_fd >= 0);
   return our_fd;
 }