diff options
| author | Jason Merrill <jason@redhat.com> | 2013-03-16 22:39:04 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2013-03-16 22:39:04 -0400 |
| commit | 7805032d9a298af97f9b84d62e454476b47adb79 (patch) | |
| tree | bee6f4bad7c0c1f02a796816650f32aa97897f37 /gcc | |
| parent | c73356802f430fd51f0d4db1ec928fb093c7c4a6 (diff) | |
| download | gcc-7805032d9a298af97f9b84d62e454476b47adb79.zip gcc-7805032d9a298af97f9b84d62e454476b47adb79.tar.gz gcc-7805032d9a298af97f9b84d62e454476b47adb79.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this13.C | 20 |
3 files changed, 24 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5f6932f..171c52a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 1bbcba2..4274479 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 0000000..090d0a1 --- /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<typename X> +struct D + : public X +{ + int get() const { return [this]() -> int { return X::get(); }(); } +}; + +int main() +{ + D<B> d; + d.get(); +} |