diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e7dd0c001f4..d48c71e6bab 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,9 @@
-Sat Jun  3 19:05:30 2000  Michael Meissner  <meissner@redhat.com>
+S2000-06-03  Geoff Keating  <geoffk@cygnus.com>
+
+        * alias.c (record_component_aliases): Don't inspect
+        DECL_NONADDRESSABLE_P of non-FIELD_DECL components of structures.
+
+at Jun  3 19:05:30 2000  Michael Meissner  <meissner@redhat.com>
 
 	* ifcvt.c (process_insns): If IFCVT_MODIFY_INSN is defined, call
 	it with the pattern to do machine dependent work.
diff --git a/gcc/alias.c b/gcc/alias.c
index 1306c3f9e35..dee0cfcff44 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -536,7 +536,7 @@ record_component_aliases (type)
     case UNION_TYPE:
     case QUAL_UNION_TYPE:
       for (field = TYPE_FIELDS (type); field != 0; field = TREE_CHAIN (field))
-	if (! DECL_NONADDRESSABLE_P (field))
+	if (TREE_CODE (field) == FIELD_DECL && ! DECL_NONADDRESSABLE_P (field))
 	  record_alias_subset (superset, get_alias_set (TREE_TYPE (field)));
       break;