diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b0c2ec951f2..bbbdf4ca801 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb  8 15:51:50 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+	* stmt.c (expand_decl): Do set RTX_UNCHANGING_P for TREE_READONLY.
+
 2000-02-08  Zack Weinberg  <zack@wolery.cumb.org>
 
 	* Makefile.in (GEN_PROTOS_OBJS): Remove libcpp.a.
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 8c76b3b57e4..9f6b03ee3a1 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -3868,15 +3868,9 @@ expand_decl (decl)
 
   if (TREE_THIS_VOLATILE (decl))
     MEM_VOLATILE_P (DECL_RTL (decl)) = 1;
-#if 0 /* A variable is not necessarily unchanging
-	 just because it is const.  RTX_UNCHANGING_P
-	 means no change in the function,
-	 not merely no change in the variable's scope.
-	 It is correct to set RTX_UNCHANGING_P if the variable's scope
-	 is the whole function.  There's no convenient way to test that.  */
+
   if (TREE_READONLY (decl))
     RTX_UNCHANGING_P (DECL_RTL (decl)) = 1;
-#endif
 }
 
 /* Emit code to perform the initialization of a declaration DECL.  */