call.c (convert_like_real): Use inform for identifying the declaration point.

	* call.c (convert_like_real): Use inform for identifying the
	declaration point.

From-SVN: r210332

13 files changed, 19 insertions, 14 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a9aa613..15dc0b6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-12  Jason Merrill  <jason@redhat.com>
+
+	* call.c (convert_like_real): Use inform for identifying the
+	declaration point.
+
 2014-05-12  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* cvt.c (cp_convert_to_pointer): Don't call error_at if
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 254b43a..f2ceef2 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -6256,8 +6256,8 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
 	return expr;
       expr = build_temp (expr, totype, flags, &diag_kind, complain);
       if (diag_kind && fn && complain)
-	emit_diagnostic (diag_kind, DECL_SOURCE_LOCATION (fn), 0,
-			 "  initializing argument %P of %qD", argnum, fn);
+	inform (DECL_SOURCE_LOCATION (fn),
+		"  initializing argument %P of %qD", argnum, fn);
       return build_cplus_new (totype, expr, complain);
 
     case ck_ref_bind:
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted20.C b/gcc/testsuite/g++.dg/cpp0x/defaulted20.C
index affda20..2bc4f7f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted20.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted20.C
@@ -10,7 +10,7 @@ struct B {
   B(B&&) = default;	// { dg-error "implicitly deleted|use of deleted" }
 };
 
-void g(B);			// { dg-error "argument 1" }
+void g(B);			// { dg-message "argument 1" }
 B&& f();
 
 int main()
diff --git a/gcc/testsuite/g++.dg/overload/arg3.C b/gcc/testsuite/g++.dg/overload/arg3.C
index 34624cd..58c1694 100644
--- a/gcc/testsuite/g++.dg/overload/arg3.C
+++ b/gcc/testsuite/g++.dg/overload/arg3.C
@@ -14,7 +14,7 @@ struct B : A
   B(B&);  // { dg-message "note" "" }
 };
 
-void foo(B);			// { dg-error "initializing" }
+void foo(B);			// { dg-message "initializing" }
 
 void bar()
 {
diff --git a/gcc/testsuite/g++.dg/overload/copy1.C b/gcc/testsuite/g++.dg/overload/copy1.C
index f0ec385..b634b05 100644
--- a/gcc/testsuite/g++.dg/overload/copy1.C
+++ b/gcc/testsuite/g++.dg/overload/copy1.C
@@ -10,7 +10,7 @@ struct B
 
 struct A
 {
-  A (B);			// { dg-error "initializing" }
+  A (B);			// { dg-message "initializing" }
 };
 
 B
diff --git a/gcc/testsuite/g++.dg/overload/volatile1.C b/gcc/testsuite/g++.dg/overload/volatile1.C
index baf467d..29f649f 100644
--- a/gcc/testsuite/g++.dg/overload/volatile1.C
+++ b/gcc/testsuite/g++.dg/overload/volatile1.C
@@ -3,7 +3,7 @@
 
 struct A { };
 
-void f (A);			// { dg-error "argument 1" }
+void f (A);			// { dg-message "" }
 void (*g)(A);
 
 int main()
diff --git a/gcc/testsuite/g++.dg/tc1/dr152.C b/gcc/testsuite/g++.dg/tc1/dr152.C
index bf742ee9..944906c 100644
--- a/gcc/testsuite/g++.dg/tc1/dr152.C
+++ b/gcc/testsuite/g++.dg/tc1/dr152.C
@@ -7,7 +7,7 @@ namespace N1 {
     X();			// { dg-message "note" }
     explicit X(const X&);
   };
-  void f(X);			// { dg-error "initializing" }
+  void f(X);			// { dg-message "initializing" }
   int foo() 
   { 
     X x; 
@@ -24,7 +24,7 @@ namespace N2 {
   };
 
   template <class T>
-  void f(T ) {}			// { dg-error "initializing" }
+  void f(T) {}			// { dg-message "initializing" }
   
   template <class T>
   int foo() 
diff --git a/gcc/testsuite/g++.dg/template/incomplete4.C b/gcc/testsuite/g++.dg/template/incomplete4.C
index f2832a7..871e503 100644
--- a/gcc/testsuite/g++.dg/template/incomplete4.C
+++ b/gcc/testsuite/g++.dg/template/incomplete4.C
@@ -5,7 +5,7 @@ class A;	// { dg-error "forward declaration" }
 
 template <typename T> struct X
 {
-  static int f (T);		// { dg-error "initializing" }
+  static int f (T);		// { dg-message "initializing" }
   static const T &make ();
 };
 
diff --git a/gcc/testsuite/g++.dg/template/incomplete5.C b/gcc/testsuite/g++.dg/template/incomplete5.C
index f780282..b0a178b 100644
--- a/gcc/testsuite/g++.dg/template/incomplete5.C
+++ b/gcc/testsuite/g++.dg/template/incomplete5.C
@@ -5,7 +5,7 @@ class A;	// { dg-error "forward declaration" }
 
 template <typename T> struct X
 {
-  static int f (T);		// { dg-error "initializing" }
+  static int f (T);		// { dg-message "initializing" }
   static const T &make ();
   static const bool value = sizeof (f (make ())) == sizeof (int);	// { dg-error "invalid use of incomplete type" }
 };
diff --git a/gcc/testsuite/g++.dg/warn/incomplete2.C b/gcc/testsuite/g++.dg/warn/incomplete2.C
index 30be267..c307c30 100644
--- a/gcc/testsuite/g++.dg/warn/incomplete2.C
+++ b/gcc/testsuite/g++.dg/warn/incomplete2.C
@@ -3,7 +3,7 @@
 
 class A;	// { dg-error "forward declaration" }
 
-int f (A);			// { dg-error "initializing" }
+int f (A);			// { dg-message "initializing" }
 const A &make ();
 
 int
diff --git a/gcc/testsuite/g++.old-deja/g++.bob/inherit2.C b/gcc/testsuite/g++.old-deja/g++.bob/inherit2.C
index 6e26ecf..f92e8e1 100644
--- a/gcc/testsuite/g++.old-deja/g++.bob/inherit2.C
+++ b/gcc/testsuite/g++.old-deja/g++.bob/inherit2.C
@@ -15,7 +15,7 @@ public:
   B(void) {}
 };
 
-void f(B b) {			// { dg-error "initializing" }
+void f(B b) {			// { dg-message "initializing" }
 }
 
 void g() {
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/auto_ptr.C b/gcc/testsuite/g++.old-deja/g++.pt/auto_ptr.C
index ecfa4de..3e672ef 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/auto_ptr.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/auto_ptr.C
@@ -44,7 +44,7 @@ struct Derived : Base { Derived() {} };
 
 auto_ptr<Derived> f() { auto_ptr<Derived> null(0); return null; }
 void g(auto_ptr<Derived>) { }
-void h(auto_ptr<Base>) { }	// { dg-error "initializing" }
+void h(auto_ptr<Base>) { }	// { dg-message "initializing" }
 
 int main() {
     auto_ptr<Base> x(f());
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/crash9.C b/gcc/testsuite/g++.old-deja/g++.pt/crash9.C
index f2d811d..aecbd60 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/crash9.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/crash9.C
@@ -1,7 +1,7 @@
 // { dg-do assemble  }
 
 template <class T>
-void f(T) {}			// { dg-error "initializing" }
+void f(T) {}			// { dg-message "initializing" }
 
 class C;    // { dg-error "forward declaration" }