diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/defaulted30.C | 16 |
4 files changed, 26 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cb230e2..23aaac1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2011-06-23 Jason Merrill <jason@redhat.com> + PR c++/49507 + * decl2.c (mark_used): Don't call synthesize_method for + functions defaulted outside the class. + * optimize.c (maybe_clone_body): Set linkage flags before cgraph_same_body_alias. diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index d2f075d..9e5a229 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -4297,6 +4297,9 @@ mark_used (tree decl) if (TREE_CODE (decl) == FUNCTION_DECL && DECL_NONSTATIC_MEMBER_FUNCTION_P (decl) && DECL_DEFAULTED_FN (decl) + /* A function defaulted outside the class is synthesized either by + cp_finish_decl or instantiate_decl. */ + && !DECL_DEFAULTED_OUTSIDE_CLASS_P (decl) && ! DECL_INITIAL (decl)) { /* Remember the current location for a function we will end up diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ec75281..8f6b625 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2011-06-23 Jason Merrill <jason@redhat.com> + PR c++/49507 + * g++.dg/cpp0x/defaulted30.C: New. + PR c++/49440 * g++.dg/rtti/anon-ns1.C: New. diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted30.C b/gcc/testsuite/g++.dg/cpp0x/defaulted30.C new file mode 100644 index 0000000..0bf4425 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted30.C @@ -0,0 +1,16 @@ +// PR c++/49507 +// { dg-options -std=c++0x } + +template<typename T> +struct ConcretePoolKey +{ + virtual ~ConcretePoolKey(); +}; + +template<typename T> +ConcretePoolKey<T>::~ConcretePoolKey() = default; + +int main() +{ + ConcretePoolKey<int> foo; +} |