From: Jason Merrill <jason@redhat.com>
Date: Mon, 25 Mar 2013 22:06:36 +0000 (-0400)
Subject: re PR c++/56699 (Failed for sizeof (non-static member) in lambda expression)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f02296ddb9d4a183b90600659341baf91436f7d9;p=gcc.git

re PR c++/56699 (Failed for sizeof (non-static member) in lambda expression)

	PR c++/56699
	* semantics.c (maybe_resolve_dummy): Make sure that the enclosing
	class is derived from the type of the object.

From-SVN: r197069
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bac48449830..6aaf1ddbebc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,4 +1,8 @@
-2013-03-23  Jason Merrill  <jason@redhat.com>
+2013-03-25  Jason Merrill  <jason@redhat.com>
+
+	PR c++/56699
+	* semantics.c (maybe_resolve_dummy): Make sure that the enclosing
+	class is derived from the type of the object.
 
 	PR c++/52014
 	* semantics.c (lambda_expr_this_capture): Don't capture 'this' in
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index fb38e8d7011..127e2da016c 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -9565,7 +9565,8 @@ maybe_resolve_dummy (tree object)
 
   if (type != current_class_type
       && current_class_type
-      && LAMBDA_TYPE_P (current_class_type))
+      && LAMBDA_TYPE_P (current_class_type)
+      && DERIVED_FROM_P (type, current_nonlambda_class_type ()))
     {
       /* In a lambda, need to go through 'this' capture.  */
       tree lam = CLASSTYPE_LAMBDA_EXPR (current_class_type);
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this16.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this16.C
new file mode 100644
index 00000000000..736d5f50e55
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this16.C
@@ -0,0 +1,28 @@
+// PR c++/56699
+// { dg-require-effective-target c++11 }
+
+struct A
+{
+    int a;
+};
+
+struct T
+{
+    int x;
+
+    T() : x([]{
+        sizeof(::A::a);
+        return 0;
+    }())
+    {}
+};
+
+struct B
+{
+    int a;
+};
+
+void f()
+{
+    []{sizeof(B::a);};
+}