From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Sun, 4 Jun 2006 23:51:52 +0000 (+0000)
Subject: re PR c++/27601 (ICE (in fold_offsetof_1, at c-common.c:5998) on strange offsetof)
X-Git-Tag: releases/gcc-4.0.4~642
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4dd4f53a95674c0f0c3ac7f63d68910b5a2714c;p=thirdparty%2Fgcc.git

re PR c++/27601 (ICE (in fold_offsetof_1, at c-common.c:5998) on strange offsetof)

	PR c++/27601
	* c-common.c (fold_offsetof_1): Handle static members.

	* g++.dg/ext/offsetof1.C: New test.

From-SVN: r114371
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aa946ca0a823..ae6f258d2c46 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-04  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/27601
+	* c-common.c (fold_offsetof_1): Handle static members.
+
 2006-05-30  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	PR c/27718
diff --git a/gcc/c-common.c b/gcc/c-common.c
index 04660ed482b4..53e18c553f5b 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -5730,6 +5730,10 @@ fold_offsetof_1 (tree expr)
     case ERROR_MARK:
       return expr;
 
+    case VAR_DECL:
+      error ("cannot apply %<offsetof%> to static data member %qD", expr);
+      return error_mark_node;
+
     case INDIRECT_REF:
       return size_zero_node;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8dc0d9740b50..bbcee3a36e1f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-04  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/27601
+	* g++.dg/ext/offsetof1.C: New test.
+
 2006-05-30  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	PR c/27718
diff --git a/gcc/testsuite/g++.dg/ext/offsetof1.C b/gcc/testsuite/g++.dg/ext/offsetof1.C
new file mode 100644
index 000000000000..5d6552f78787
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/offsetof1.C
@@ -0,0 +1,9 @@
+// PR c++/27601
+// Origin: Patrik Hägglund  <patrik.hagglund@bredband.net>
+// { dg-do compile }
+
+struct bar {
+  static int foo;
+};
+
+int a = __builtin_offsetof(bar, foo);  // { dg-error "static data member" }