From: charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 20 Nov 2014 11:49:43 +0000 (+0000)
Subject: 2014-11-20  Ed Schonberg  <schonberg@adacore.com>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc353d9b65c0f7aebd142fbb89460335e285af6d;p=thirdparty%2Fgcc.git

2014-11-20  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch6.adb: Improve better error message.



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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c01298c750ed..a86d9ef99f43 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-20  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch6.adb: Improve better error message.
+
 2014-11-20  Thomas Quinot  <quinot@adacore.com>
 
 	* freeze.adb, sem_ch13.adb: Minor editing.
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 5a5265c2778e..1fcde26714a7 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -334,7 +334,8 @@ package body Sem_Ch6 is
            and then Nkind (Original_Node (Unit_Declaration_Node (Prev)))
              =  N_Expression_Function
          then
-            Error_Msg_N ("Duplicate expression function", N);
+            Error_Msg_Sloc := Sloc (Prev);
+            Error_Msg_N ("& conflicts with declaration#", Def_Id);
             return;
          end if;
       end if;