OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/47544 ([C++0x] linker does not find =default constructor for explicitly instantiated template)

Browse Source 
PR c++/47544
	* pt.c (instantiate_decl): Handle =default.

From-SVN: r174071
This commit is contained in:
Jason Merrill 2011-05-23 11:32:19 -04:00 committed by Jason Merrill
parent 08dc4c3dd7
commit 6474197358
4 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
2011-05-23 Jason Merrill <jason@redhat.com>
PR c++/47544
* pt.c (instantiate_decl): Handle =default.
PR c++/48617
* pt.c (invalid_nontype_parm_type_p): Allow DECLTYPE_TYPE.

5
gcc/cp/pt.c
View File

@ -17432,7 +17432,8 @@ instantiate_decl (tree d, int defer_ok,
args = gen_args;
if (TREE_CODE (d) == FUNCTION_DECL)
pattern_defined = (DECL_SAVED_TREE (code_pattern) != NULL_TREE);
pattern_defined = (DECL_SAVED_TREE (code_pattern) != NULL_TREE
|| DECL_DEFAULTED_OUTSIDE_CLASS_P (code_pattern));
else
pattern_defined = ! DECL_IN_AGGR_P (code_pattern);
@ -17627,6 +17628,8 @@ instantiate_decl (tree d, int defer_ok,
cp_finish_decl (d, init, const_init, NULL_TREE, 0);
pop_nested_class ();
}
else if (TREE_CODE (d) == FUNCTION_DECL && DECL_DEFAULTED_FN (code_pattern))
synthesize_method (d);
else if (TREE_CODE (d) == FUNCTION_DECL)
{
htab_t saved_local_specializations;

2
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,7 @@
2011-05-23 Jason Merrill <jason@redhat.com>
* g++.dg/cpp0x/defaulted27.C: New.
* g++.dg/cpp0x/decltype27.C: New.
2011-05-23 Richard Guenther <rguenther@suse.de>

19
gcc/testsuite/g++.dg/cpp0x/defaulted27.C Normal file
View File

@ -0,0 +1,19 @@
// PR c++/47544
// { dg-options -std=c++0x }
// { dg-final { scan-assembler "_ZN1sIiEC2Ev" } }
// { dg-final { scan-assembler-not "_ZN1sIiED2Ev" } }
template <typename T>
struct s {
s();
~s() = default;
};
extern template struct s<int>;
template <typename T>
s<T>::s() = default;
template struct s<int>;
s<int> a;