From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Sat, 15 Jul 2006 09:38:02 +0000 (+0000)
Subject: re PR c++/28294 (ICE with invalid use of __builtin_offsetof)
X-Git-Tag: releases/gcc-4.0.4~529
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c05114859bdfdd02620aae2a0979ac6bb0d8529;p=thirdparty%2Fgcc.git

re PR c++/28294 (ICE with invalid use of __builtin_offsetof)

	PR c++/28294
	* semantics.c (finish_offsetof): Use TREE_OPERAND for COMPONENT_REFs
	only.

	* g++.dg/ext/offsetof1.C: Add test with function pointer arithmetic.

From-SVN: r115468
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 69b83d4efe09..81d872ecf7ae 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-15  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/28294
+	* semantics.c (finish_offsetof): Use TREE_OPERAND for COMPONENT_REFs
+	only.
+
 2006-07-14  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	PR c++/28343
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 74c34d85f2a5..ab0abf1004c4 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2804,8 +2804,9 @@ finish_offsetof (tree expr)
       || TREE_CODE (TREE_TYPE (expr)) == METHOD_TYPE
       || TREE_CODE (TREE_TYPE (expr)) == UNKNOWN_TYPE)
     {
-      error ("cannot apply %<offsetof%> to member function %qD",
-	     TREE_OPERAND (expr, 1));
+      if (TREE_CODE (expr) == COMPONENT_REF)
+	expr = TREE_OPERAND (expr, 1);
+      error ("cannot apply %<offsetof%> to member function %qD", expr);
       return error_mark_node;
     }
   return fold_offsetof (expr);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 919074d932e0..cd7f3b53c027 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-15  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/28294
+	* g++.dg/ext/offsetof1.C: Add test with function pointer arithmetic.
+
 2006-07-14  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	PR c++/28343
diff --git a/gcc/testsuite/g++.dg/ext/offsetof1.C b/gcc/testsuite/g++.dg/ext/offsetof1.C
index e59442de4edd..123a9e3efeb4 100644
--- a/gcc/testsuite/g++.dg/ext/offsetof1.C
+++ b/gcc/testsuite/g++.dg/ext/offsetof1.C
@@ -9,6 +9,7 @@ struct bar {
 
 int a = __builtin_offsetof(bar, foo);  // { dg-error "static data member" }
 int b = __builtin_offsetof(bar, baz);  // { dg-error "member function" }
+int b0 = __builtin_offsetof(bar, baz[0]);  // { dg-error "function" }
 int c = __builtin_offsetof(bar, ~bar);  // { dg-error "member function" }
 
 typedef int I;