[committed] analyzer: avoid relying on system <assert.h> in testsuite (PR 93367)

Message ID 20200124015040.20204-1-dmalcolm@redhat.com
State New
Headers show
Series
  • [committed] analyzer: avoid relying on system <assert.h> in testsuite (PR 93367)
Related show

Commit Message

David Malcolm Jan. 24, 2020, 1:50 a.m.
PR analyzer/93367 reports a testsuite failure in abort.c on
hppa64-hp-hpux11.11 when detecting if the analyzer "knows" that the
condition holds after the assert.

The root cause is that the assertion failure function in that
configuration's <assert.h> is not marked with
__attribute__ ((__noreturn__)).

This patch reworks the test to avoid <assert.h> in favor of a custom
implementation of assert, so that the test demonstrates the idea without
relying on properties of <assert.h>.

Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu.
Pushed to master as r10-6195-ga0b935ac66bc9804b0864151e5f1bfde5ac1ddeb.

gcc/testsuite/ChangeLog:
	PR analyzer/93367
	* gcc.dg/analyzer/abort.c: Remove include of <assert.h>.
	Replace use of assert with a custom assertion implementation.
---
 gcc/testsuite/gcc.dg/analyzer/abort.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

-- 
2.21.0

Patch

diff --git a/gcc/testsuite/gcc.dg/analyzer/abort.c b/gcc/testsuite/gcc.dg/analyzer/abort.c
index ea1756e47cb..9497ae30b46 100644
--- a/gcc/testsuite/gcc.dg/analyzer/abort.c
+++ b/gcc/testsuite/gcc.dg/analyzer/abort.c
@@ -1,4 +1,3 @@ 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "analyzer-decls.h"
@@ -62,11 +61,20 @@  void test_4 (void *ptr)
 
 /**************************************************************************/
 
+/* Verify that we discover conditions from assertions if the assert macro
+   isn't disabled, and that it has its failure-handler labelled with
+   __attribute__ ((__noreturn__)).
+   This attribute isn't present for all implementations of <assert.h>, so
+   we have to test the idea using our own assert macro.  */
+
+extern void my_assert_fail (const char *expr, const char *file, int line)
+  __attribute__ ((__noreturn__));
+
+#define MY_ASSERT(EXPR) \
+  do { if (!(EXPR)) my_assert_fail (#EXPR, __FILE__, __LINE__); } while (0)
+
 void test_5 (int i)
 {
-  assert (i < 10);
-
-  /* We have not defined NDEBUG, so this will call __assert_fail if
-     i >= 10, which is labelled with __attribute__ ((__noreturn__)).  */
+  MY_ASSERT (i < 10);
   __analyzer_eval (i < 10); /* { dg-warning "TRUE" } */
 }