From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 12 Sep 2006 15:47:26 +0000 (+0000)
Subject: 	PR java/28892:
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=85386eb7ba6e9a2b1647aaae75235cc96f5dafaf;p=pf3gnuchains%2Fgcc-fork.git

	PR java/28892:
	* expr.c (expand_java_field_op): No error for assignments not in
	class initializer or constructor.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116889 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index cc34b73674f..e7508bfbb7b 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-12  Tom Tromey  <tromey@redhat.com>
+
+	PR java/28892:
+	* expr.c (expand_java_field_op): No error for assignments not in
+	class initializer or constructor.
+
 2006-08-22  Andrew Haley  <aph@redhat.com>
 
 	* decl.c (java_add_stmt): Give the statement list a type.
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index a64bda8ff02..b08d33e9ada 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -2846,21 +2846,10 @@ expand_java_field_op (int is_static, int is_putting, int field_ref_index)
 	  if (DECL_CONTEXT (field_decl) != current_class)
             error ("assignment to final field %q+D not in field's class",
                    field_decl);
-	  else if (FIELD_STATIC (field_decl))
-	    {
-	      if (!DECL_CLINIT_P (current_function_decl))
-		warning (0, "assignment to final static field %q+D not in "
-                         "class initializer",
-                         field_decl);
-	    }
-	  else
-	    {
-	      tree cfndecl_name = DECL_NAME (current_function_decl);
-	      if (! DECL_CONSTRUCTOR_P (current_function_decl)
-		  && !ID_FINIT_P (cfndecl_name))
-                warning (0, "assignment to final field %q+D not in constructor",
-			 field_decl);
-	    }
+	  /* We used to check for assignments to final fields not
+	     occurring in the class initializer or in a constructor
+	     here.  However, this constraint doesn't seem to be
+	     enforced by the JVM.  */
 	}      
 
       if (TREE_THIS_VOLATILE (field_decl))