ipa-utils.h (method_class_type): Remove.

[thirdparty/gcc.git] / gcc / ipa-polymorphic-call.c

diff --git a/gcc/ipa-polymorphic-call.c b/gcc/ipa-polymorphic-call.c
index 083648d7e4213969179d77b9293e9473d2a69590..b69f54184d076beda22428427ffacc8bb3bdf630 100644 (file)
--- a/gcc/ipa-polymorphic-call.c
+++ b/gcc/ipa-polymorphic-call.c
@@ -588,7 +588,7 @@ decl_maybe_in_construction_p (tree base, tree outer_type,
        block = BLOCK_SUPERCONTEXT (block))
     if (tree fn = inlined_polymorphic_ctor_dtor_block_p (block, check_clones))
       {
-       tree type = TYPE_MAIN_VARIANT (method_class_type (TREE_TYPE (fn)));
+       tree type = TYPE_METHOD_BASETYPE (TREE_TYPE (fn));
 
        if (!outer_type || !types_odr_comparable (type, outer_type))
          {
@@ -618,7 +618,7 @@ decl_maybe_in_construction_p (tree base, tree outer_type,
                  && !DECL_CXX_DESTRUCTOR_P (function)))
            return false;
        }
-      tree type = TYPE_MAIN_VARIANT (method_class_type (TREE_TYPE (function)));
+      tree type = TYPE_METHOD_BASETYPE (TREE_TYPE (function));
       if (!outer_type || !types_odr_comparable (type, outer_type))
        {
          if (TREE_CODE (type) == RECORD_TYPE
@@ -1399,7 +1399,7 @@ check_stmt_for_type_change (ao_ref *ao ATTRIBUTE_UNUSED, tree vdef, void *data)
          && gimple_call_num_args (stmt))
       {
        tree op = walk_ssa_copies (gimple_call_arg (stmt, 0));
-       tree type = method_class_type (TREE_TYPE (fn));
+       tree type = TYPE_METHOD_BASETYPE (TREE_TYPE (fn));
        HOST_WIDE_INT offset = 0, size, max_size;
 
        if (dump_file)