[PATCH 1/4] selftest.h: Add ASSERT_TRUE_AT and ASSERT_FALSE_AT

[David Malcolm]

I split out the selftest.h changes from v2 of the kit for ease of review;
here they are.

Successfully bootstrapped&regrtested in conjunction with the rest of the
patch kit on x86_64-pc-linux-gnu.

OK for trunk?

gcc/ChangeLog:
        * selftest.h (ASSERT_TRUE): Reimplement in terms of...
        (ASSERT_TRUE_AT): New macro.
        (ASSERT_FALSE): Reimplement in terms of...
        (ASSERT_FALSE_AT): New macro.
        (ASSERT_STREQ_AT): Fix typo in comment.
---
 gcc/selftest.h | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/gcc/selftest.h b/gcc/selftest.h
index 0bee476..397e998 100644
--- a/gcc/selftest.h
+++ b/gcc/selftest.h
@@ -104,13 +104,19 @@ extern int num_passes;
    ::selftest::fail if it false.  */
 
 #define ASSERT_TRUE(EXPR)                              \
+  ASSERT_TRUE_AT (SELFTEST_LOCATION, (EXPR))
+
+/* Like ASSERT_TRUE, but treat LOC as the effective location of the
+   selftest.  */
+
+#define ASSERT_TRUE_AT(LOC, EXPR)                      \
   SELFTEST_BEGIN_STMT                                  \
   const char *desc = "ASSERT_TRUE (" #EXPR ")";                \
   bool actual = (EXPR);                                        \
   if (actual)                                          \
-    ::selftest::pass (SELFTEST_LOCATION, desc);        \
+    ::selftest::pass ((LOC), desc);                    \
   else                                                 \
-    ::selftest::fail (SELFTEST_LOCATION, desc);                \
+    ::selftest::fail ((LOC), desc);                    \
   SELFTEST_END_STMT
 
 /* Evaluate EXPR and coerce to bool, calling
@@ -118,13 +124,19 @@ extern int num_passes;
    ::selftest::fail if it true.  */
 
 #define ASSERT_FALSE(EXPR)                                     \
+  ASSERT_FALSE_AT (SELFTEST_LOCATION, (EXPR))
+
+/* Like ASSERT_FALSE, but treat LOC as the effective location of the
+   selftest.  */
+
+#define ASSERT_FALSE_AT(LOC, EXPR)                             \
   SELFTEST_BEGIN_STMT                                          \
-  const char *desc = "ASSERT_FALSE (" #EXPR ")";               \
-  bool actual = (EXPR);                                        \
-  if (actual)                                                  \
-    ::selftest::fail (SELFTEST_LOCATION, desc);                                
\
-  else                                                         \
-    ::selftest::pass (SELFTEST_LOCATION, desc);                                
\
+  const char *desc = "ASSERT_FALSE (" #EXPR ")";                       \
+  bool actual = (EXPR);                                                        
\
+  if (actual)                                                          \
+    ::selftest::fail ((LOC), desc);                    \
+  else                                                                 \
+    ::selftest::pass ((LOC), desc);                                    \
   SELFTEST_END_STMT
 
 /* Evaluate EXPECTED and ACTUAL and compare them with ==, calling
@@ -169,7 +181,7 @@ extern int num_passes;
                            (EXPECTED), (ACTUAL));                  \
   SELFTEST_END_STMT
 
-/* Like ASSERT_STREQ_AT, but treat LOC as the effective location of the
+/* Like ASSERT_STREQ, but treat LOC as the effective location of the
    selftest.  */
 
 #define ASSERT_STREQ_AT(LOC, EXPECTED, ACTUAL)                     \
-- 
1.8.5.3