cp-tree.h (FNADDR_FROM_VTABLE_ENTRY): Remove, no longer used.

        * cp-tree.h (FNADDR_FROM_VTABLE_ENTRY): Remove, no longer used.
        (fnaddr_from_vtable_entry): Remove decl.
        * method.c (use_thunk): Update comment.

From-SVN: r44587

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f64de9c4e7fefe4d43eb9858259f76bb0288f532..7f29314c638badaf2ef8be7b8c75ce5baea1a802 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-02  Stan Shebs  <shebs@apple.com>
+
+       * cp-tree.h (FNADDR_FROM_VTABLE_ENTRY): Remove, no longer used.
+       (fnaddr_from_vtable_entry): Remove decl.
+       * method.c (use_thunk): Update comment.
+
 2001-08-01  Andrew Cagney  <ac131313@redhat.com>
 
        * repo.c (get_base_filename): Change return value to const char

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 4980cf4bf6763a13c7a9981af6eb8d84f57bc791..0bc60ae75c6fd3e2c8fcd0930f47c3eeead81b47 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1146,13 +1146,6 @@ enum languages { lang_c, lang_cplusplus, lang_java };
   ((CP_TYPE_QUALS (NODE) & (TYPE_QUAL_CONST | TYPE_QUAL_VOLATILE))     \
    == TYPE_QUAL_CONST)
 
-/* Virtual function addresses can be gotten from a virtual function
-   table entry using this macro.  */
-#define FNADDR_FROM_VTABLE_ENTRY(ENTRY)                                        \
-  (DECL_THUNK_P (TREE_OPERAND ((ENTRY), 0))                            \
-   : DECL_INITIAL (TREE_OPERAND ((ENTRY), 0))                          \
-   ? (ENTRY))
-
 #define FUNCTION_ARG_CHAIN(NODE) \
   (TREE_CHAIN (TYPE_ARG_TYPES (TREE_TYPE (NODE))))
 
@@ -4185,7 +4178,6 @@ extern int bound_pmf_p                            PARAMS ((tree));
 extern tree ovl_cons                            PARAMS ((tree, tree));
 extern int ovl_member                           PARAMS ((tree, tree));
 extern tree build_overload                      PARAMS ((tree, tree));
-extern tree fnaddr_from_vtable_entry           PARAMS ((tree));
 extern tree function_arg_chain                 PARAMS ((tree));
 extern int promotes_to_aggr_type               PARAMS ((tree, enum tree_code));
 extern int is_aggr_type_2                      PARAMS ((tree, tree));

diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 03bf45527717f860fd585790bcde72571941feb2..4a12823dea252b24735ba75ebd8e0b83f74c25f8 100644 (file)
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -387,9 +387,7 @@ use_thunk (thunk_fndecl, emit_p)
   fnaddr = DECL_INITIAL (thunk_fndecl);
   if (TREE_CODE (DECL_INITIAL (thunk_fndecl)) != ADDR_EXPR)
     /* We already turned this thunk into an ordinary function.
-       There's no need to process this thunk again.  (We can't just
-       clear DECL_THUNK_P because that will confuse
-       FNADDR_FROM_VTABLE_ENTRY and friends.)  */
+       There's no need to process this thunk again.  */
     return;
 
   /* Thunks are always addressable; they only appear in vtables.  */