aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2001-08-14 16:51:27 -0700
committerRichard Henderson <rth@gcc.gnu.org>2001-08-14 16:51:27 -0700
commitb5d1cbd2faea386268028d2f2fb7c2e966fc0203 (patch)
tree4193737aca409abec38db977a68ae2969614671a /gcc/cp
parent1489e3241e8a46967b17c6a4d22ab1a354eee91f (diff)
downloadgcc-b5d1cbd2faea386268028d2f2fb7c2e966fc0203.zip
gcc-b5d1cbd2faea386268028d2f2fb7c2e966fc0203.tar.gz
gcc-b5d1cbd2faea386268028d2f2fb7c2e966fc0203.tar.bz2
class.c, cp-tree.h (build_vfn_ref): Remove.
* class.c, cp-tree.h (build_vfn_ref): Remove. * call.c, rtti.c: Replace all refernces with build_vtbl_ref. From-SVN: r44913
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/call.c2
-rw-r--r--gcc/cp/class.c13
-rw-r--r--gcc/cp/cp-tree.h1
-rw-r--r--gcc/cp/rtti.c2
5 files changed, 7 insertions, 16 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f49263b..e50446c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-14 Richard Henderson <rth@redhat.com>
+
+ * class.c, cp-tree.h (build_vfn_ref): Remove.
+ * call.c, rtti.c: Replace all refernces with build_vtbl_ref.
+
2001-08-13 Mark Mitchell <mark@codesourcery.com>
* call.c (build_over_call): Mark COMPOUND_EXPRs generated for
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 8203032..74caa38 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4321,7 +4321,7 @@ build_over_call (cand, args, flags)
if (DECL_CONTEXT (fn) && TYPE_JAVA_INTERFACE (DECL_CONTEXT (fn)))
fn = build_java_interface_fn_ref (fn, *p);
else
- fn = build_vfn_ref (build_indirect_ref (*p, 0), DECL_VINDEX (fn));
+ fn = build_vtbl_ref (build_indirect_ref (*p, 0), DECL_VINDEX (fn));
TREE_TYPE (fn) = t;
}
else if (DECL_INLINE (fn))
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index a187bc3..8f60f23 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -540,19 +540,6 @@ build_vtbl_ref (instance, idx)
return aref;
}
-/* Given an object INSTANCE, return an expression which yields the
- virtual function corresponding to IDX. */
-
-tree
-build_vfn_ref (instance, idx)
- tree instance;
- tree idx;
-{
- tree aref = build_vtbl_ref (instance, idx);
-
- return aref;
-}
-
/* Return the name of the virtual function table (as an IDENTIFIER_NODE)
for the given TYPE. */
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index cb90631..24027cf 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3531,7 +3531,6 @@ extern tree perform_implicit_conversion PARAMS ((tree, tree));
/* in class.c */
extern tree build_vbase_path PARAMS ((enum tree_code, tree, tree, tree, int));
extern tree build_vtbl_ref PARAMS ((tree, tree));
-extern tree build_vfn_ref PARAMS ((tree, tree));
extern tree get_vtable_decl PARAMS ((tree, int));
extern void add_method PARAMS ((tree, tree, int));
extern int currently_open_class PARAMS ((tree));
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index f8c6031..35da737 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -182,7 +182,7 @@ get_tinfo_decl_dynamic (exp)
/* The RTTI information is at index -1. */
index = integer_minus_one_node;
- t = build_vfn_ref (exp, index);
+ t = build_vtbl_ref (exp, index);
TREE_TYPE (t) = build_pointer_type (tinfo_decl_type);
return t;
}