FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/55015 (Lambda functions not found at link time when declared in an inline function)

Browse source 
PR c++/55015
	PR c++/53821
	* semantics.c (maybe_add_lambda_conv_op): Revert earlier change.
	* decl.c (start_preparsed_function): Make local class methods comdat
	in templates, too.

From-SVN: r194251
This commit is contained in:
Jason Merrill 2012-12-06 09:37:13 -05:00 • committed by Jason Merrill
parent 5442fe4818
commit 7d9fe08e13
4 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,5 +1,11 @@
2012-12-06 Jason Merrill <jason@redhat.com>
PR c++/55015
PR c++/53821
* semantics.c (maybe_add_lambda_conv_op): Revert earlier change.
* decl.c (start_preparsed_function): Make local class methods comdat
in templates, too.
PR c++/54653
* parser.c (cp_parser_class_head): A partial specialization scope
counts as a template.

5
gcc/cp/decl.c
View file

@ -13199,10 +13199,9 @@ start_preparsed_function (tree decl1, tree attrs, int flags)
if (DECL_NOT_REALLY_EXTERN (decl1))
DECL_EXTERNAL (decl1) = 0;
if (ctx != NULL_TREE && DECL_DECLARED_INLINE_P (ctx)
&& TREE_PUBLIC (ctx))
if (ctx != NULL_TREE && vague_linkage_p (ctx))
/* This is a function in a local class in an extern inline
function. */
or template function. */
comdat_linkage (decl1);
}
/* If this function belongs to an interface, it is public.

4
gcc/cp/semantics.c
View file

@ -9419,6 +9419,8 @@ maybe_add_lambda_conv_op (tree type)
DECL_NOT_REALLY_EXTERN (fn) = 1;
DECL_DECLARED_INLINE_P (fn) = 1;
DECL_ARGUMENTS (fn) = build_this_parm (fntype, TYPE_QUAL_CONST);
if (nested)
DECL_INTERFACE_KNOWN (fn) = 1;
add_method (type, fn, NULL_TREE);
@ -9449,6 +9451,8 @@ maybe_add_lambda_conv_op (tree type)
DECL_ARGUMENTS (fn) = copy_list (DECL_CHAIN (DECL_ARGUMENTS (callop)));
for (arg = DECL_ARGUMENTS (fn); arg; arg = DECL_CHAIN (arg))
DECL_CONTEXT (arg) = fn;
if (nested)
DECL_INTERFACE_KNOWN (fn) = 1;
add_method (type, fn, NULL_TREE);

7
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv6.C Normal file
View file

@ -0,0 +1,7 @@
// PR c++/55015
// { dg-do link }
// { dg-options -std=c++11 }
typedef void (*VoidFunc)();
inline VoidFunc GetFunc() { return [](){}; }
int main() { VoidFunc func = GetFunc(); }