From 7805032d9a298af97f9b84d62e454476b47adb79 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sat, 16 Mar 2013 22:39:04 -0400 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/pt.c | 2 +- .../g++.dg/cpp0x/lambda/lambda-this13.C | 20 +++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this13.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5f6932f2ef7..171c52a1c4c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2013-03-16 Jason Merrill + 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. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 1bbcba2ac9f..427447913ec 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -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), diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this13.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this13.C new file mode 100644 index 00000000000..090d0a13e1d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this13.C @@ -0,0 +1,20 @@ +// PR c++/52374 +// { dg-do compile { target c++11 } } + +struct B +{ + int get() const { return 42; } +}; + +template +struct D + : public X +{ + int get() const { return [this]() -> int { return X::get(); }(); } +}; + +int main() +{ + D d; + d.get(); +} -- 2.30.2