decl2.c (mark_vtable_entries): Fix check for rtti offset.

8
        * decl2.c (mark_vtable_entries): Fix check for rtti offset.

From-SVN: r27979

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7c0d65044bad1d75cfce3be92ec84f839990ab94..e90a51e8ba9c0d29f27faf2d22cfa0d0449b0a54 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul  7 01:26:47 1999  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * decl2.c (mark_vtable_entries): Fix check for rtti offset.
+
 1999-06-26  Richard Henderson  <rth@cygnus.com>
 
        * decl.c (cp_finish_decl): Fix typo in cp_warning_at call.

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 281ca0c1e82fb34a270a9d7784e2693fa97dcc2b..5003f60982f01fba21427646c28b248c654e6435 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2409,12 +2409,13 @@ mark_vtable_entries (decl)
       tree fnaddr;
       tree fn;
 
-      if (TREE_CODE (TREE_VALUE (entries)) == NOP_EXPR)
+      fnaddr = (flag_vtable_thunks ? TREE_VALUE (entries) 
+               : FNADDR_FROM_VTABLE_ENTRY (TREE_VALUE (entries)));
+
+      if (TREE_CODE (fnaddr) == NOP_EXPR)
        /* RTTI offset.  */
        continue;
 
-      fnaddr = (flag_vtable_thunks ? TREE_VALUE (entries) 
-               : FNADDR_FROM_VTABLE_ENTRY (TREE_VALUE (entries)));
       fn = TREE_OPERAND (fnaddr, 0);
       TREE_ADDRESSABLE (fn) = 1;
       if (DECL_LANG_SPECIFIC (fn) && DECL_ABSTRACT_VIRTUAL_P (fn))