From: Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
Date: Mon, 5 May 2003 12:19:12 +0000 (+0000)
Subject: re PR c++/4494 (Possible problem with compiler warnings on main())
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4b41d9ebe1de8df643178c2526e6ebd04ad7280a;p=gcc.git

re PR c++/4494 (Possible problem with compiler warnings on main())

	PR c++/4494
	* decl.c (start_function): Use same_type_p to check return type
	of main.

	* g++.dg/warn/main.C: New test.

From-SVN: r66476
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4f6fe484d01..0a8d76daa74 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-05  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+	PR c++/4494
+	* decl.c (start_function): Use same_type_p to check return type
+	of main.
+
 2003-05-03  Zack Weinberg  <zack@codesourcery.com>
 
 	PR c/10604
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 6cbcd3f9c4b..34f82bd9d08 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -13382,8 +13382,9 @@ start_function (tree declspecs, tree declarator, tree attrs, int flags)
 	ctype = TYPE_METHOD_BASETYPE (fntype);
       else if (DECL_MAIN_P (decl1))
 	{
-	  /* If this doesn't return integer_type, complain.  */
-	  if (TREE_TYPE (TREE_TYPE (decl1)) != integer_type_node)
+	  /* If this doesn't return integer_type, or a typedef to
+	     integer_type, complain.  */
+	  if (!same_type_p (TREE_TYPE (TREE_TYPE (decl1)), integer_type_node))
 	    {
 	      if (pedantic || warn_return_type)
 		pedwarn ("return type for `main' changed to `int'");
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5f20c5e795e..aec72724b3e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-05  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+	PR c++/4494
+	* g++.dg/warn/main.C: New test.
+
 2003-05-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* gcc.dg/nonnull-3.c: New test.
diff --git a/gcc/testsuite/g++.dg/warn/main.C b/gcc/testsuite/g++.dg/warn/main.C
new file mode 100644
index 00000000000..ebf92177b2d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/main.C
@@ -0,0 +1,11 @@
+// { dg-do compile }
+
+// Origin: Donald W. Gillies <dgillies@graviton.com>
+
+// PR c++/4494: Incorrect diagnostics about return type of main.
+
+typedef int int_t;
+
+int_t main() {
+
+}