From 3c1c08d6d76dab762ff34d79e39c1daedfd9904e Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Mon, 10 Mar 2014 13:27:16 +0000
Subject: [PATCH] re PR c++/60474 (Crash in tree_class_check)

2014-03-10  Richard Biener  <rguenther@suse.de>

	PR middle-end/60474
	* tree.c (signed_or_unsigned_type_for): Handle OFFSET_TYPEs.

	* g++.dg/torture/pr60474.C: New testcase.

From-SVN: r208451
---
 gcc/ChangeLog                          |  5 +++++
 gcc/testsuite/ChangeLog                |  5 +++++
 gcc/testsuite/g++.dg/torture/pr60474.C | 16 ++++++++++++++++
 gcc/tree.c                             |  3 ++-
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/torture/pr60474.C

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2ad2068b17..25f0f44f4ba 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-10  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/60474
+	* tree.c (signed_or_unsigned_type_for): Handle OFFSET_TYPEs.
+
 2014-03-08  Douglas B Rupp  <rupp@gnat.com>
 
 	* config/vms/vms.opt (vms_float_format): New variable.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 44e94c4b500..0fc685160c5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-10  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/60474
+	* g++.dg/torture/pr60474.C: New testcase.
+
 2014-03-09  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* g++.dg/cpp0x/alias-decl-debug-0.C: Move dg-skip after dg-do.
diff --git a/gcc/testsuite/g++.dg/torture/pr60474.C b/gcc/testsuite/g++.dg/torture/pr60474.C
new file mode 100644
index 00000000000..4b9fbe6566c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr60474.C
@@ -0,0 +1,16 @@
+// { dg-do compile }
+
+struct Layer;
+template <typename> struct A
+{
+  Layer *m_fn1 ();
+  Layer &operator[](int p1) { return m_fn1 ()[p1]; }
+};
+struct Layer
+{
+};
+void fn1 (A<int> &p1, int Layer::*p2, int p3)
+{
+  for (int a = 0;; ++a, ++p3)
+    p1[p3].*p2 = p1[a].*p2;
+}
diff --git a/gcc/tree.c b/gcc/tree.c
index d102d07c9b6..efee5e69cf2 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -10588,7 +10588,8 @@ signed_or_unsigned_type_for (int unsignedp, tree type)
     }
 
   if (!INTEGRAL_TYPE_P (type)
-      && !POINTER_TYPE_P (type))
+      && !POINTER_TYPE_P (type)
+      && TREE_CODE (type) != OFFSET_TYPE)
     return NULL_TREE;
 
   return build_nonstandard_integer_type (TYPE_PRECISION (type), unsignedp);