From: Jason Merrill <jason@redhat.com>
Date: Wed, 6 Feb 2013 04:24:18 +0000 (-0500)
Subject: re PR c++/54122 (segfault comparing enum class in lambda inside constructor of a... 
X-Git-Tag: releases/gcc-4.8.0~605
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea48c8a0264d397509944ff69ec5d2289663243a;p=thirdparty%2Fgcc.git

re PR c++/54122 (segfault comparing enum class in lambda inside constructor of a templated class)

	PR c++/54122
	* tree.c (lvalue_kind) [INDIRECT_REF]: Don't check for
	METHOD_TYPE.

From-SVN: r195781
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a2bd7017ee14..a5f944bc08db 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2013-02-05  Jason Merrill  <jason@redhat.com>
 
+	PR c++/54122
+	* tree.c (lvalue_kind) [INDIRECT_REF]: Don't check for
+	METHOD_TYPE.
+
 	PR c++/56177
 	* decl.c (start_preparsed_function): Update restype if we change
 	decl1.
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index d1f14fcfc768..18d9a98effda 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -143,9 +143,7 @@ lvalue_kind (const_tree ref)
     case ARRAY_REF:
     case PARM_DECL:
     case RESULT_DECL:
-      if (TREE_CODE (TREE_TYPE (ref)) != METHOD_TYPE)
-	return clk_ordinary;
-      break;
+      return clk_ordinary;
 
       /* A scope ref in a template, left as SCOPE_REF to support later
 	 access checking.  */
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C
new file mode 100644
index 000000000000..6e25c331b45e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C
@@ -0,0 +1,11 @@
+// PR c++/54122
+// { dg-options -std=c++11 }
+
+enum E { F };
+
+template <typename A>
+struct C
+{
+  E e;
+  void f () { auto l = [&](void)->void { if (e == F) return; }; }
+};