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

re PR c++/52374 ([C++11] Fails to transform id-expression into dependent base member access in lambda expression) 

PR c++/52374
	* pt.c (tsubst_qualified_id): Use current_nonlambda_class_type.

From-SVN: r196743
This commit is contained in:
Jason Merrill 2013-03-16 22:39:04 -04:00 committed by Jason Merrill
parent c73356802f
commit 7805032d9a
3 changed files with 24 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 @@
2013-03-16 Jason Merrill <jason@redhat.com>
PR c++/52374
* pt.c (tsubst_qualified_id): Use current_nonlambda_class_type.
PR c++/54764
PR c++/55972
* name-lookup.h (tag_scope): Add ts_lambda.

2
gcc/cp/pt.c
View File

@ -12043,7 +12043,7 @@ tsubst_qualified_id (tree qualified_id, tree args,
else if (TYPE_P (scope))
{
expr = (adjust_result_of_qualified_name_lookup
(expr, scope, current_class_type));
(expr, scope, current_nonlambda_class_type ()));
expr = (finish_qualified_id_expr
(scope, expr, done, address_p && PTRMEM_OK_P (qualified_id),
QUALIFIED_NAME_IS_TEMPLATE (qualified_id),

20
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this13.C Normal file
View File

@ -0,0 +1,20 @@
// PR c++/52374
// { dg-do compile { target c++11 } }
struct B
{
int get() const { return 42; }
};
template<typename X>
struct D
: public X
{
int get() const { return [this]() -> int { return X::get(); }(); }
};
int main()
{
D<B> d;
d.get();
}