From cf1b2274578dcca43e32ebaf91c2f7ac054d7cec Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Fri, 30 Jun 2000 02:22:15 +0000 Subject: [PATCH] parse.y (verify_constructor_super): Use loop variable `m_arg_type' initialized with `mdecl_arg_type'. 2000-06-29 Alexandre Petit-Bianco * parse.y (verify_constructor_super): Use loop variable `m_arg_type' initialized with `mdecl_arg_type'. From-SVN: r34800 --- gcc/java/ChangeLog | 5 +++++ gcc/java/parse.c | 13 +++++++------ gcc/java/parse.y | 13 +++++++------ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index dc20cad6e6b..bac16b8eafd 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2000-06-29 Alexandre Petit-Bianco + + * parse.y (verify_constructor_super): Use loop variable + `m_arg_type' initialized with `mdecl_arg_type'. + 2000-06-29 Tom Tromey * parse.y (resolve_field_access): Handle case where `type_found' diff --git a/gcc/java/parse.c b/gcc/java/parse.c index b45c566c281..6d6715e0445 100644 --- a/gcc/java/parse.c +++ b/gcc/java/parse.c @@ -11078,18 +11078,19 @@ verify_constructor_super (mdecl) for (sdecl = TYPE_METHODS (class); sdecl; sdecl = TREE_CHAIN (sdecl)) if (DECL_CONSTRUCTOR_P (sdecl)) { + tree m_arg_type; tree arg_type = TREE_CHAIN (TYPE_ARG_TYPES (TREE_TYPE (sdecl))); if (super_inner) arg_type = TREE_CHAIN (arg_type); - for (; (arg_type != end_params_node - && mdecl_arg_type != end_params_node); + for (m_arg_type = mdecl_arg_type; + (arg_type != end_params_node + && m_arg_type != end_params_node); arg_type = TREE_CHAIN (arg_type), - mdecl_arg_type = TREE_CHAIN (mdecl_arg_type)) - if (TREE_VALUE (arg_type) != TREE_VALUE (mdecl_arg_type)) + m_arg_type = TREE_CHAIN (m_arg_type)) + if (TREE_VALUE (arg_type) != TREE_VALUE (m_arg_type)) break; - if (arg_type == end_params_node && - mdecl_arg_type == end_params_node) + if (arg_type == end_params_node && m_arg_type == end_params_node) return 0; } } diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 451ca49655c..da0a21983b4 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -8380,18 +8380,19 @@ verify_constructor_super (mdecl) for (sdecl = TYPE_METHODS (class); sdecl; sdecl = TREE_CHAIN (sdecl)) if (DECL_CONSTRUCTOR_P (sdecl)) { + tree m_arg_type; tree arg_type = TREE_CHAIN (TYPE_ARG_TYPES (TREE_TYPE (sdecl))); if (super_inner) arg_type = TREE_CHAIN (arg_type); - for (; (arg_type != end_params_node - && mdecl_arg_type != end_params_node); + for (m_arg_type = mdecl_arg_type; + (arg_type != end_params_node + && m_arg_type != end_params_node); arg_type = TREE_CHAIN (arg_type), - mdecl_arg_type = TREE_CHAIN (mdecl_arg_type)) - if (TREE_VALUE (arg_type) != TREE_VALUE (mdecl_arg_type)) + m_arg_type = TREE_CHAIN (m_arg_type)) + if (TREE_VALUE (arg_type) != TREE_VALUE (m_arg_type)) break; - if (arg_type == end_params_node && - mdecl_arg_type == end_params_node) + if (arg_type == end_params_node && m_arg_type == end_params_node) return 0; } }