From 3357fb4932728060aa6bce573572374ddec43c61 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 11 Aug 2018 18:56:40 -0700 Subject: [PATCH] verify: port 'assume' to traditional tools * lib/verify.h (assume): Port better to Oracle Studio 12.6 and other tools that use /*NOTREACHED*/ comments. --- ChangeLog | 6 ++++++ lib/verify.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 404af4f13e..6418dae91e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-08-11 Paul Eggert + + verify: port 'assume' to traditonal tools + * lib/verify.h (assume): Port better to Oracle Studio 12.6 + and other tools that use /*NOTREACHED*/ comments. + 2018-08-10 Bruno Haible fnmatch: Fix compilation error in C++ namespace mode on Mac OS X. diff --git a/lib/verify.h b/lib/verify.h index bc7f99dbd7..3b57ddee0a 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -276,7 +276,8 @@ template when 'assume' silences warnings even with older GCCs. */ # define assume(R) ((R) ? (void) 0 : __builtin_trap ()) #else -# define assume(R) ((void) (0 && (R))) + /* Some tools grok NOTREACHED, e.g., Oracle Studio 12.6. */ +# define assume(R) ((R) ? (void) 0 : /*NOTREACHED*/ (void) 0) #endif /* @assert.h omit end@ */ -- 2.39.5