commit:     cc3f74893c9108e231137e8cc94f1332ea149b1f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 16 09:58:22 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 16 09:58:46 2025 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=cc3f7489

15.0.0: update 85_all_PR119614-ipa-vrp-lto.patch

(with debug prints commented out)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 15.0.0/gentoo/85_all_PR119614-ipa-vrp-lto.patch | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/15.0.0/gentoo/85_all_PR119614-ipa-vrp-lto.patch 
b/15.0.0/gentoo/85_all_PR119614-ipa-vrp-lto.patch
index 304b376..01419b6 100644
--- a/15.0.0/gentoo/85_all_PR119614-ipa-vrp-lto.patch
+++ b/15.0.0/gentoo/85_all_PR119614-ipa-vrp-lto.patch
@@ -1,4 +1,5 @@
 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=119614#c37
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=119614#c46
 
        PR tree-optimization/119614
 
@@ -16,8 +17,10 @@ gcc/testsuite/ChangeLog:
 
        * g++.dg/lto/pr119614_0.C: New test.
 
+
+
 diff --git a/gcc/ipa-prop.cc b/gcc/ipa-prop.cc
-index 49d68ab044b..4a83062bfcc 100644
+index 49d68ab044b..f959458ca1e 100644
 --- a/gcc/ipa-prop.cc
 +++ b/gcc/ipa-prop.cc
 @@ -5439,6 +5439,49 @@ ipa_read_node_info (class lto_input_block *ib, struct 
cgraph_node *node,
@@ -70,10 +73,11 @@ index 49d68ab044b..4a83062bfcc 100644
  /* Write jump functions for nodes in SET.  */
  
  void
-@@ -5476,10 +5519,54 @@ ipa_prop_write_jump_functions (void)
+@@ -5475,11 +5518,56 @@ ipa_prop_write_jump_functions (void)
+         && ipa_node_params_sum->get (node) != NULL)
          ipa_write_node_info (ob, node);
      }
-   streamer_write_char_stream (ob->main_stream, 0);
+-  streamer_write_char_stream (ob->main_stream, 0);
 +  ipa_write_return_summaries (ob);
    produce_asm (ob);
    destroy_output_block (ob);
@@ -108,6 +112,7 @@ index 49d68ab044b..4a83062bfcc 100644
 +                         class data_in *data_in)
 +{
 +  unsigned int f_count = streamer_read_uhwi (ib);
++  //fprintf (stderr, "reading %i:\n", f_count);
 +  for (unsigned int i = 0; i < f_count; i++)
 +    {
 +      unsigned int index = streamer_read_uhwi (ib);
@@ -116,6 +121,7 @@ index 49d68ab044b..4a83062bfcc 100644
 +                                                              index));
 +      ipa_vr rvr;
 +      rvr.streamer_read (ib, data_in);
++      //rvr.dump (stderr);
 +      value_range tmp;
 +      rvr.get_vrange (tmp);
 +      ipa_record_return_value_range_1 (node, tmp);
@@ -125,7 +131,7 @@ index 49d68ab044b..4a83062bfcc 100644
  /* Read section in file FILE_DATA of length LEN with data DATA.  */
  
  static void
-@@ -5516,6 +5603,7 @@ ipa_prop_read_section (struct lto_file_decl_data 
*file_data, const char *data,
+@@ -5516,6 +5604,7 @@ ipa_prop_read_section (struct lto_file_decl_data 
*file_data, const char *data,
        gcc_assert (node->definition);
        ipa_read_node_info (&ib_main, node, data_in);
      }
@@ -133,7 +139,7 @@ index 49d68ab044b..4a83062bfcc 100644
    lto_free_section_data (file_data, LTO_section_jump_functions, NULL, data,
                         len);
    lto_data_in_delete (data_in);
-@@ -5635,6 +5723,7 @@ read_ipcp_transformation_info (lto_input_block *ib, 
cgraph_node *node,
+@@ -5635,6 +5724,7 @@ read_ipcp_transformation_info (lto_input_block *ib, 
cgraph_node *node,
      }
  }
  
@@ -141,10 +147,11 @@ index 49d68ab044b..4a83062bfcc 100644
  /* Write all aggregate replacement for nodes in set.  */
  
  void
-@@ -5674,6 +5763,7 @@ ipcp_write_transformation_summaries (void)
+@@ -5673,7 +5763,7 @@ ipcp_write_transformation_summaries (void)
+         && lto_symtab_encoder_encode_body_p (encoder, cnode))
        write_ipcp_transformation_info (ob, cnode, ts);
      }
-   streamer_write_char_stream (ob->main_stream, 0);
+-  streamer_write_char_stream (ob->main_stream, 0);
 +  ipa_write_return_summaries (ob);
    produce_asm (ob);
    destroy_output_block (ob);

Reply via email to