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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f49263b2813020500d9fe8d2fcc4cda7cd0e8064..e50446cb0e0731510278cc771d65db046ea2bd8c 100644 (file)
--- 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 8203032fc8ad3b9ff1278dce09a9a3330215e1ee..74caa383618ac2dce0cd581408ea5f5a6246745a 100644 (file)
--- 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 a187bc36418d420b4436e66c17bf3324518e8668..8f60f23a7c0ca845ffce396ac8960961317e77f2 100644 (file)
--- 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 cb9063108c6d1676139e0cd6adc4373d6fcba52b..24027cf90b4e306ce5a6cf75e8f53e649e05dbdc 100644 (file)
--- 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 f8c6031e45eac5cf4ed927cfb518fba18aa7b56d..35da7374de8041d2869a6f503d253d68c8e5ade0 100644 (file)
--- 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;
     }