From 9ee226ef126a9d09cf73043a843be0f61e871c9a Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Sat, 10 Jul 2004 15:53:40 +0000 Subject: [PATCH] 004-07-10 Bryce McKinlay * class.c (common_enclosing_context_p): Remove statement with no side-effects. From-SVN: r84460 --- gcc/java/ChangeLog | 5 +++++ gcc/java/class.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index fea2c218baf..6934f07c55f 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2004-07-10 Bryce McKinlay + + * class.c (common_enclosing_context_p): Remove statement with no + side-effects. + 2004-07-09 Bryce McKinlay PR java/8618 diff --git a/gcc/java/class.c b/gcc/java/class.c index 1273b62155f..abadbd1c504 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -594,9 +594,7 @@ enclosing_context_p (tree type1, tree type2) int common_enclosing_context_p (tree type1, tree type2) { - for (type1; type1; - type1 = (INNER_CLASS_TYPE_P (type1) ? - TREE_TYPE (DECL_CONTEXT (TYPE_NAME (type1))) : NULL_TREE)) + while (type1) { tree current; for (current = type2; current; @@ -605,6 +603,11 @@ common_enclosing_context_p (tree type1, tree type2) NULL_TREE)) if (type1 == current) return 1; + + if (INNER_CLASS_TYPE_P (type1)) + type1 = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (type1))); + else + break; } return 0; } -- 2.30.2