Backport r245647

2017-03-22  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-02-22  Martin Liska  <mliska@suse.cz>

	PR lto/79587
	* data-streamer-in.c (streamer_read_gcov_count): Remove assert.
	* data-streamer-out.c (streamer_write_gcov_count_stream):
	Likewise.
	* value-prof.c (stream_out_histogram_value): Make assert more
	precise based on type of counter.
2017-03-22  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-02-22  Martin Liska  <mliska@suse.cz>

	PR lto/79587
	* gcc.dg/tree-prof/pr79587.c: New test.

From-SVN: r246387

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a17e7f95c35188a00495697b070030b4a7ff017..ab774eb27e8536b77cf5b2ca8a135dcfa59e59d6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2017-03-22  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2017-02-22  Martin Liska  <mliska@suse.cz>
+
+       PR lto/79587
+       * data-streamer-in.c (streamer_read_gcov_count): Remove assert.
+       * data-streamer-out.c (streamer_write_gcov_count_stream):
+       Likewise.
+       * value-prof.c (stream_out_histogram_value): Make assert more
+       precise based on type of counter.
+
 2017-03-22  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/data-streamer-in.c b/gcc/data-streamer-in.c
index 424d52295fa986dcff379a3c97322a76bd875915..fec20ea59c42e919a8c081aa8fcc3947fed59710 100644 (file)
--- a/gcc/data-streamer-in.c
+++ b/gcc/data-streamer-in.c
@@ -206,6 +206,5 @@ gcov_type
 streamer_read_gcov_count (struct lto_input_block *ib)
 {
   gcov_type ret = streamer_read_hwi (ib);
-  gcc_assert (ret >= 0);
   return ret;
 }

diff --git a/gcc/data-streamer-out.c b/gcc/data-streamer-out.c
index caee0c6a464633d6055981bcf1cc530d2325301d..ac2c1d64bcd8eb7d2ba968ec624ebba2170590d9 100644 (file)
--- a/gcc/data-streamer-out.c
+++ b/gcc/data-streamer-out.c
@@ -363,7 +363,6 @@ streamer_write_hwi_stream (struct lto_output_stream *obs, HOST_WIDE_INT work)
 void
 streamer_write_gcov_count_stream (struct lto_output_stream *obs, gcov_type work)
 {
-  gcc_assert (work >= 0);
   gcc_assert ((HOST_WIDE_INT) work == work);
   streamer_write_hwi_stream (obs, work);
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fd36c0a5b0030800524ddfc6809e267f960cd028..2f3750237d26369f6e970dae5040a425b62e7005 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2017-03-22  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2017-02-22  Martin Liska  <mliska@suse.cz>
+
+       PR lto/79587
+       * gcc.dg/tree-prof/pr79587.c: New test.
+
 2017-03-22  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/testsuite/gcc.dg/tree-prof/pr79587.c b/gcc/testsuite/gcc.dg/tree-prof/pr79587.c
new file mode 100644 (file)
index 0000000..517e081
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-prof/pr79587.c
@@ -0,0 +1,26 @@
+/* { dg-require-effective-target lto } */
+/* { dg-options "-O2 -flto" } */
+
+unsigned long global = -12345;
+
+unsigned long
+__attribute__((noinline))
+test(unsigned long v, unsigned long v2)
+{
+  unsigned long x = v % v2;
+
+  return x;
+}
+
+int main(int argc, char **argv)
+{
+  unsigned long r = 0;
+
+  for (int i = 0; i < 100; i++)
+    r += test(argc, global);
+
+  if (r != 100)
+    __builtin_abort ();
+
+  return 0;
+}

diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index b16bce8746a9552c3a91c1ebf4c5aaf36a9c5f85..9d04ee2d6bdf20576293eb59a6cd3ac31138986e 100644 (file)
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.c
@@ -431,7 +431,17 @@ stream_out_histogram_value (struct output_block *ob, histogram_value hist)
       break;
     }
   for (i = 0; i < hist->n_counters; i++)
-    streamer_write_gcov_count (ob, hist->hvalue.counters[i]);
+    {
+      /* When user uses an unsigned type with a big value, constant converted
+        to gcov_type (a signed type) can be negative.  */
+      gcov_type value = hist->hvalue.counters[i];
+      if (hist->type == HIST_TYPE_SINGLE_VALUE && i == 0)
+       ;
+      else
+       gcc_assert (value >= 0);
+
+      streamer_write_gcov_count (ob, value);
+    }
   if (hist->hvalue.next)
     stream_out_histogram_value (ob, hist->hvalue.next);
 }