From: pinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 28 Oct 2005 20:59:05 +0000 (+0000)
Subject: 2005-10-28  Andrew Pinski  <pinskia@physics.uc.edu>
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=97b5d56a27d8144ba069cca825ba2503f566d6fc;ds=sidebyside

2005-10-28  Andrew Pinski  <pinskia@physics.uc.edu>

        * decl.c (grokfndecl): Remove the setting
        of the return type of the function type
        of main after erroring about must returning
        int.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@105963 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 81da122dab4..8776b1f5b65 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,12 @@
 2005-10-28  Andrew Pinski  <pinskia@physics.uc.edu>
 
+	* decl.c (grokfndecl): Remove the setting
+	of the return type of the function type
+	of main after erroring about must returning
+	int.
+
+2005-10-28  Andrew Pinski  <pinskia@physics.uc.edu>
+
 	PR C++/23229
 	* decl.c (grokfndecl): Create a new function type
 	after erroring out about main not returning int.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 07278ff9a1c..7e38ec3dff1 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5722,7 +5722,6 @@ grokfndecl (tree ctype,
 	  newtype =  build_function_type (integer_type_node,
 			  		  oldtypeargs);
 	  TREE_TYPE (decl) = newtype;
-	  TREE_TYPE (TREE_TYPE (decl)) = integer_type_node;
 	}
       inlinep = 0;
       publicp = 1;