diff options
| author | Ranjit Mathew <rmathew@hotmail.com> | 2005-03-09 19:04:54 +0000 |
|---|---|---|
| committer | Ranjit Mathew <rmathew@gcc.gnu.org> | 2005-03-09 19:04:54 +0000 |
| commit | 9e1af876ec17db808d3a1d2ace85b7734b0fca2c (patch) | |
| tree | 15448ee1326556d1ada0e1472081e3218f1530e3 /gcc/java | |
| parent | 02bab9db99a4b27a1f486dfc299053d103032ce3 (diff) | |
| download | gcc-9e1af876ec17db808d3a1d2ace85b7734b0fca2c.zip gcc-9e1af876ec17db808d3a1d2ace85b7734b0fca2c.tar.gz gcc-9e1af876ec17db808d3a1d2ace85b7734b0fca2c.tar.bz2 | |
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
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/java/decl.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 698878d..30d033d 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,10 @@ -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. diff --git a/gcc/java/decl.c b/gcc/java/decl.c index b7aa616..720b632 100644 --- a/gcc/java/decl.c +++ b/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)))) { |