From 5bebbee7338bb2f91e0348a9d963ee85ecabfb9a Mon Sep 17 00:00:00 2001 From: Martin Kahlert Date: Fri, 29 Mar 2002 22:27:29 +0000 Subject: [PATCH] parse.y (do_resolve_class): Fix infinite recursion. 2002-03-29 Martin Kahlert * parse.y (do_resolve_class): Fix infinite recursion. (http://gcc.gnu.org/ml/java/2002-03/msg00654.html) From-SVN: r51578 --- gcc/java/ChangeLog | 4 ++++ gcc/java/parse.y | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 5adea4c8216..c66f9a6aaab 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2002-03-29 Martin Kahlert + + * parse.y (do_resolve_class): Fix infinite recursion. + 2002-03-29 Tom Tromey * parse.y (check_inner_circular_reference): Ignore incomplete diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 6dccb3b23e3..ef18d5fa3e7 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -5868,18 +5868,20 @@ do_resolve_class (enclosing, class_type, decl, cl) applicable and use the matching DECL instead. */ if (!decl_result && QUALIFIED_P (TYPE_NAME (class_type))) { - tree name = TYPE_NAME (class_type); char *separator; + tree name = TYPE_NAME (class_type); + char *namebuffer = alloca (IDENTIFIER_LENGTH (name) + 1); + + strcpy (namebuffer, IDENTIFIER_POINTER (name)); + do { /* Reach the last '.', and if applicable, replace it by a `$' and see if this exists as a type. */ - if ((separator = strrchr (IDENTIFIER_POINTER (name), '.'))) + if ((separator = strrchr (namebuffer, '.'))) { - int c = *separator; *separator = '$'; - name = get_identifier (IDENTIFIER_POINTER (name)); - *separator = c; + name = get_identifier (namebuffer); decl_result = IDENTIFIER_CLASS_VALUE (name); } } while (!decl_result && separator); -- 2.30.2