[gcc r13-6569] c++: signed __int128_t [PR108099]

[Jason Merrill <jason@gcc.gnu.org>]

https://gcc.gnu.org/g:2fc55f51f9953b451d6d6ddfae23379001e6ac95

commit r13-6569-g2fc55f51f9953b451d6d6ddfae23379001e6ac95
Author: Jason Merrill <jason@redhat.com>
Date:   Thu Mar 9 17:35:24 2023 -0500

    c++: signed __int128_t [PR108099]
    
    The code for handling signed + typedef was breaking on __int128_t, because
    it isn't a proper typedef: it doesn't have DECL_ORIGINAL_TYPE.
    
            PR c++/108099
    
    gcc/cp/ChangeLog:
    
            * decl.cc (grokdeclarator): Handle non-typedef typedef_decl.
    
    gcc/testsuite/ChangeLog:
    
            * g++.dg/ext/int128-7.C: New test.

Diff:
---
 gcc/cp/decl.cc                      | 11 ++++++++---
 gcc/testsuite/g++.dg/ext/int128-7.C |  4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 30c7470974d..b1603859644 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -12440,10 +12440,15 @@ grokdeclarator (const cp_declarator *declarator,
 	{
 	  if (typedef_decl)
 	    {
-	      pedwarn (loc, OPT_Wpedantic, "%qs specified with %qT",
-		       key, type);
+	      pedwarn (loc, OPT_Wpedantic, "%qs specified with %qD",
+		       key, typedef_decl);
 	      ok = !flag_pedantic_errors;
-	      type = DECL_ORIGINAL_TYPE (typedef_decl);
+	      if (is_typedef_decl (typedef_decl))
+		type = DECL_ORIGINAL_TYPE (typedef_decl);
+	      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)
diff --git a/gcc/testsuite/g++.dg/ext/int128-7.C b/gcc/testsuite/g++.dg/ext/int128-7.C
new file mode 100644
index 00000000000..bf5e8c40a4b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/int128-7.C
@@ -0,0 +1,4 @@
+// PR c++/108099
+// { dg-do compile { target { c++11 && int128 } } }
+
+using i128 = signed __int128_t;	// { dg-error "specified with" }