aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-typeck.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 48e06ce..2e4b04a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-11 Richard Henderson <rth@redhat.com>
+
+ PR c/17396
+ * c-typeck.c (build_unary_op): Add legacy offsetof hack.
+
2004-09-11 Kazu Hirata <kazu@cs.umass.edu>
* doc/cfg.texi, doc/hostconfig.texi, doc/install.texi,
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index b06085d..85ba9ce 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -2619,6 +2619,14 @@ build_unary_op (enum tree_code code, tree xarg, int flag)
}
argtype = build_pointer_type (argtype);
+
+ /* ??? Cope with user tricks that amount to offsetof. Delete this
+ when we have proper support for integer constant expressions. */
+ val = get_base_address (arg);
+ if (val && TREE_CODE (val) == INDIRECT_REF
+ && integer_zerop (TREE_OPERAND (val, 0)))
+ return fold_convert (argtype, fold_offsetof (arg));
+
val = build1 (ADDR_EXPR, argtype, arg);
if (TREE_CODE (arg) == COMPOUND_LITERAL_EXPR)