re PR c++/31806 (miscompilation with -fschedule-insns2 -fno-threadsafe-statics)

	PR c++/31806
	* decl.c (cp_finish_decl): Also clear was_readonly if a static var
	needs runtime initialization.

From-SVN: r125229

gcc/cp/ChangeLog

+2007-05-31  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/31806
+	* decl.c (cp_finish_decl): Also clear was_readonly if a static var
+	needs runtime initialization.
+
 2007-05-31  Paolo Carlini  <pcarlini@suse.de>
 
 	PR c++/32158

gcc/cp/decl.c

@@ -5361,8 +5361,12 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p,
 	      /* If a TREE_READONLY variable needs initialization
 		 at runtime, it is no longer readonly and we need to
 		 avoid MEM_READONLY_P being set on RTL created for it.  */
-	      if (init && TREE_READONLY (decl))
-		TREE_READONLY (decl) = 0;
+	      if (init)
+		{
+		  if (TREE_READONLY (decl))
+		    TREE_READONLY (decl) = 0;
+		  was_readonly = 0;
+		}
 	      expand_static_init (decl, init);
 	    }
 	}