diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 86469913bc9..e4f9cb1dc00 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2004-06-24  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
+	* fold-const.c (fold_addr_expr_with_type): Look through all
+	valid LHS modifiers to find a base to mark addressable.
+
 	* tree.h (debug_find_tree): Add declaration.
 	* tree-inline.c (debug_find_tree): Remove extern declaration.
 
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 6ef7b1a9532..343662a5ee9 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -10420,8 +10420,10 @@ build_fold_addr_expr_with_type (tree t, tree ptrtype)
   else
     {
       tree base = t;
-      while (TREE_CODE (base) == COMPONENT_REF
-	     || TREE_CODE (base) == ARRAY_REF)
+
+      while (handled_component_p (base)
+	     || TREE_CODE (base) == REALPART_EXPR
+	     || TREE_CODE (base) == IMAGPART_EXPR)
 	base = TREE_OPERAND (base, 0);
       if (DECL_P (base))
 	TREE_ADDRESSABLE (base) = 1;