aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2023-04-18 17:12:17 -0400
committerJason Merrill <jason@redhat.com>2023-04-19 11:23:11 -0400
commited32ec26697cc77492d094b31a0d2eebc0535644 (patch)
treec7b143ad5b3946bfd2dc7ccfaee8e506190e0c09
parent9fdea28d6ace8c8e5ac64a55685d310ba8dfa3cf (diff)
downloadgcc-ed32ec26697cc77492d094b31a0d2eebc0535644.zip
gcc-ed32ec26697cc77492d094b31a0d2eebc0535644.tar.gz
gcc-ed32ec26697cc77492d094b31a0d2eebc0535644.tar.bz2
c++: fix 'unsigned __int128_t' semantics [PR108099]
My earlier patch for 108099 made us accept this non-standard pattern but messed up the semantics, so that e.g. unsigned __int128_t was not a 128-bit type. PR c++/108099 gcc/cp/ChangeLog: * decl.cc (grokdeclarator): Keep typedef_decl for __int128_t. gcc/testsuite/ChangeLog: * g++.dg/ext/int128-8.C: New test.
-rw-r--r--gcc/cp/decl.cc6
-rw-r--r--gcc/testsuite/g++.dg/ext/int128-8.C24
2 files changed, 28 insertions, 2 deletions
diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 772c059..ab5cb69 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -12482,12 +12482,14 @@ grokdeclarator (const cp_declarator *declarator,
key, typedef_decl);
ok = !flag_pedantic_errors;
if (is_typedef_decl (typedef_decl))
- type = DECL_ORIGINAL_TYPE (typedef_decl);
+ {
+ type = DECL_ORIGINAL_TYPE (typedef_decl);
+ typedef_decl = NULL_TREE;
+ }
else
/* PR108099: __int128_t comes from c_common_nodes_and_builtins,
and is not built as a typedef. */
type = TREE_TYPE (typedef_decl);
- typedef_decl = NULL_TREE;
}
else if (declspecs->decltype_p)
error_at (loc, "%qs specified with %<decltype%>", key);
diff --git a/gcc/testsuite/g++.dg/ext/int128-8.C b/gcc/testsuite/g++.dg/ext/int128-8.C
new file mode 100644
index 0000000..14bbc49
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/int128-8.C
@@ -0,0 +1,24 @@
+// PR c++/108099
+// { dg-do compile { target c++11 } }
+// { dg-options "" }
+
+using u128 = unsigned __int128_t;
+using s128 = signed __int128_t;
+template <typename T, T v> struct integral_constant {
+ static constexpr T value = v;
+};
+typedef integral_constant <bool, false> false_type;
+typedef integral_constant <bool, true> true_type;
+template <class T, class U>
+struct is_same : false_type {};
+template <class T>
+struct is_same <T, T> : true_type {};
+static_assert (is_same <__int128, s128>::value, "");
+static_assert (is_same <signed __int128, s128>::value, "");
+static_assert (is_same <__int128_t, s128>::value, "");
+static_assert (is_same <unsigned __int128, u128>::value, ""); // { dg-bogus "" "" { xfail *-*-* } }
+static_assert (is_same <__uint128_t, u128>::value, ""); // { dg-bogus "" "" { xfail *-*-* } }
+static_assert (sizeof (s128) == sizeof (__int128), "");
+static_assert (sizeof (u128) == sizeof (unsigned __int128), "");
+static_assert (s128(-1) < 0, "");
+static_assert (u128(-1) > 0, "");