From a97cce538d4970d93e06d48d815fba9b83c49eb3 Mon Sep 17 00:00:00 2001 From: shebs Date: Fri, 3 Aug 2001 00:14:01 +0000 Subject: [PATCH] * cp-tree.h (FNADDR_FROM_VTABLE_ENTRY): Remove, no longer used. (fnaddr_from_vtable_entry): Remove decl. * method.c (use_thunk): Update comment. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44587 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/cp-tree.h | 8 -------- gcc/cp/method.c | 4 +--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f64de9c..7f29314 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2001-08-02 Stan Shebs + + * 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 * 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 4980cf4..0bc60ae 100644 --- 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 03bf455..4a12823 100644 --- 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. */ -- 2.7.4