Commit 46d82a27 by Andrew Haley Committed by Andrew Haley

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
parent 03ec093d
2004-09-28 Andrew Haley <aph@redhat.com> 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 PR java/17586
* jcf-parse.c (load_class): Don't try to read a class that we've * jcf-parse.c (load_class): Don't try to read a class that we've
already read. already read.
......
...@@ -566,7 +566,7 @@ void ...@@ -566,7 +566,7 @@ void
load_class (tree class_or_name, int verbose) load_class (tree class_or_name, int verbose)
{ {
tree name, saved; tree name, saved;
int class_loaded = 0; int class_loaded;
/* class_or_name can be the name of the class we want to load */ /* class_or_name can be the name of the class we want to load */
if (TREE_CODE (class_or_name) == IDENTIFIER_NODE) if (TREE_CODE (class_or_name) == IDENTIFIER_NODE)
...@@ -585,20 +585,11 @@ load_class (tree class_or_name, int verbose) ...@@ -585,20 +585,11 @@ load_class (tree class_or_name, int verbose)
} }
saved = name; saved = name;
while (1) while (1)
{ {
char *separator; char *separator;
/* We've already loaded it. */ if ((class_loaded = read_class (name)))
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))
break; break;
/* We failed loading name. Now consider that we might be looking /* We failed loading name. Now consider that we might be looking
...@@ -616,13 +607,6 @@ load_class (tree class_or_name, int verbose) ...@@ -616,13 +607,6 @@ load_class (tree class_or_name, int verbose)
break; 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) if (!class_loaded && verbose)
error ("cannot find file for class %s", IDENTIFIER_POINTER (saved)); error ("cannot find file for class %s", IDENTIFIER_POINTER (saved));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment