From: Martin Liska <mliska@suse.cz>
Date: Tue, 3 Apr 2018 13:43:22 +0000 (+0200)
Subject: Remove UBSAN in dwarf2out.c (PR tree-optimization/82491).
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a3dadf610789784e5fe7e80e3212daa172e1162c;p=gcc.git

Remove UBSAN in dwarf2out.c (PR tree-optimization/82491).

2018-04-03  Martin Liska  <mliska@suse.cz>

	PR tree-optimization/82491
	* rtl.h (strip_offset_and_add): Replace += suboffset with
	poly_uint64 () + suboffset.

From-SVN: r259030
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2a43c39a290..bac81f8e5bc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-03  Martin Liska  <mliska@suse.cz>
+
+	PR tree-optimization/82491
+	* rtl.h (strip_offset_and_add): Replace += suboffset with
+	poly_uint64 () + suboffset.
+
 2018-03-29  Martin Liska  <mliska@suse.cz>
 	    Martin Jambor  <mjambor@suse.cz>
 
diff --git a/gcc/rtl.h b/gcc/rtl.h
index f31b4ade9d3..0341ba01614 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -4339,7 +4339,7 @@ strip_offset_and_add (rtx x, poly_int64_pod *offset)
     {
       poly_int64 suboffset;
       x = strip_offset (x, &suboffset);
-      *offset += suboffset;
+      *offset = poly_uint64 (*offset) + suboffset;
     }
   return x;
 }