From a52fb89bed45b545f6b714450f81f2d3419f73bb Mon Sep 17 00:00:00 2001
From: Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
Date: Sun, 17 Sep 2000 14:37:55 +0000
Subject: [PATCH] c-decl.c (grokdeclarator): Reorder tests to avoid looking at
 TYPE_MAIN_VARIANT of ERROR_MARK.

	* c-decl.c (grokdeclarator): Reorder tests to avoid looking at
	TYPE_MAIN_VARIANT of ERROR_MARK.
	* c-lex.c (readescape): Avoid using printf syntax we don't recognize.

From-SVN: r36472
---
 gcc/ChangeLog | 4 ++++
 gcc/c-decl.c  | 4 ++--
 gcc/c-lex.c   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ffa88662867a..4eca4b1f21cf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 Sun Sep 17 10:46:17 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
+	* c-decl.c (grokdeclarator): Reorder tests to avoid looking at
+	TYPE_MAIN_VARIANT of ERROR_MARK.
+	* c-lex.c (readescape): Avoid using printf syntax we don't recognize.
+
 	* simplify-rtx.c (simplify_unary_operation): Add cases
 	FLOAT_EXTEND and FLOAT_TRUNCATE to ones that return 0.
 
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index b8421a7c4bc1..1de1f9748c35 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -4650,8 +4650,8 @@ grokdeclarator (declarator, declspecs, decl_context, initialized)
      controlled separately by its own initializer.  */
 
   if (type != 0 && typedef_type != 0
-      && TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (typedef_type)
-      && TREE_CODE (type) == ARRAY_TYPE && TYPE_DOMAIN (type) == 0)
+      && TREE_CODE (type) == ARRAY_TYPE && TYPE_DOMAIN (type) == 0
+      && TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (typedef_type))
     {
       type = build_array_type (TREE_TYPE (type), 0);
       if (size_varies)
diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index f853fd067e9b..b1f555b8e6ea 100644
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -1009,7 +1009,7 @@ readescape (p, limit, cptr)
   if (ISGRAPH (c))
     pedwarn ("unknown escape sequence '\\%c'", c);
   else
-    pedwarn ("unknown escape sequence: '\\' followed by char 0x%.2x", c);
+    pedwarn ("unknown escape sequence: '\\' followed by char 0x%x", c);
 
   *cptr = c;
   return p;
-- 
GitLab