Turn offset_map to HOST_WIDE_INT

gcc/ChangeLog:

2020-10-14  Jan Hubicka  <hubicka@ucw.cz>

	* ipa-fnsummary.c (remap_edge_summaries): Make offset_map HOST_WIDE_INT.
	(remap_freqcounting_predicate): Likewise.
	(ipa_merge_fn_summary_after_inlining): Likewise.
	* ipa-predicate.c (predicate::remap_after_inlining): Likewise
	* ipa-predicate.h (remap_after_inlining): Update.

diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c
index 771f432..9e3eda4 100644 (file)
--- a/gcc/ipa-fnsummary.c
+++ b/gcc/ipa-fnsummary.c
@@ -3896,7 +3896,7 @@ remap_edge_summaries (struct cgraph_edge *inlined_edge,
                      class ipa_node_params *params_summary,
                      class ipa_fn_summary *callee_info,
                      vec<int> operand_map,
-                     vec<int> offset_map,
+                     vec<HOST_WIDE_INT> offset_map,
                      clause_t possible_truths,
                      predicate *toplev_predicate)
 {
@@ -3957,7 +3957,7 @@ remap_freqcounting_predicate (class ipa_fn_summary *info,
                              class ipa_fn_summary *callee_info,
                              vec<ipa_freqcounting_predicate, va_gc> *v,
                              vec<int> operand_map,
-                             vec<int> offset_map,
+                             vec<HOST_WIDE_INT> offset_map,
                              clause_t possible_truths,
                              predicate *toplev_predicate)
 
@@ -3987,7 +3987,7 @@ ipa_merge_fn_summary_after_inlining (struct cgraph_edge *edge)
   clause_t clause = 0; /* not_inline is known to be false.  */
   size_time_entry *e;
   auto_vec<int, 8> operand_map;
-  auto_vec<int, 8> offset_map;
+  auto_vec<HOST_WIDE_INT, 8> offset_map;
   int i;
   predicate toplev_predicate;
   class ipa_call_summary *es = ipa_call_summaries->get (edge);

diff --git a/gcc/ipa-predicate.c b/gcc/ipa-predicate.c
index 27dabf2..605da91 100644 (file)
--- a/gcc/ipa-predicate.c
+++ b/gcc/ipa-predicate.c
@@ -508,7 +508,7 @@ predicate::remap_after_inlining (class ipa_fn_summary *info,
                                 class ipa_node_params *params_summary,
                                 class ipa_fn_summary *callee_info,
                                 vec<int> operand_map,
-                                vec<int> offset_map,
+                                vec<HOST_WIDE_INT> offset_map,
                                 clause_t possible_truths,
                                 const predicate &toplev_predicate)
 {

diff --git a/gcc/ipa-predicate.h b/gcc/ipa-predicate.h
index 05e3707..34a0d23 100644 (file)
--- a/gcc/ipa-predicate.h
+++ b/gcc/ipa-predicate.h
@@ -243,7 +243,8 @@ public:
   predicate remap_after_inlining (class ipa_fn_summary *,
                                  class ipa_node_params *params_summary,
                                  class ipa_fn_summary *,
-                                 vec<int>, vec<int>, clause_t, const predicate &);
+                                 vec<int>, vec<HOST_WIDE_INT>,
+                                 clause_t, const predicate &);
 
   void stream_in (class lto_input_block *);
   void stream_out (struct output_block *);