re PR c++/27100 (ICE with multiple friend declarations)
Fix PR c++/27100 gcc/cp/ChangeLog: PR c++/27100 * decl.c (duplicate_decls): Properly copy the DECL_PENDING_INLINE_P, DECL_PENDING_INLINE_INFO and DECL_SAVED_FUNCTION_DATA fields from OLDDECL to NEWDECL. gcc/testsuite/ChangeLog: PR c++/27100 * g++.dg/other/friend6.C: New test. From-SVN: r237078
This commit is contained in:
parent
1c7733a760
commit
c8572dd688
4 changed files with 38 additions and 2 deletions
|
@ -1,3 +1,10 @@
|
|||
2016-06-03 Patrick Palka <ppalka@gcc.gnu.org>
|
||||
|
||||
PR c++/27100
|
||||
* decl.c (duplicate_decls): Properly copy the
|
||||
DECL_PENDING_INLINE_P, DECL_PENDING_INLINE_INFO and
|
||||
DECL_SAVED_FUNCTION_DATA fields from OLDDECL to NEWDECL.
|
||||
|
||||
2016-06-03 Chung-Lin Tang <cltang@codesourcery.com>
|
||||
|
||||
* semantics.c (finish_omp_clauses): Mark OpenACC reduction
|
||||
|
|
|
@ -2351,8 +2351,17 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend)
|
|||
}
|
||||
else
|
||||
{
|
||||
if (DECL_PENDING_INLINE_INFO (newdecl) == 0)
|
||||
DECL_PENDING_INLINE_INFO (newdecl) = DECL_PENDING_INLINE_INFO (olddecl);
|
||||
if (DECL_PENDING_INLINE_P (olddecl))
|
||||
{
|
||||
DECL_PENDING_INLINE_P (newdecl) = 1;
|
||||
DECL_PENDING_INLINE_INFO (newdecl)
|
||||
= DECL_PENDING_INLINE_INFO (olddecl);
|
||||
}
|
||||
else if (DECL_PENDING_INLINE_P (newdecl))
|
||||
;
|
||||
else if (DECL_SAVED_FUNCTION_DATA (newdecl) == NULL)
|
||||
DECL_SAVED_FUNCTION_DATA (newdecl)
|
||||
= DECL_SAVED_FUNCTION_DATA (olddecl);
|
||||
|
||||
DECL_DECLARED_INLINE_P (newdecl) |= DECL_DECLARED_INLINE_P (olddecl);
|
||||
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
2016-06-03 Patrick Palka <ppalka@gcc.gnu.org>
|
||||
|
||||
PR c++/27100
|
||||
* g++.dg/other/friend6.C: New test.
|
||||
|
||||
2016-06-03 Bill Schmidt <wschmidt@linux.vnet.ibm.com>
|
||||
|
||||
* g++.dg/torture/ppc-ldst-array.C: New.
|
||||
|
|
15
gcc/testsuite/g++.dg/other/friend6.C
Normal file
15
gcc/testsuite/g++.dg/other/friend6.C
Normal file
|
@ -0,0 +1,15 @@
|
|||
// PR c++/27100
|
||||
// This used to fail at link time with an "undefined reference to 'foo'" error.
|
||||
// { dg-do run }
|
||||
|
||||
struct A
|
||||
{
|
||||
friend void foo (const A&) { }
|
||||
friend void foo (const A&);
|
||||
};
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
foo (A ());
|
||||
}
|
Loading…
Add table
Reference in a new issue