re PR c++/50089 ([C++0x] ICE when calling a qualified base class member function…

re PR c++/50089 ([C++0x] ICE when calling a qualified base class member function within a lambda expr without "this->")

	PR c++/50089
	* semantics.c (finish_id_expression): Use
	current_nonlambda_class_type for qualified-ids.

From-SVN: r178339

gcc/cp/ChangeLog

 2011-08-30  Jason Merrill  <jason@redhat.com>
 
+	PR c++/50089
+	* semantics.c (finish_id_expression): Use
+	current_nonlambda_class_type for qualified-ids.
+
 	PR c++/50114
 	* decl.c (poplevel): Disable for scope compatibility hack
 	in C++11 mode.

gcc/cp/semantics.c

@@ -3251,7 +3251,7 @@ finish_id_expression (tree id_expression,
       if (scope)
 	{
 	  decl = (adjust_result_of_qualified_name_lookup
-		  (decl, scope, current_class_type));
+		  (decl, scope, current_nonlambda_class_type()));
 
 	  if (TREE_CODE (decl) == FUNCTION_DECL)
 	    mark_used (decl);

gcc/testsuite/ChangeLog

 2011-08-30  Jason Merrill  <jason@redhat.com>
 
+	PR c++/50089
+	* g++.dg/cpp0x/lambda/lambda-qualified.C: New.
+
 	PR c++/50114
 	* g++.dg/cpp0x/lambda/lambda-for.C: New.
 

gcc/testsuite/g++.dg/cpp0x/lambda/lambda-qualified.C

+// PR c++/50089
+// { dg-options -std=c++0x }
+
+struct TestBase
+{
+  void foo() {}
+};
+
+struct Test : TestBase
+{
+  void foo()
+  {
+    [this]{
+      /*this->*/TestBase::foo(); // ICE without this->
+    }();
+  }
+};