summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2003-01-07 17:20:50 +0000
committerTom Tromey <tromey@gcc.gnu.org>2003-01-07 17:20:50 +0000
commitb47ffb8f08896644da2da1afb674e2d5cf3ec175 (patch)
tree1dad3ccb13d5eec24b15dd80c976274cc7565df0
parentf6cb56fa00cfe9cfab7e263361a13d6a2c6a851a (diff)
downloadgcc-b47ffb8f08896644da2da1afb674e2d5cf3ec175.tar.gz
class.c (add_assume_compiled): Don't adjust parent if we're already at the root of tree.
* class.c (add_assume_compiled): Don't adjust parent if we're already at the root of tree. From-SVN: r61003
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/class.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 8f3e2aa809b..e8150af2217 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-07 Tom Tromey <tromey@redhat.com>
+
+ * class.c (add_assume_compiled): Don't adjust parent if we're
+ already at the root of tree.
+
2003-01-05 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* lang.c (dump_compound_expr): Prototype.
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 6e1055f208b..0818bc21079 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -150,6 +150,7 @@ add_assume_compiled (ident, excludep)
const char *ident;
int excludep;
{
+ int len;
assume_compiled_node *parent;
assume_compiled_node *node =
xmalloc (sizeof (assume_compiled_node));
@@ -183,7 +184,8 @@ add_assume_compiled (ident, excludep)
class or a package name. Adjust PARENT accordingly. */
parent = find_assume_compiled_node (assume_compiled_tree, ident);
- if (ident[strlen (parent->ident)] != '.')
+ len = strlen (parent->ident);
+ if (parent->ident[len] && parent->ident[len] != '.')
parent = parent->parent;
/* Insert NODE into the tree. */
@@ -194,7 +196,7 @@ add_assume_compiled (ident, excludep)
}
/* Returns nonzero if IDENT is the name of a class that the compiler
- should assume has been compiled to FIXME */
+ should assume has been compiled to object code. */
static int
assume_compiled (ident)