diff options
| -rw-r--r-- | gcc/java/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/java/jcf-parse.c | 20 |
2 files changed, 6 insertions, 18 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 1ecd33f..a9438f5 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,9 @@ 2004-09-28 Andrew Haley <aph@redhat.com> + * jcf-parse.c (load_class): Back out previous broken patch. + +2004-09-28 Andrew Haley <aph@redhat.com> + PR java/17586 * jcf-parse.c (load_class): Don't try to read a class that we've already read. diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index f36cc95..bc733e8 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -566,7 +566,7 @@ void load_class (tree class_or_name, int verbose) { tree name, saved; - int class_loaded = 0; + int class_loaded; /* class_or_name can be the name of the class we want to load */ if (TREE_CODE (class_or_name) == IDENTIFIER_NODE) @@ -585,20 +585,11 @@ load_class (tree class_or_name, int verbose) } saved = name; - while (1) { char *separator; - /* We've already loaded it. */ - if (IDENTIFIER_CLASS_VALUE (name) != NULL_TREE) - { - tree tmp_decl = IDENTIFIER_CLASS_VALUE (name); - if (CLASS_PARSED_P (TREE_TYPE (tmp_decl))) - break; - } - - if (read_class (name)) + if ((class_loaded = read_class (name))) break; /* We failed loading name. Now consider that we might be looking @@ -616,13 +607,6 @@ load_class (tree class_or_name, int verbose) break; } - { - /* have we found the class we're looking for? */ - tree type_decl = IDENTIFIER_CLASS_VALUE (saved); - tree type = type_decl ? TREE_TYPE (type_decl) : NULL; - class_loaded = type && CLASS_PARSED_P (type); - } - if (!class_loaded && verbose) error ("cannot find file for class %s", IDENTIFIER_POINTER (saved)); } |