class.c (interface_of_p): Check for null TYPE_BINFO.

2004-07-09  Bryce McKinlay  <mckinlay@redhat.com>

	* class.c (interface_of_p): Check for null TYPE_BINFO.

From-SVN: r84418

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 8c6a0b291cc5dda3948f59ed170db6378900d21e..b2492677b214f64e597abba7b2f1e9697b58a5f6 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-09  Bryce McKinlay  <mckinlay@redhat.com>
+
+       * class.c (interface_of_p): Check for null TYPE_BINFO.
+
 2004-07-09  Nathan Sidwell  <nathan@codesourcery.com>
 
        * class.c (make_class): Do not create binfo here.

diff --git a/gcc/java/class.c b/gcc/java/class.c
index c09e2e5b3b68ac904d8754b65e6c4e48b00b4473..90f2789c8e862e8164dfac790f09cd02dab1a6bb 100644 (file)
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -533,8 +533,9 @@ interface_of_p (tree type1, tree type2)
   int n, i;
   tree basetype_vec;
 
-  if (!(basetype_vec = BINFO_BASE_BINFOS (TYPE_BINFO (type2))))
+  if (! TYPE_BINFO (type2))
     return 0;
+  basetype_vec = BINFO_BASE_BINFOS (TYPE_BINFO (type2));
   n = TREE_VEC_LENGTH (basetype_vec);
   for (i = 0; i < n; i++)
     {