* C++ PATCH for c++/48523 (lamda, 'this', templates)
@ 2011-04-11 21:49 Jason Merrill
0 siblings, 0 replies; only message in thread
From: Jason Merrill @ 2011-04-11 21:49 UTC (permalink / raw)
To: gcc-patches List
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
Our rewriting for use of 'this' in a lambda used cp_build_indirect_ref,
which assumes that we aren't in a template. Using build_x_indirect_ref
instead works better.
Tested x86_64-pc-linux-gnu, applying to trunk and 4.6.
[-- Attachment #2: 48523.patch --]
[-- Type: text/plain, Size: 1165 bytes --]
commit 9b7a53bda8938ff42074b1f38a3e0b68cb37e52e
Author: Jason Merrill <jason@redhat.com>
Date: Sat Apr 9 01:40:20 2011 -0400
PR c++/48523
* tree.c (maybe_dummy_object): Use build_x_indirect_ref rather
than cp_build_indirect_ref.
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index d6b6197..ad004bb 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -2423,7 +2423,7 @@ maybe_dummy_object (tree type, tree* binfop)
else if (current != current_class_type
&& context == nonlambda_method_basetype ())
/* In a lambda, need to go through 'this' capture. */
- decl = (cp_build_indirect_ref
+ decl = (build_x_indirect_ref
((lambda_expr_this_capture
(CLASSTYPE_LAMBDA_EXPR (current_class_type))),
RO_NULL, tf_warning_or_error));
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this4.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this4.C
new file mode 100644
index 0000000..29cd2a9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this4.C
@@ -0,0 +1,13 @@
+// PR c++/48523
+// { dg-options -std=c++0x }
+
+template<typename>
+struct X
+{
+ bool b;
+
+ void f()
+ {
+ [this]{ return b; };
+ }
+};
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-04-11 21:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-11 21:49 C++ PATCH for c++/48523 (lamda, 'this', templates) Jason Merrill
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).