c++: Handle multiple aggregate overloads [PR95319].

[thirdparty/gcc.git] / gcc / gimple-loop-versioning.cc

diff --git a/gcc/gimple-loop-versioning.cc b/gcc/gimple-loop-versioning.cc
index 35344b7b44827bf6eca7a4a5c9c946ff58046958..ff6c561f9e2b43089ebc8807474572a315a0de1b 100644 (file)
--- a/gcc/gimple-loop-versioning.cc
+++ b/gcc/gimple-loop-versioning.cc
@@ -1,5 +1,5 @@
 /* Loop versioning pass.
-   Copyright (C) 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2018-2020 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -43,7 +43,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "omp-general.h"
 #include "predict.h"
 #include "tree-into-ssa.h"
-#include "params.h"
 
 namespace {
 
@@ -605,8 +604,8 @@ unsigned int
 loop_versioning::max_insns_for_loop (class loop *loop)
 {
   return (loop->inner
-         ? PARAM_VALUE (PARAM_LOOP_VERSIONING_MAX_OUTER_INSNS)
-         : PARAM_VALUE (PARAM_LOOP_VERSIONING_MAX_INNER_INSNS));
+         ? param_loop_versioning_max_outer_insns
+         : param_loop_versioning_max_inner_insns);
 }
 
 /* Return true if for cost reasons we should avoid versioning any loop
@@ -1071,7 +1070,7 @@ loop_versioning::analyze_arbitrary_term (address_info &address,
 
      where nothing in the way "x" and "y" are set gives a hint as to
      whether "i" iterates over the innermost dimension of the array.
-     In these situations it seems reasonable to assume the the
+     In these situations it seems reasonable to assume the
      programmer has nested the loops appropriately (although of course
      there are examples like GEMM in which this assumption doesn't hold
      for all accesses in the loop).
@@ -1495,7 +1494,7 @@ loop_versioning::prune_loop_conditions (class loop *loop, vr_values *vrs)
   EXECUTE_IF_SET_IN_BITMAP (&li.unity_names, 0, i, bi)
     {
       tree name = ssa_name (i);
-      const value_range *vr = vrs->get_value_range (name);
+      const value_range_equiv *vr = vrs->get_value_range (name);
       if (vr && !vr->may_contain_p (build_one_cst (TREE_TYPE (name))))
        {
          if (dump_enabled_p ())