Patchwork [C++] Avoid pairs of error calls in duplicate_decls

login
register
mail settings
Submitter Paolo Carlini
Date Dec. 5, 2013, 11:19 p.m.
Message ID <52A109E8.1010909@oracle.com>
Download mbox | patch
Permalink /patch/297459/
State New
Headers show

Comments

Paolo Carlini - Dec. 5, 2013, 11:19 p.m.
Hi,

On 12/05/2013 11:41 PM, Jakub Jelinek wrote:
> On Tue, Dec 03, 2013 at 11:49:03AM +0100, Paolo Carlini wrote:
>> 2013-12-03  Paolo Carlini  <paolo.carlini@oracle.com>
>>
>> 	* decl.c (duplicate_decls): Replace pairs of errors and permerrors
>> 	with error + inform (permerror + inform, respectively).
> This broke
> g++.dg/warn/pr15774-1.C
> test:
> /usr/src/gcc/gcc/testsuite/g++.dg/warn/pr15774-1.C: In function 'void foo(int)':
> /usr/src/gcc/gcc/testsuite/g++.dg/warn/pr15774-1.C:11:41: error: ambiguating new declaration of 'void foo(int)'
> /usr/src/gcc/gcc/testsuite/g++.dg/warn/pr15774-1.C:3:13: note: old declaration 'void foo(int)'
> compiler exited with status 1
> output is:
> /usr/src/gcc/gcc/testsuite/g++.dg/warn/pr15774-1.C: In function 'void foo(int)':
> /usr/src/gcc/gcc/testsuite/g++.dg/warn/pr15774-1.C:11:41: error: ambiguating new declaration of 'void foo(int)'
> /usr/src/gcc/gcc/testsuite/g++.dg/warn/pr15774-1.C:3:13: note: old declaration 'void foo(int)'
>
> FAIL: g++.dg/warn/pr15774-1.C -std=c++98  (test for errors, line 3)
> PASS: g++.dg/warn/pr15774-1.C -std=c++98  (test for errors, line 11)
> PASS: g++.dg/warn/pr15774-1.C -std=c++98 (test for excess errors)
Sorry I didn't test multilib. I committed the below.

Thanks,
Paolo.

//////////////////////////
2013-12-05  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/warn/pr15774-1.C: Adjust expected message.
Jakub Jelinek - Dec. 5, 2013, 11:27 p.m.
On Fri, Dec 06, 2013 at 12:19:04AM +0100, Paolo Carlini wrote:
> 2013-12-05  Paolo Carlini  <paolo.carlini@oracle.com>
> 
> 	* g++.dg/warn/pr15774-1.C: Adjust expected message.

Thanks.

	Jakub

Patch

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 205721)
+++ ChangeLog	(working copy)
@@ -1,3 +1,7 @@ 
+2013-12-05  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/warn/pr15774-1.C: Adjust expected message.
+
 2013-12-05  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR rtl-optimization/59317
@@ -27,7 +31,7 @@ 
 	* c-c++-common/tsan/thread_leak2.c: New test.
 	* c-c++-common/tsan/tiny_race.c: New test.
 	* c-c++-common/tsan/tls_race.c: New test.
-	* c-c++-common/tsan/write_in_reader_lock.c: New test.	
+	* c-c++-common/tsan/write_in_reader_lock.c: New test.
 	* lib/tsan-dg.exp: New file.
 	* gcc.dg/tsan/tsan.exp: New file.
 	* g++.dg/tsan/tsan.exp: New file.
Index: g++.dg/warn/pr15774-1.C
===================================================================
--- g++.dg/warn/pr15774-1.C	(revision 205721)
+++ g++.dg/warn/pr15774-1.C	(working copy)
@@ -1,6 +1,6 @@ 
 // { dg-do compile { target { { i?86-*-* x86_64-*-* } && ia32 } } }
 // Test that an new declartion with different attributes then old one fail.
-extern void foo (int); // { dg-error "ambiguates old declaration" }
+extern void foo (int); // { dg-message "old declaration" }
 
 void
 bar (void)