From 5bf8aebc12015bb509e144a6962b29979e9acd2a Mon Sep 17 00:00:00 2001 From: Ranjit Mathew Date: Mon, 10 Jan 2005 18:01:04 +0000 Subject: [PATCH] re PR java/19277 (allows array.length++ although it is final) PR java/19277 * check-init.c (check_init): Take care of references that do not have an explicit final variable declaration (e.g. array length access) for pre/post in/de-crement operators. From-SVN: r93144 --- gcc/java/ChangeLog | 7 +++++++ gcc/java/check-init.c | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index af1736dc96a..183319ff325 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +2005-01-10 Ranjit Mathew + + PR java/19277 + * check-init.c (check_init): Take care of references that do not + have an explicit final variable declaration (e.g. array length + access) for pre/post in/de-crement operators. + 2005-01-08 Mark Wielaard * parse.y (process_imports): Allocate (and free) original_name only diff --git a/gcc/java/check-init.c b/gcc/java/check-init.c index e124ffc5eef..6dc0deee7fd 100644 --- a/gcc/java/check-init.c +++ b/gcc/java/check-init.c @@ -1,5 +1,6 @@ /* Code to test for "definitive [un]assignment". - Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, + Inc. This file is part of GCC. @@ -832,7 +833,14 @@ check_init (tree exp, words before) case POSTINCREMENT_EXPR: tmp = get_variable_decl (TREE_OPERAND (exp, 0)); if (tmp != NULL_TREE && DECL_FINAL (tmp)) - final_assign_error (DECL_NAME (tmp)); + final_assign_error (DECL_NAME (tmp)); + else if (TREE_CODE (tmp = TREE_OPERAND (exp, 0)) == COMPONENT_REF) + { + /* Take care of array length accesses too. */ + tree decl = TREE_OPERAND (tmp, 1); + if (DECL_FINAL (decl)) + final_assign_error (DECL_NAME (decl)); + } /* Avoid needless recursion. */ exp = TREE_OPERAND (exp, 0); -- 2.30.2