Index: cp/decl.c
===================================================================
--- cp/decl.c	(revision 271899)
+++ cp/decl.c	(working copy)
@@ -11873,6 +11873,8 @@ grokdeclarator (const cp_declarator *declarator,
       unqualified_id = dname;
     }
 
+  location_t loc = declarator ? declarator->id_loc : input_location;
+
   /* If TYPE is a FUNCTION_TYPE, but the function name was explicitly
      qualified with a class-name, turn it into a METHOD_TYPE, unless
      we know that the function is static.  We take advantage of this
@@ -11893,13 +11895,12 @@ grokdeclarator (const cp_declarator *declarator,
 	{
 	  if (friendp)
 	    {
-	      permerror (input_location, "member functions are implicitly "
-					 "friends of their class");
+	      permerror (loc, "member functions are implicitly "
+			 "friends of their class");
 	      friendp = 0;
 	    }
 	  else
-	    permerror (declarator->id_loc, 
-		       "extra qualification %<%T::%> on member %qs",
+	    permerror (loc, "extra qualification %<%T::%> on member %qs",
 		       ctype, name);
 	}
       else if (/* If the qualifying type is already complete, then we
@@ -11928,19 +11929,19 @@ grokdeclarator (const cp_declarator *declarator,
 	  if (current_class_type
 	      && (!friendp || funcdef_flag || initialized))
 	    {
-	      error (funcdef_flag || initialized
-		     ? G_("cannot define member function %<%T::%s%> "
-			  "within %qT")
-		     : G_("cannot declare member function %<%T::%s%> "
-			  "within %qT"),
-		     ctype, name, current_class_type);
+	      error_at (loc, funcdef_flag || initialized
+			? G_("cannot define member function %<%T::%s%> "
+			     "within %qT")
+			: G_("cannot declare member function %<%T::%s%> "
+			     "within %qT"),
+			ctype, name, current_class_type);
 	      return error_mark_node;
 	    }
 	}
       else if (typedef_p && current_class_type)
 	{
-	  error ("cannot declare member %<%T::%s%> within %qT",
-		 ctype, name, current_class_type);
+	  error_at (loc, "cannot declare member %<%T::%s%> within %qT",
+		    ctype, name, current_class_type);
 	  return error_mark_node;
 	}
     }
@@ -12053,8 +12054,6 @@ grokdeclarator (const cp_declarator *declarator,
 	}
     }
 
-  location_t loc = declarator ? declarator->id_loc : input_location;
-
   /* If this is declaring a typedef name, return a TYPE_DECL.  */
   if (typedef_p && decl_context != TYPENAME)
     {
Index: testsuite/g++.dg/concepts/pr60573.C
===================================================================
--- testsuite/g++.dg/concepts/pr60573.C	(revision 271899)
+++ testsuite/g++.dg/concepts/pr60573.C	(working copy)
@@ -9,7 +9,7 @@ struct A
     void foo(auto);
   };
 
-  void B::foo(auto) {}  // { dg-error "cannot define" }
+  void B::foo(auto) {}  // { dg-error "8:cannot define" }
 
   struct X
   {
@@ -21,8 +21,8 @@ struct A
       };
     };
 
-    void Y::Z::foo(auto) {}  // { dg-error "cannot define" }
+    void Y::Z::foo(auto) {}  // { dg-error "10:cannot define" }
   };
 
-  void X::Y::Z::foo(auto) {}  // { dg-error "cannot define" }
+  void X::Y::Z::foo(auto) {}  // { dg-error "8:cannot define" }
 };
Index: testsuite/g++.dg/cpp0x/deleted13.C
===================================================================
--- testsuite/g++.dg/cpp0x/deleted13.C	(revision 271899)
+++ testsuite/g++.dg/cpp0x/deleted13.C	(working copy)
@@ -8,5 +8,5 @@ struct A
 
 struct B
 {
-  template<typename> friend void A::foo() = delete; // { dg-error "" }
+  template<typename> friend void A::foo() = delete; // { dg-error "34:cannot define" }
 };
Index: testsuite/g++.dg/other/friend4.C
===================================================================
--- testsuite/g++.dg/other/friend4.C	(revision 271899)
+++ testsuite/g++.dg/other/friend4.C	(working copy)
@@ -3,6 +3,6 @@
 
 struct A
 {
-  friend void A::foo();  // { dg-error "implicitly friends" }
-  friend A::~A();        // { dg-error "implicitly friends" }
+  friend void A::foo();  // { dg-error "15:member functions are implicitly friends" }
+  friend A::~A();        // { dg-error "10:member functions are implicitly friends" }
 };
Index: testsuite/g++.dg/other/friend5.C
===================================================================
--- testsuite/g++.dg/other/friend5.C	(revision 271899)
+++ testsuite/g++.dg/other/friend5.C	(working copy)
@@ -5,5 +5,5 @@
 
 struct A
 {
-  friend A::~A() {} /* { dg-error "implicitly friends of their class" } */
+  friend A::~A() {} /* { dg-error "10:member functions are implicitly friends of their class" } */
 };
Index: testsuite/g++.dg/other/friend7.C
===================================================================
--- testsuite/g++.dg/other/friend7.C	(revision 271899)
+++ testsuite/g++.dg/other/friend7.C	(working copy)
@@ -5,5 +5,5 @@
 
 struct A
 {
-  friend A::~A() {} // { dg-error "implicitly friends of their class" }
+  friend A::~A() {} // { dg-error "10:member functions are implicitly friends of their class" }
 };
Index: testsuite/g++.dg/parse/error29.C
===================================================================
--- testsuite/g++.dg/parse/error29.C	(revision 271899)
+++ testsuite/g++.dg/parse/error29.C	(working copy)
@@ -7,7 +7,7 @@ struct A {
   void operator delete(void *);
 };
 struct B { 
-  friend void A::foo() {} // { dg-error "22:cannot define member function 'A::foo' within 'B'" }
-  friend void A::operator delete(void*) {} // { dg-error "39:cannot define member function 'A::operator delete' within 'B'" }
-  friend A::A() {} // { dg-error "15:cannot define member function 'A::A' within 'B'" }
+  friend void A::foo() {} // { dg-error "15:cannot define member function 'A::foo' within 'B'" }
+  friend void A::operator delete(void*) {} // { dg-error "15:cannot define member function 'A::operator delete' within 'B'" }
+  friend A::A() {} // { dg-error "10:cannot define member function 'A::A' within 'B'" }
 };
Index: testsuite/g++.dg/parse/friend7.C
===================================================================
--- testsuite/g++.dg/parse/friend7.C	(revision 271899)
+++ testsuite/g++.dg/parse/friend7.C	(working copy)
@@ -32,7 +32,7 @@ struct D
 
 struct E
 {
-  friend A::A () {}		// { dg-error "cannot define member" }
-  friend A::~A () {}		// { dg-error "cannot define member" }
-  friend A::A (const A &) {}	// { dg-error "cannot define member" }
+  friend A::A () {}		// { dg-error "10:cannot define member" }
+  friend A::~A () {}		// { dg-error "10:cannot define member" }
+  friend A::A (const A &) {}	// { dg-error "10:cannot define member" }
 };
Index: testsuite/g++.dg/parse/qualified4.C
===================================================================
--- testsuite/g++.dg/parse/qualified4.C	(revision 271899)
+++ testsuite/g++.dg/parse/qualified4.C	(working copy)
@@ -2,5 +2,5 @@
 // { dg-options "" }
 
 struct X { 
-  void X::bar() {} // { dg-error "" }
+  void X::bar() {} // { dg-error "8:extra qualification" }
 }; 
Index: testsuite/g++.dg/template/crash96.C
===================================================================
--- testsuite/g++.dg/template/crash96.C	(revision 271899)
+++ testsuite/g++.dg/template/crash96.C	(working copy)
@@ -2,5 +2,5 @@
 
 template<int> struct A
 {
-  template<int> template<int> void A::foo() {} // { dg-error "extra qualification" }
+  template<int> template<int> void A::foo() {} // { dg-error "36:extra qualification" }
 };
Index: testsuite/g++.old-deja/g++.brendan/crash22.C
===================================================================
--- testsuite/g++.old-deja/g++.brendan/crash22.C	(revision 271899)
+++ testsuite/g++.old-deja/g++.brendan/crash22.C	(working copy)
@@ -6,6 +6,6 @@ struct A {
 };
 
 struct B {
-    void A::a1(); // this used to die in chainon(), now grokdeclarator should// { dg-error "" }  cannot declare.*
-    void A::a2(); // should be fixed by the 930629 change.// { dg-error "" }  cannot declare.*
+    void A::a1(); // this used to die in chainon(), now grokdeclarator should// { dg-error "10:cannot declare" }  cannot declare.*
+    void A::a2(); // should be fixed by the 930629 change.// { dg-error "10:cannot declare" }  cannot declare.*
 };
Index: testsuite/g++.old-deja/g++.brendan/crash23.C
===================================================================
--- testsuite/g++.old-deja/g++.brendan/crash23.C	(revision 271899)
+++ testsuite/g++.old-deja/g++.brendan/crash23.C	(working copy)
@@ -10,6 +10,6 @@ class A
     void f ();
     void g (int);
   };
-  void B::f () {}// { dg-error "" } .*
-  void B::g (int val) {}// { dg-error "" } .*
+  void B::f () {}// { dg-error "8:cannot define" } .*
+  void B::g (int val) {}// { dg-error "8:cannot define" } .*
 };
Index: testsuite/g++.old-deja/g++.law/visibility10.C
===================================================================
--- testsuite/g++.old-deja/g++.law/visibility10.C	(revision 271899)
+++ testsuite/g++.old-deja/g++.law/visibility10.C	(working copy)
@@ -10,7 +10,7 @@ class base {
 };
 
 class deriv : public base {
-  void base :: f1();// { dg-error "" } .*
+  void base :: f1();// { dg-error "8:cannot declare" } .*
 };
 
 int main ()
Index: testsuite/g++.old-deja/g++.other/decl5.C
===================================================================
--- testsuite/g++.old-deja/g++.other/decl5.C	(revision 271899)
+++ testsuite/g++.old-deja/g++.other/decl5.C	(working copy)
@@ -35,7 +35,7 @@ struct B {
   struct ::Q {        // { dg-error "global qual" } ::Q not a member of B
     int m;
   };
-  int A::fn() {       // { dg-error "cannot define member" } A::fn not a member of B
+  int A::fn() {       // { dg-error "7:cannot define member" } A::fn not a member of B
     return 0;
   }
   void fn(struct ::Q &);
