diff options
| author | Andrew Haley <aph@redhat.com> | 2004-09-28 14:58:31 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2004-09-28 14:58:31 +0000 |
| commit | 46d82a27ee089a76844fcaba469a01083dda73dc (patch) | |
| tree | 86f0cc6a5618e2ab1607918f3d9b64c71a70b8c2 /gcc/java/jcf-parse.c | |
| parent | 03ec093d0456c80c523f94189c53e89d321cc035 (diff) | |
| download | gcc-46d82a27ee089a76844fcaba469a01083dda73dc.zip gcc-46d82a27ee089a76844fcaba469a01083dda73dc.tar.gz gcc-46d82a27ee089a76844fcaba469a01083dda73dc.tar.bz2 | |
jcf-parse.c (load_class): Back out previous broken patch.
2004-09-28 Andrew Haley <aph@redhat.com>
* jcf-parse.c (load_class): Back out previous broken patch.
From-SVN: r88234
Diffstat (limited to 'gcc/java/jcf-parse.c')
| -rw-r--r-- | gcc/java/jcf-parse.c | 20 |
1 files changed, 2 insertions, 18 deletions
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)); } |