Changeset 101 for trunk/include/k/kHlpAssert.h

Timestamp:

Oct 2, 2017, 12:37:39 PM (8 years ago)

Author:

bird

Message:

kHlpAssert.h: Workaround for buggy gcc7+ warnings. The fall thru warnings of gcc7+ thinks we can avoid if (!0) expressions in kHlpAssert* macors and issues misleading warnings. So, duplicate the macros for the kAssert*Failed* variations and drop the conditional, hoping that gcc gets it now.

File:

• trunk/include/k/kHlpAssert.h (modified) (3 diffs)

trunk/include/k/kHlpAssert.h

@@ -197 +197 @@
     } while (0)
 
+/* Same as above, only no expression. */
+
+# define kHlpAssertFailed() \
+    do { \
+        kHlpAssertMsg1("failed", __FILE__, __LINE__, K_FUNCTION); \
+        kHlpAssertBreakpoint(); \
+    } while (0)
+
+# define kHlpAssertFailedStmt(stmt) \
+    do { \
+        kHlpAssertMsg1("failed", __FILE__, __LINE__, K_FUNCTION); \
+        kHlpAssertBreakpoint(); \
+        stmt; \
+    } while (0)
+
+# define kHlpAssertFailedReturn(rcRet) \
+    do { \
+        kHlpAssertMsg1("failed", __FILE__, __LINE__, K_FUNCTION); \
+        kHlpAssertBreakpoint(); \
+        return (rcRet); \
+    } while (0)
+
+# define kHlpAssertFailedStmtReturn(stmt, rcRet) \
+    do { \
+        kHlpAssertMsg1("failed", __FILE__, __LINE__, K_FUNCTION); \
+        kHlpAssertBreakpoint(); \
+        stmt; \
+        return (rcRet); \
+    } while (0)
+
+# define kHlpAssertFailedReturnVoid() \
+    do { \
+        kHlpAssertMsg1("failed", __FILE__, __LINE__, K_FUNCTION); \
+        kHlpAssertBreakpoint(); \
+        return; \
+    } while (0)
+
+# define kHlpAssertFailedStmtReturnVoid(stmt) \
+    do { \
+        kHlpAssertMsg1("failed", __FILE__, __LINE__, K_FUNCTION); \
+        kHlpAssertBreakpoint(); \
+        stmt; \
+        return; \
+    } while (0)
+
+# define kHlpAssertMsgFailed(msg) \
+    do { \
+        kHlpAssertMsg1("failed", __FILE__, __LINE__, K_FUNCTION); \
+        kHlpAssertMsg2 msg; \
+        kHlpAssertBreakpoint(); \
+    } while (0)
+
+# define kHlpAssertMsgFailedStmt(msg, stmt) \
+    do { \
+        kHlpAssertMsg1("failed", __FILE__, __LINE__, K_FUNCTION); \
+        kHlpAssertMsg2 msg; \
+        kHlpAssertBreakpoint(); \
+        stmt; \
+    } while (0)
+
+# define kHlpAssertMsgFailedReturn(msg, rcRet) \
+    do { \
+        kHlpAssertMsg1("failed", __FILE__, __LINE__, K_FUNCTION); \
+        kHlpAssertMsg2 msg; \
+        kHlpAssertBreakpoint(); \
+        return (rcRet); \
+    } while (0)
+
+# define kHlpAssertMsgFailedStmtReturn(msg, stmt, rcRet) \
+    do { \
+        kHlpAssertMsg1("failed", __FILE__, __LINE__, K_FUNCTION); \
+        kHlpAssertMsg2 msg; \
+        kHlpAssertBreakpoint(); \
+        stmt; \
+        return (rcRet); \
+    } while (0)
+
+# define kHlpAssertMsgFailedReturnVoid(msg) \
+    do { \
+        kHlpAssertMsg1("failed", __FILE__, __LINE__, K_FUNCTION); \
+        kHlpAssertMsg2 msg; \
+        kHlpAssertBreakpoint(); \
+        return; \
+    } while (0)
+
+# define kHlpAssertMsgFailedStmtReturnVoid(msg, stmt) \
+    do { \
+        kHlpAssertMsg1("failed", __FILE__, __LINE__, K_FUNCTION); \
+        kHlpAssertMsg2 msg; \
+        kHlpAssertBreakpoint(); \
+        stmt; \
+        return; \
+    } while (0)
+
+
 #else   /* !K_STRICT */
+
 # define kHlpAssert(expr)                                   do { } while (0)
 # define kHlpAssertStmt(expr, stmt)                         do { if (!(expr)) { stmt; }  } while (0)
@@ -210 +306 @@
 # define kHlpAssertMsgReturnVoid(expr, msg)                 do { if (!(expr)) return; } while (0)
 # define kHlpAssertMsgStmtReturnVoid(expr, msg, stmt)       do { if (!(expr)) { stmt; return; } } while (0)
+/* Same as above, only no expression: */
+# define kHlpAssertFailed()                                 do { } while (0)
+# define kHlpAssertFailedStmt(stmt)                         do { stmt; } while (0)
+# define kHlpAssertFailedReturn(rcRet)                      do { return (rcRet); } while (0)
+# define kHlpAssertFailedStmtReturn(stmt, rcRet)            do { stmt; return (rcRet);  } while (0)
+# define kHlpAssertFailedReturnVoid()                       do { return; } while (0)
+# define kHlpAssertFailedStmtReturnVoid(stmt)               do { stmt; return; }  while (0)
+# define kHlpAssertMsgFailed(msg)                           do { } while (0)
+# define kHlpAssertMsgFailedStmt(msg, stmt)                 do { stmt; } while (0)
+# define kHlpAssertMsgFailedReturn(msg, rcRet)              do { return (rcRet); } while (0)
+# define kHlpAssertMsgFailedStmtReturn(msg, stmt, rcRet)    do { { stmt; return (rcRet); } } while (0)
+# define kHlpAssertMsgFailedReturnVoid(msg)                 do { return; } while (0)
+# define kHlpAssertMsgFailedStmtReturnVoid(msg, stmt)       do { stmt; return; } while (0)
+
 #endif  /* !K_STRICT */
 
@@ -222 +332 @@
 #define kHlpAssertRCReturn(rc, rcRet)           kHlpAssertMsgReturn((rc) == 0, ("%s = %d -> %d\n", #rc, (rc), (rcRet)), (rcRet))
 #define kHlpAssertRCReturnVoid(rc)              kHlpAssertMsgReturnVoid((rc) == 0, ("%s = %d -> %d\n", #rc, (rc), (rcRet)))
-#define kHlpAssertFailed()                              kHlpAssert(0)
-#define kHlpAssertFailedStmt(stmt)                      kHlpAssertStmt(0, stmt)
-#define kHlpAssertFailedReturn(rcRet)                   kHlpAssertReturn(0, (rcRet))
-#define kHlpAssertFailedStmtReturn(stmt, rcRet)         kHlpAssertStmtReturn(0, stmt, (rcRet))
-#define kHlpAssertFailedReturnVoid()                    kHlpAssertReturnVoid(0)
-#define kHlpAssertFailedStmtReturnVoid(stmt)            kHlpAssertStmtReturnVoid(0, stmt)
-#define kHlpAssertMsgFailed(msg)                        kHlpAssertMsg(0, msg)
-#define kHlpAssertMsgFailedStmt(msg, stmt)              kHlpAssertMsgStmt(0, msg, stmt)
-#define kHlpAssertMsgFailedReturn(msg, rcRet)           kHlpAssertMsgReturn(0, msg, (rcRet))
-#define kHlpAssertMsgFailedStmtReturn(msg, stmt, rcRet) kHlpAssertMsgStmtReturn(0, msg, stmt, (rcRet))
-#define kHlpAssertMsgFailedReturnVoid(msg)              kHlpAssertMsgReturnVoid(0, msg)
-#define kHlpAssertMsgFailedStmtReturnVoid(msg, stmt)    kHlpAssertMsgStmtReturnVoid(0, msg, stmt)
+
 
 /**