Fri Apr 17 15:22:35 2020 UTC ()
Remove the static_assert() fallback for pre-C11 and pre-C++11

C++ without real static_assert() can be incompatible with the C fallback
as presented in openjdk.

A pre-C11 compiler can be picky on the implementation.


(kamil)
diff -r1.24 -r1.25 src/include/assert.h

cvs diff -r1.24 -r1.25 src/include/assert.h (switch to unified diff)

--- src/include/assert.h 2019/05/27 07:31:11 1.24
+++ src/include/assert.h 2020/04/17 15:22:34 1.25
@@ -1,114 +1,112 @@ @@ -1,114 +1,112 @@
1/* $NetBSD: assert.h,v 1.24 2019/05/27 07:31:11 kamil Exp $ */ 1/* $NetBSD: assert.h,v 1.25 2020/04/17 15:22:34 kamil Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1992, 1993 4 * Copyright (c) 1992, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * (c) UNIX System Laboratories, Inc. 6 * (c) UNIX System Laboratories, Inc.
7 * All or some portions of this file are derived from material licensed 7 * All or some portions of this file are derived from material licensed
8 * to the University of California by American Telephone and Telegraph 8 * to the University of California by American Telephone and Telegraph
9 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 9 * Co. or Unix System Laboratories, Inc. and are reproduced herein with
10 * the permission of UNIX System Laboratories, Inc. 10 * the permission of UNIX System Laboratories, Inc.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
15 * 1. Redistributions of source code must retain the above copyright 15 * 1. Redistributions of source code must retain the above copyright
16 * notice, this list of conditions and the following disclaimer. 16 * notice, this list of conditions and the following disclaimer.
17 * 2. Redistributions in binary form must reproduce the above copyright 17 * 2. Redistributions in binary form must reproduce the above copyright
18 * notice, this list of conditions and the following disclaimer in the 18 * notice, this list of conditions and the following disclaimer in the
19 * documentation and/or other materials provided with the distribution. 19 * documentation and/or other materials provided with the distribution.
20 * 3. Neither the name of the University nor the names of its contributors 20 * 3. Neither the name of the University nor the names of its contributors
21 * may be used to endorse or promote products derived from this software 21 * may be used to endorse or promote products derived from this software
22 * without specific prior written permission. 22 * without specific prior written permission.
23 * 23 *
24 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 24 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
25 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 25 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 26 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 27 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
28 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 28 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE. 34 * SUCH DAMAGE.
35 * 35 *
36 * @(#)assert.h 8.2 (Berkeley) 1/21/94 36 * @(#)assert.h 8.2 (Berkeley) 1/21/94
37 */ 37 */
38 38
39/* 39/*
40 * Unlike other ANSI header files, <assert.h> may usefully be included 40 * Unlike other ANSI header files, <assert.h> may usefully be included
41 * multiple times, with and without NDEBUG defined. 41 * multiple times, with and without NDEBUG defined.
42 */ 42 */
43 43
44#include <sys/cdefs.h> 44#include <sys/cdefs.h>
45#include <sys/featuretest.h> 45#include <sys/featuretest.h>
46#include <sys/null.h> 46#include <sys/null.h>
47 47
48#undef assert 48#undef assert
49 49
50#ifdef NDEBUG 50#ifdef NDEBUG
51# ifndef __lint__ 51# ifndef __lint__
52# define assert(e) (__static_cast(void,0)) 52# define assert(e) (__static_cast(void,0))
53# else /* !__lint__ */ 53# else /* !__lint__ */
54# define assert(e) 54# define assert(e)
55# endif /* __lint__ */ 55# endif /* __lint__ */
56#else /* !NDEBUG */ 56#else /* !NDEBUG */
57# if __STDC__ 57# if __STDC__
58# define assert(e) \ 58# define assert(e) \
59 ((e) ? __static_cast(void,0) : __assert13(__FILE__, __LINE__, \ 59 ((e) ? __static_cast(void,0) : __assert13(__FILE__, __LINE__, \
60 __assert_function__, #e)) 60 __assert_function__, #e))
61# else /* PCC */ 61# else /* PCC */
62# define assert(e) \ 62# define assert(e) \
63 ((e) ? __static_cast(void,0) : __assert13(__FILE__, __LINE__, \ 63 ((e) ? __static_cast(void,0) : __assert13(__FILE__, __LINE__, \
64 __assert_function__, "e")) 64 __assert_function__, "e"))
65# endif /* !__STDC__ */ 65# endif /* !__STDC__ */
66#endif /* NDEBUG */ 66#endif /* NDEBUG */
67 67
68#undef _DIAGASSERT 68#undef _DIAGASSERT
69#if !defined(_DIAGNOSTIC) 69#if !defined(_DIAGNOSTIC)
70# if !defined(__lint__) 70# if !defined(__lint__)
71# define _DIAGASSERT(e) (__static_cast(void,0)) 71# define _DIAGASSERT(e) (__static_cast(void,0))
72# else /* !__lint__ */ 72# else /* !__lint__ */
73# define _DIAGASSERT(e) 73# define _DIAGASSERT(e)
74# endif /* __lint__ */ 74# endif /* __lint__ */
75#else /* _DIAGNOSTIC */ 75#else /* _DIAGNOSTIC */
76# if __STDC__ 76# if __STDC__
77# define _DIAGASSERT(e) \ 77# define _DIAGASSERT(e) \
78 ((e) ? __static_cast(void,0) : __diagassert13(__FILE__, __LINE__, \ 78 ((e) ? __static_cast(void,0) : __diagassert13(__FILE__, __LINE__, \
79 __assert_function__, #e)) 79 __assert_function__, #e))
80# else /* !__STDC__ */ 80# else /* !__STDC__ */
81# define _DIAGASSERT(e) \ 81# define _DIAGASSERT(e) \
82 ((e) ? __static_cast(void,0) : __diagassert13(__FILE__, __LINE__, \ 82 ((e) ? __static_cast(void,0) : __diagassert13(__FILE__, __LINE__, \
83 __assert_function__, "e")) 83 __assert_function__, "e"))
84# endif 84# endif
85#endif /* _DIAGNOSTIC */ 85#endif /* _DIAGNOSTIC */
86 86
87 87
88#if defined(__lint__) 88#if defined(__lint__)
89#define __assert_function__ (__static_cast(const void *,0)) 89#define __assert_function__ (__static_cast(const void *,0))
90#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L 90#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
91#define __assert_function__ __func__ 91#define __assert_function__ __func__
92#elif __GNUC_PREREQ__(2, 6) 92#elif __GNUC_PREREQ__(2, 6)
93#define __assert_function__ __PRETTY_FUNCTION__ 93#define __assert_function__ __PRETTY_FUNCTION__
94#else 94#else
95#define __assert_function__ (__static_cast(const void *,0)) 95#define __assert_function__ (__static_cast(const void *,0))
96#endif 96#endif
97 97
98#ifndef __ASSERT_DECLARED 98#ifndef __ASSERT_DECLARED
99#define __ASSERT_DECLARED 99#define __ASSERT_DECLARED
100__BEGIN_DECLS 100__BEGIN_DECLS
101__dead void __assert(const char *, int, const char *); 101__dead void __assert(const char *, int, const char *);
102__dead void __assert13(const char *, int, const char *, const char *); 102__dead void __assert13(const char *, int, const char *, const char *);
103void __diagassert(const char *, int, const char *); 103void __diagassert(const char *, int, const char *);
104void __diagassert13(const char *, int, const char *, const char *); 104void __diagassert13(const char *, int, const char *, const char *);
105__END_DECLS 105__END_DECLS
106#endif /* __ASSERT_DECLARED */ 106#endif /* __ASSERT_DECLARED */
107 107
108#ifndef static_assert 
109#if defined(_ISOC11_SOURCE) || (__STDC_VERSION__ - 0) >= 201101L 108#if defined(_ISOC11_SOURCE) || (__STDC_VERSION__ - 0) >= 201101L
 109#ifndef static_assert
110#define static_assert _Static_assert 110#define static_assert _Static_assert
111#elif defined(_NETBSD_SOURCE) && (__cplusplus - 0) < 201103L 
112#define static_assert(x, y) __CTASSERT(x) 
113#endif /* static_assert */ 111#endif /* static_assert */
114#endif 112#endif