* semantics.c (is_valid_constexpr_fn): Specify input location.

From-SVN: r171660

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e19dce9b0907a56bfc5be72e380a37c93da30c82..99a06d1fbc5b7e86a05ccfdee0a66f01475c052c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-29  Jason Merrill  <jason@redhat.com>
+
+       * semantics.c (is_valid_constexpr_fn): Specify input location.
+
 2011-03-28  Jason Merrill  <jason@redhat.com>
 
        PR c++/48313

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 6906c1be825960da4adbcac8b6c8966fa92a340c..da8c0163849f8fed2a49a5f4ae3ee986c79b6528 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -5338,8 +5338,8 @@ is_valid_constexpr_fn (tree fun, bool complain)
       {
        ret = false;
        if (complain)
-         error ("invalid type for parameter %q#D of constexpr function",
-                parm);
+         error ("invalid type for parameter %d of constexpr "
+                "function %q+#D", DECL_PARM_INDEX (parm), fun);
       }
 
   if (!DECL_CONSTRUCTOR_P (fun))
@@ -5349,7 +5349,7 @@ is_valid_constexpr_fn (tree fun, bool complain)
        {
          ret = false;
          if (complain)
-           error ("invalid return type %qT of constexpr function %qD",
+           error ("invalid return type %qT of constexpr function %q+D",
                   rettype, fun);
        }
 
@@ -5359,7 +5359,7 @@ is_valid_constexpr_fn (tree fun, bool complain)
        {
          ret = false;
          if (complain)
-           error ("enclosing class of %q#D is not a literal type", fun);
+           error ("enclosing class of %q+#D is not a literal type", fun);
        }
     }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6b960a61a4674841804edf547e3f161ad24786a6..721427265e55064e02a57e8372417443f2ed2a82 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-29  Jason Merrill  <jason@redhat.com>
+
+       * g++.dg/cpp0x/constexpr-diag1.C: Adjust error locations.
+
 2011-03-29  Janus Weil  <janus@gcc.gnu.org>
 
        PR fortran/48095

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-diag1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag1.C
index a3706d6ec8090691fb37dff0130f5754407b4f6c..183d3f768fa14a703de392b70071ce89ecc6a9ac 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-diag1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag1.C
@@ -1,12 +1,11 @@
 // Test that we explain why a template instantiation isn't constexpr
 // { dg-options -std=c++0x }
-// { dg-prune-output "not a constexpr function" }
 
 template <class T>
 struct A
 {
   T t;
-  constexpr int f() { return 42; }
+  constexpr int f() { return 42; } // { dg-error "enclosing class" }
 };
 
 struct B { B(); operator int(); };
@@ -14,8 +13,8 @@ struct B { B(); operator int(); };
 constexpr A<int> ai = { 42 };
 constexpr int i = ai.f();
 
-constexpr int b = A<B>().f();  // { dg-error "enclosing class" }
+constexpr int b = A<B>().f();  // { dg-error "not a constexpr function" }
 
 template <class T>
-constexpr int f (T t) { return 42; }
-constexpr int x = f(B());      // { dg-error "parameter" }
+constexpr int f (T t) { return 42; } // { dg-error "parameter" }
+constexpr int x = f(B());           // { dg-error "constexpr function" }