From b771925e7ed1fa2d5f528fe515ab4698f2bd45c8 Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Tue, 21 Sep 1999 15:53:23 +0000 Subject: [PATCH] re GNATS gcj/46 (Static inializers compiled incorrectly) Thu Sep 16 15:42:39 1999 Alexandre Petit-Bianco * parse.y (java_method_add_stmt): Test against GET_CURRENT_BLOCK instead of fndecl. (This patch fixes the net Java PR #46: http://sourceware.cygnus.com/ml/java-prs/1999-q3/msg00092.html) From-SVN: r29550 --- gcc/java/ChangeLog | 5 +++++ gcc/java/parse.c | 4 ++-- gcc/java/parse.y | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index acfd311456a9..1d9ca39a58ae 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -6,6 +6,11 @@ * lang.c (lang_decode_option): Extend comment. +Thu Sep 16 15:42:39 1999 Alexandre Petit-Bianco + + * parse.y (java_method_add_stmt): Test against GET_CURRENT_BLOCK + instead of fndecl. + 1999-09-16 Kaveh R. Ghazi * gjavah.c (get_field_name, print_method_info, print_include, diff --git a/gcc/java/parse.c b/gcc/java/parse.c index 7d8571e3c14e..d19a78ca9d3b 100644 --- a/gcc/java/parse.c +++ b/gcc/java/parse.c @@ -8428,8 +8428,8 @@ tree java_method_add_stmt (fndecl, expr) tree fndecl, expr; { - if (!fndecl) - return NULL; + if (!GET_CURRENT_BLOCK (fndecl)) + return NULL_TREE; return add_stmt_to_block (GET_CURRENT_BLOCK (fndecl), NULL_TREE, expr); } diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 59b21444544d..3d76576f8019 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -5841,8 +5841,8 @@ tree java_method_add_stmt (fndecl, expr) tree fndecl, expr; { - if (!fndecl) - return NULL; + if (!GET_CURRENT_BLOCK (fndecl)) + return NULL_TREE; return add_stmt_to_block (GET_CURRENT_BLOCK (fndecl), NULL_TREE, expr); } -- 2.47.3