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

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

From-SVN: r196743

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5f6932f2ef79051de1c5340970d85cfcbbb7a35a..171c52a1c4ccd95e59c50fd84a6f045b9851457e 100644 (file)
--- 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 1bbcba2ac9fd2b3493fbad183643e390809309a6..427447913ecfb9cc7a0c1ad58913a2ffbd40e580 100644 (file)
--- 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 (file)
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();
+}