assert: Made Expects/Ensures cheaper

Author: AndreasAakesson

api/common

@@ -53,27 +53,11 @@
 #undef Expects
 #undef Ensures
 
-#define Expects(cond)                                       \
-  do {                                                      \
-    if (UNLIKELY(not (cond))) {                             \
-      std::cerr << "OS: Precondition (" OS_STRINGIFY(cond)  \
-                << ") failed...\n"  << "\t...in function: " \
-                << __func__ << " @" << __FILE__ << ":"      \
-                << __LINE__ << '\n';                        \
-      std::terminate();                                     \
-    }                                                       \
-  } while(0)
+#define Expects(cond) \
+  assert(LIKELY(cond) && "OS: Precondition failed")
 
-#define Ensures(cond)                                       \
-  do {                                                      \
-    if (UNLIKELY(not (cond))) {                             \
-      std::cerr << "OS: Postcondition (" OS_STRINGIFY(cond) \
-                << ") failed...\n"  << "\t...in function: " \
-                << __func__ << " @" << __FILE__ << ":"      \
-                << __LINE__ << '\n';                        \
-      std::terminate();                                     \
-    }                                                       \
-  } while(0)
+#define Ensures(cond) \
+  assert(LIKELY(cond) && "OS: Postcondition failed")
 
 #endif //< defined(OS_TERMINATE_ON_CONTRACT_VIOLATION)
 

api/net/ip4/packet_ip4.hpp

@@ -105,13 +105,11 @@ namespace net {
 
     Byte* ip_data() noexcept __attribute__((assume_aligned(4)))
     {
-      Expects((size_t)(data_end() - layer_begin()) >= sizeof(IP4::header));
       return layer_begin() + ip_header_length();
     }
 
     const Byte* ip_data() const noexcept __attribute__((assume_aligned(4)))
     {
-      Expects((size_t)(data_end() - layer_begin()) >= sizeof(IP4::header));
       return layer_begin() + ip_header_length();
     }