diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 22c802602f0..60cfda039ea 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 28 21:09:33 2000   Raja R Harinath <harinath@cs.umn.edu>
+
+	* dbxout.c (dbxout_symbol, case RESULT_DECL, VAR_DECL): Use
+	DECL_CONTEXT, not DECL_FIELD_CONTEXT.
+
 2000-06-29  Michael Hayes  <m.hayes@elec.canterbury.ac.nz>
 
 	* flow.c (flow_depth_first_order_compute): Fix algorithm.
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index b2ce424e6e2..4951ee8ffc2 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -1941,8 +1941,8 @@ dbxout_symbol (decl, local)
 	  && DECL_INITIAL (decl) != 0
 	  && host_integerp (DECL_INITIAL (decl), 0)
 	  && ! TREE_ASM_WRITTEN (decl)
-	  && (DECL_FIELD_CONTEXT (decl) == NULL_TREE
-	      || TREE_CODE (DECL_FIELD_CONTEXT (decl)) == BLOCK))
+	  && (DECL_CONTEXT (decl) == NULL_TREE
+	      || TREE_CODE (DECL_CONTEXT (decl)) == BLOCK))
 	{
 	  if (TREE_PUBLIC (decl) == 0)
 	    {