diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index eeb8af49355f455c4b9c2a191cbac50fbbf73532..c16e1ef849bc10958e5e6b80148481cde12cfc6d 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-12  Per Bothner  <per@bothner.com>
+
+	* class.c (inherits_from_p): Do load_class if needed.
+
 2005-06-09  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* gjavah.c (error): Add ATTRIBUTE_PRINTF_1.
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 68732b74dd56a6c9148a10d24dae9a1f1ef3c046..a555bf09882a2c19b20c411ab0db6b5572b11158 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -549,6 +549,8 @@ inherits_from_p (tree type1, tree type2)
     {
       if (type1 == type2)
 	return 1;
+      if (! CLASS_LOADED_P (type1))
+	load_class (type1, 1);
       type1 = CLASSTYPE_SUPER (type1);
     }
   return 0;