diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/pr15774-1.C | 15 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/pr15774-2.C | 15 |
5 files changed, 47 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5bdfa43..09e4353 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2010-12-25 Kai Tietz <kai.tietz@onevision.com> + + PR c++/15774 + * decl.c (decls_match): Check for FUNCTION_DECL + also for identity of compatible attributes. + 2010-12-22 Nathan Froyd <froydnj@codesourcery.com> * decl.c (decls_match, duplicate_decls): Use prototype_p. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index f74b0c2..f7bf1bf 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1009,7 +1009,11 @@ decls_match (tree newdecl, tree olddecl) } #endif else - types_match = compparms (p1, p2); + types_match = + compparms (p1, p2) + && (TYPE_ATTRIBUTES (TREE_TYPE (newdecl)) == NULL_TREE + || targetm.comp_type_attributes (TREE_TYPE (newdecl), + TREE_TYPE (olddecl)) != 0); } else types_match = 0; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2f07ea6..db09e39 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-12-25 Kai Tietz <kai.tietz@onevision.com> + + PR c++/15774 + * g++.dg/warn/pr15774-1.C: New test. + * g++.dg/warn/pr15774-2.C: New test. + 2010-12-24 Nicola Pero <nicola.pero@meta-innovation.com> * objc.dg/gnu-api-2-sel.m: Test calling sel_getUid, diff --git a/gcc/testsuite/g++.dg/warn/pr15774-1.C b/gcc/testsuite/g++.dg/warn/pr15774-1.C new file mode 100644 index 0000000..efd4dae --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/pr15774-1.C @@ -0,0 +1,15 @@ +// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } +// Test that an new declartion with different attributes then old one fail. +extern void foo (int); // { dg-error "ambiguates old declaration" } + +void +bar (void) +{ + foo (1); +} + +void __attribute__((stdcall)) foo (int i) // { dg-error "new declaration" } +{ +} + + diff --git a/gcc/testsuite/g++.dg/warn/pr15774-2.C b/gcc/testsuite/g++.dg/warn/pr15774-2.C new file mode 100644 index 0000000..f890b7a --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/pr15774-2.C @@ -0,0 +1,15 @@ +// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } +// Test that old declaration is used, if new one has no attributes. +extern void __attribute__((stdcall)) foo (int); + +void +bar (void) +{ + foo (1); +} + +void foo (int i) +{ +} + + |