mailing list of musl libc
 help / color / mirror / code / Atom feed
* [musl] [PATCH] Use __builtin_FILE/__builtin_LINE if available
@ 2023-02-18  1:33 Fangrui Song
  2023-02-18  2:03 ` Rich Felker
  0 siblings, 1 reply; 10+ messages in thread
From: Fangrui Song @ 2023-02-18  1:33 UTC (permalink / raw)
  To: musl; +Cc: Fangrui Song

C++ inline functions are requred to have exact same sequence of tokens
in every translation unit, but __FILE__ and __LINE__ may expand to
different tokens. The ODR violatioin is usually benign, but it can lead
to errors when C++20 modules are used.

    echo 'import B; import C; int main() { foo(); }' > A.cc
    cat > B.ccm <<'eof'
    module;
    #include <assert.h>
    export module B; export inline void foo() { assert(1); }
    eof
    cat > C.ccm <<'eof'
    module;
    #include <assert.h>
    export module C; export inline void foo() { assert(1); }
    eof
    clang -std=c++20 --precompile B.ccm -o B.pcm
    clang -std=c++20 --precompile C.ccm -o C.pcm
    clang -std=c++20 -fprebuilt-module-path=. A.cc B.pcm C.pcm -o A

    /tmp/d/C.ccm:3:37: error: 'foo' has different definitions in different modules; definition in module 'C' first difference is function body
    export module C; export inline void foo() { assert(1); }
                            ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~
    /tmp/d/B.ccm:3:37: note: but in 'B' found a different body
    export module B; export inline void foo() { assert(1); }
                            ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~

Fix this by preferring __builtin_FILE/__builtin_LINE which do not need
preprocessing.
---
 include/assert.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/assert.h b/include/assert.h
index d14ec94e..b209c2ae 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -4,6 +4,12 @@
 
 #ifdef NDEBUG
 #define	assert(x) (void)0
+#elif defined(__has_builtin)
+#if __has_builtin(__builtin_FILE)
+#define assert(x) ((void)((x) || (__assert_fail(#x, __builtin_FILE(), __builtin_LINE(), __func__),0)))
+#else
+#define assert(x) ((void)((x) || (__assert_fail(#x, __FILE__, __LINE__, __func__),0)))
+#endif
 #else
 #define assert(x) ((void)((x) || (__assert_fail(#x, __FILE__, __LINE__, __func__),0)))
 #endif
-- 
2.39.GIT


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2023-08-30 22:05 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-18  1:33 [musl] [PATCH] Use __builtin_FILE/__builtin_LINE if available Fangrui Song
2023-02-18  2:03 ` Rich Felker
2023-02-18  2:53   ` Fangrui Song
2023-02-18 12:17     ` Jon Chesterfield
2023-02-21 19:09       ` Fangrui Song
2023-02-27 22:26         ` Szabolcs Nagy
2023-03-02  8:19           ` Fangrui Song
     [not found]           ` <DS7PR12MB57655F44D45FF7D0B9BB01C5CBB29@DS7PR12MB5765.namprd12.prod.outlook.com>
2023-03-05  3:23             ` Zhihao Yuan
2023-08-30 22:04               ` Fangrui Song
2023-02-21 19:45       ` Jeffrey Walton

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).