From 7650880cce12a8e56a425eb8f2807379ed69b830 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 1 Feb 2002 15:56:43 +0000
Subject: [PATCH]         * error.c (dump_scope): Don't add
 TFF_DECL_SPECIFIERS.         (dump_function_decl): Always dump parms.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49396 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                       | 4 ----
 gcc/cp/error.c                         | 5 ++---
 gcc/testsuite/g++.dg/template/local1.C | 4 ++--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a3aa99e..63c8747 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,9 +1,5 @@
 2002-02-01  Jason Merrill  <jason@redhat.com>
 
-	PR c++/4872
-	* decl.c (finish_function): Warn about a non-void function with 
-	no return statement.
-
 	* error.c (dump_scope): Don't add TFF_DECL_SPECIFIERS.
 	(dump_function_decl): Always dump parms.
 
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 4642fcd..594d4e4 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -140,8 +140,7 @@ dump_scope (scope, flags)
      tree scope;
      int flags;
 {
-  int f = ~TFF_RETURN_TYPE & (TFF_DECL_SPECIFIERS
-                              | (flags & (TFF_SCOPE | TFF_CHASE_TYPEDEF)));
+  int f = ~TFF_RETURN_TYPE & (flags & (TFF_SCOPE | TFF_CHASE_TYPEDEF));
 
   if (scope == NULL_TREE)
     return;
@@ -1137,7 +1136,7 @@ dump_function_decl (t, flags)
 
   dump_function_name (t, flags);
 
-  if (flags & TFF_DECL_SPECIFIERS) 
+  if (1)
     {
       dump_parameters (parmtypes, flags);
 
diff --git a/gcc/testsuite/g++.dg/template/local1.C b/gcc/testsuite/g++.dg/template/local1.C
index 85b0056..f0897d4 100644
--- a/gcc/testsuite/g++.dg/template/local1.C
+++ b/gcc/testsuite/g++.dg/template/local1.C
@@ -2,7 +2,7 @@
 // g(), because xref wanted the mangled name, which breaks inside a template.
 
 // Of course, the offending code is actually ill-formed anyway, so check
-// for the error.
+// for the error.  Also check that it's formatted properly.
 
 struct A
 {
@@ -14,7 +14,7 @@ template<class T> void A::f()
   struct B
   {
     void g() {}
-    static int x;		// { dg-error "static" "" }
+    static int x;	// { dg-error "static.*`int A::f\\(\\)::B::x'" "" }
   };
 }
 
-- 
2.7.4