diff options
| author | Jason Merrill <jason@redhat.com> | 2012-07-02 15:14:34 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-07-02 15:14:34 -0400 |
| commit | 73a156958263b19d5298e56c1c99a6b9df235306 (patch) | |
| tree | 98f0b7599a3e420341d6917c620630e7b85af7fa | |
| parent | 8d0d1915d9f96a4c9d9418b21b38cfa9c386d7a3 (diff) | |
| download | gcc-73a156958263b19d5298e56c1c99a6b9df235306.zip gcc-73a156958263b19d5298e56c1c99a6b9df235306.tar.gz gcc-73a156958263b19d5298e56c1c99a6b9df235306.tar.bz2 | |
re PR c++/53821 ([c++11] multiple definitions of lambda)
PR c++/53821
* semantics.c (maybe_add_lambda_conv_op): Don't set
DECL_INTERFACE_KNOWN.
From-SVN: r189175
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template6.C | 14 |
4 files changed, 21 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 448dd5c..fb8a34d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2012-07-02 Jason Merrill <jason@redhat.com> + PR c++/53821 + * semantics.c (maybe_add_lambda_conv_op): Don't set + DECL_INTERFACE_KNOWN. + PR c++/53524 * call.c (build_conditional_expr_1): Don't warn about comparison of two enumerators before their enumeration is complete. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index f1a94c1..8e37ebb 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -9336,8 +9336,6 @@ 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); @@ -9368,8 +9366,6 @@ 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); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5d5a2ce..b62e76f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2012-07-02 Jason Merrill <jason@redhat.com> + PR c++/53821 + * g++.dg/cpp0x/lambda/lambda-template6.C: New. + PR c++/53524 * g++.dg/template/enum7.C: New. * g++.dg/other/ptrmem10.C: Adjust. diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template6.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template6.C new file mode 100644 index 0000000..5e85619 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template6.C @@ -0,0 +1,14 @@ +// PR c++/53821 +// { dg-final { scan-assembler-not "_ZZ1fIvEvvENKUlvE_cvPFvvEEv" } } +// { dg-do compile { target c++11 } } + +template <class T> void f() +{ + auto g = []{}; + g(); +} + +int main() +{ + f<void>(); +} |