re PR java/20338 (Program compiled with gcj crashes when accessing private…

re PR java/20338 (Program compiled with gcj crashes when accessing private static method from nested class)

	PR java/20338
	* decl.c (finish_method): Emit _Jv_InitClass for private static
	methods inside inner classes as well.

From-SVN: r96200

gcc/java/ChangeLog

-2005-03-08  Julian Brown  <julian@codesourcery.com>
+2005-03-09  Ranjit Mathew  <rmathew@hotmail.com>
+
+	PR java/20338
+	* decl.c (finish_method): Emit _Jv_InitClass for private static 
+	methods inside inner classes as well.
 
+2005-03-08  Julian Brown  <julian@codesourcery.com>
 	* Revert patch from 2005-03-08 for causing bootstrap failure on
 	ppc-darwin.
 

gcc/java/decl.c

@@ -2038,7 +2038,9 @@ finish_method (tree fndecl)
 
   /* Prepend class initialization for static methods reachable from
      other classes.  */
-  if (METHOD_STATIC (fndecl) && ! METHOD_PRIVATE (fndecl)
+  if (METHOD_STATIC (fndecl)
+      && (! METHOD_PRIVATE (fndecl)
+          || INNER_CLASS_P (DECL_CONTEXT (fndecl)))
       && ! DECL_CLINIT_P (fndecl)
       && ! CLASS_INTERFACE (TYPE_NAME (DECL_CONTEXT (fndecl))))
     {