[PATCH] libstdc++: Support std::is_aggregate on clang++ (was clang++: std::is_aggregate unusable with clang-5.0/libstdc++-7)

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[PATCH] libstdc++: Support std::is_aggregate on clang++ (was clang++: std::is_aggregate unusable with clang-5.0/libstdc++-7)

Sumner, Brian via cfe-dev
From 56c4a18d0d8c8ce7aa1239880138775e4db06645 Mon Sep 17 00:00:00 2001
From: Katsuhiko Nishimra <[hidden email]>
Date: Thu, 27 Jul 2017 16:03:54 +0900
Subject: [PATCH] libstdc++: Support std::is_aggregate on clang++

Currently, libstdc++ tries to detect __is_aggregate built-in macro using
__has_builtin, but this fails on clang++ because __has_builtin on
clang++ detects only built-in functions, not built-in macros. This patch
adds a test using __is_identifier. Tested on clang++
5.0.0-svn308422-1~exp1 and g++ 7.1.0-10 from Debian unstable.
---
 libstdc++-v3/include/std/type_traits | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 390b6f40a..e7ec402fb 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -2894,6 +2894,11 @@ template <typename _From, typename _To>
 
 #if __GNUC__ >= 7
 # define _GLIBCXX_HAVE_BUILTIN_IS_AGGREGATE 1
+#elif defined(__is_identifier)
+// For clang
+# if ! __is_identifier(__is_aggregate)
+#  define _GLIBCXX_HAVE_BUILTIN_IS_AGGREGATE 1
+# endif
 #elif defined __has_builtin
 // For non-GNU compilers:
 # if __has_builtin(__is_aggregate)
--
2.13.3

_______________________________________________
cfe-dev mailing list
[hidden email]
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PATCH] libstdc++: Support std::is_aggregate on clang++ (was clang++: std::is_aggregate unusable with clang-5.0/libstdc++-7)

Sumner, Brian via cfe-dev
On 27/07/17 16:27 +0900, Katsuhiko Nishimra wrote:

>From 56c4a18d0d8c8ce7aa1239880138775e4db06645 Mon Sep 17 00:00:00 2001
>From: Katsuhiko Nishimra <[hidden email]>
>Date: Thu, 27 Jul 2017 16:03:54 +0900
>Subject: [PATCH] libstdc++: Support std::is_aggregate on clang++
>
>Currently, libstdc++ tries to detect __is_aggregate built-in macro using
>__has_builtin, but this fails on clang++ because __has_builtin on
>clang++ detects only built-in functions, not built-in macros. This patch
>adds a test using __is_identifier. Tested on clang++
>5.0.0-svn308422-1~exp1 and g++ 7.1.0-10 from Debian unstable.
>---
> libstdc++-v3/include/std/type_traits | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
>index 390b6f40a..e7ec402fb 100644
>--- a/libstdc++-v3/include/std/type_traits
>+++ b/libstdc++-v3/include/std/type_traits
>@@ -2894,6 +2894,11 @@ template <typename _From, typename _To>
>
> #if __GNUC__ >= 7
> # define _GLIBCXX_HAVE_BUILTIN_IS_AGGREGATE 1
>+#elif defined(__is_identifier)
>+// For clang
>+# if ! __is_identifier(__is_aggregate)
>+#  define _GLIBCXX_HAVE_BUILTIN_IS_AGGREGATE 1
>+# endif
> #elif defined __has_builtin
> // For non-GNU compilers:
> # if __has_builtin(__is_aggregate)

This __has_bultin check only exists for Clang, so should be replaced
by the correct __is_identifier check, not left there in addition to
it.


_______________________________________________
cfe-dev mailing list
[hidden email]
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PATCH] libstdc++: Support std::is_aggregate on clang++ (was clang++: std::is_aggregate unusable with clang-5.0/libstdc++-7)

Sumner, Brian via cfe-dev
On Mon, Jul 31, 2017 at 10:53 AM, Jonathan Wakely <[hidden email]> wrote:

> On 27/07/17 16:27 +0900, Katsuhiko Nishimra wrote:
>>
>> From 56c4a18d0d8c8ce7aa1239880138775e4db06645 Mon Sep 17 00:00:00 2001
>> From: Katsuhiko Nishimra <[hidden email]>
>> Date: Thu, 27 Jul 2017 16:03:54 +0900
>> Subject: [PATCH] libstdc++: Support std::is_aggregate on clang++
>>
>> Currently, libstdc++ tries to detect __is_aggregate built-in macro using
>> __has_builtin, but this fails on clang++ because __has_builtin on
>> clang++ detects only built-in functions, not built-in macros. This patch
>> adds a test using __is_identifier. Tested on clang++
>> 5.0.0-svn308422-1~exp1 and g++ 7.1.0-10 from Debian unstable.
>> ---
>> libstdc++-v3/include/std/type_traits | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/libstdc++-v3/include/std/type_traits
>> b/libstdc++-v3/include/std/type_traits
>> index 390b6f40a..e7ec402fb 100644
>> --- a/libstdc++-v3/include/std/type_traits
>> +++ b/libstdc++-v3/include/std/type_traits
>> @@ -2894,6 +2894,11 @@ template <typename _From, typename _To>
>>
>> #if __GNUC__ >= 7
>> # define _GLIBCXX_HAVE_BUILTIN_IS_AGGREGATE 1
>> +#elif defined(__is_identifier)
>> +// For clang
>> +# if ! __is_identifier(__is_aggregate)
>> +#  define _GLIBCXX_HAVE_BUILTIN_IS_AGGREGATE 1
>> +# endif
>> #elif defined __has_builtin
>> // For non-GNU compilers:
>> # if __has_builtin(__is_aggregate)
>
>
> This __has_bultin check only exists for Clang, so should be replaced
> by the correct __is_identifier check, not left there in addition to
> it.
>
>

https://clang.llvm.org/docs/LanguageExtensions.html#checks-for-type-trait-primitives
seems to suggest using __has_extension instead.
_______________________________________________
cfe-dev mailing list
[hidden email]
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PATCH] libstdc++: Support std::is_aggregate on clang++ (was clang++: std::is_aggregate unusable with clang-5.0/libstdc++-7)

Sumner, Brian via cfe-dev
On Mon, Jul 31, 2017 at 11:13 AM, Tim Song <[hidden email]> wrote:
>
> https://clang.llvm.org/docs/LanguageExtensions.html#checks-for-type-trait-primitives
> seems to suggest using __has_extension instead.

Hmm, that doesn't work. Oh well.
_______________________________________________
cfe-dev mailing list
[hidden email]
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PATCH] libstdc++: Support std::is_aggregate on clang++ (was clang++: std::is_aggregate unusable with clang-5.0/libstdc++-7)

Sumner, Brian via cfe-dev
In reply to this post by Sumner, Brian via cfe-dev
On Mon, Jul 31, 2017 at 03:53:42PM +0100, Jonathan Wakely wrote:
> This __has_bultin check only exists for Clang, so should be replaced
> by the correct __is_identifier check, not left there in addition to
> it.

I see. Actually I've guessed so, and thank you for clarifying it.
I'm attaching a replacing patch. Please take a look at it.


_______________________________________________
cfe-dev mailing list
[hidden email]
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev

0001-libstdc-Support-std-is_aggregate-on-clang.patch (1K) Download Attachment
signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PATCH] libstdc++: Support std::is_aggregate on clang++ (was clang++: std::is_aggregate unusable with clang-5.0/libstdc++-7)

Sumner, Brian via cfe-dev
In reply to this post by Sumner, Brian via cfe-dev
On Mon, Jul 31, 2017 at 11:13:52AM -0400, Tim Song wrote:
>
> https://clang.llvm.org/docs/LanguageExtensions.html#checks-for-type-trait-primitives
> seems to suggest using __has_extension instead.

On Mon, Jul 31, 2017 at 01:23:03PM -0400, Tim Song wrote:
>
> Hmm, that doesn't work. Oh well.

By the way, Isn't it a bug? I've also confirmed both
__has_extension(is_aggregate) and __has_extension(__is_aggregate)
returns 0 on clang 6.0.0-svn309616-1~exp1.
_______________________________________________
cfe-dev mailing list
[hidden email]
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PATCH] libstdc++: Support std::is_aggregate on clang++ (was clang++: std::is_aggregate unusable with clang-5.0/libstdc++-7)

Sumner, Brian via cfe-dev
In reply to this post by Sumner, Brian via cfe-dev
On 02/08/17 00:05 +0900, Katsuhiko Nishimra wrote:
>On Mon, Jul 31, 2017 at 03:53:42PM +0100, Jonathan Wakely wrote:
>> This __has_bultin check only exists for Clang, so should be replaced
>> by the correct __is_identifier check, not left there in addition to
>> it.
>
>I see. Actually I've guessed so, and thank you for clarifying it.
>I'm attaching a replacing patch. Please take a look at it.

Thanks, I've committed this to GCC trunk and will backport it to the
gcc-7-branch after the GCC 7.2 release (which is due any day now).

I've also committed the attached patch which changes our feature
detection for a __has_unique_object_representations builtin, as I
expect that will also need to use __is_identifier if/when Clang
supports it.

Tested powerpc64le-linux, and also tested using Clang version 5.0.0
(trunk 307530) to confirm that __is_aggregate is correctly detected
and std::is_aggregate is defined.

>From 1b22cc531027832cf1eb50b73354f1730edbba54 Mon Sep 17 00:00:00 2001
>From: Katsuhiko Nishimra <[hidden email]>
>Date: Tue, 1 Aug 2017 20:36:58 +0900
>Subject: [PATCH] libstdc++: Support std::is_aggregate on clang++
>
>Currently, libstdc++ tries to detect __is_aggregate built-in macro using
>__has_builtin, but this fails on clang++ because __has_builtin on
>clang++ detects only built-in functions, not built-in macros. This patch
>adds a test using __is_identifier. Tested with clang++
>6.0.0-svn309616-1~exp1 and g++ 7.1.0-11 on Debian unstable.
>---
> libstdc++-v3/include/std/type_traits | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
>index 390b6f40a..ee9c75baf 100644
>--- a/libstdc++-v3/include/std/type_traits
>+++ b/libstdc++-v3/include/std/type_traits
>@@ -2894,9 +2894,9 @@ template <typename _From, typename _To>
>
> #if __GNUC__ >= 7
> # define _GLIBCXX_HAVE_BUILTIN_IS_AGGREGATE 1
>-#elif defined __has_builtin
>+#elif defined(__is_identifier)
> // For non-GNU compilers:
>-# if __has_builtin(__is_aggregate)
>+# if ! __is_identifier(__is_aggregate)
> #  define _GLIBCXX_HAVE_BUILTIN_IS_AGGREGATE 1
> # endif
> #endif
>--
>2.13.3
>



_______________________________________________
cfe-dev mailing list
[hidden email]
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev

patch.txt (1K) Download Attachment
Loading...