From 75974b86aa6a7088c483bcfd99ef3e3c969406fd Mon Sep 17 00:00:00 2001
From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 12 Apr 2017 06:12:26 +0000
Subject: [PATCH] 	PR sanitizer/80349 	* fold-const.c
 (fold_binary_loc) <case BIT_IOR_EXPR>: Convert arg0's 	first argument to
 type.

	* g++.dg/ubsan/pr80349.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@246865 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                        |  6 ++++++
 gcc/fold-const.c                     | 12 ++++++------
 gcc/testsuite/ChangeLog              |  5 +++++
 gcc/testsuite/g++.dg/ubsan/pr80349.C | 11 +++++++++++
 4 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/ubsan/pr80349.C

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 388db6d7ab2..f96256bfac9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/80349
+	* fold-const.c (fold_binary_loc) <case BIT_IOR_EXPR>: Convert arg0's
+	first argument to type.
+
 2017-04-11  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
 	PR target/80376
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 524bb0fe3fb..2f2e93afb55 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -9916,12 +9916,12 @@ fold_binary_loc (location_t loc,
 	    }
 
 	  if (c3 != c1)
-	    return fold_build2_loc (loc, BIT_IOR_EXPR, type,
-				    fold_build2_loc (loc, BIT_AND_EXPR, type,
-						     TREE_OPERAND (arg0, 0),
-						     wide_int_to_tree (type,
-								       c3)),
-				    arg1);
+	    {
+	      tem = fold_convert_loc (loc, type, TREE_OPERAND (arg0, 0));
+	      tem = fold_build2_loc (loc, BIT_AND_EXPR, type, tem,
+				     wide_int_to_tree (type, c3));
+	      return fold_build2_loc (loc, BIT_IOR_EXPR, type, tem, arg1);
+	    }
 	}
 
       /* See if this can be simplified into a rotate first.  If that
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 354adb04314..bf315d3696e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/80349
+	* g++.dg/ubsan/pr80349.C: New test.
+
 2017-04-11  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/80370
diff --git a/gcc/testsuite/g++.dg/ubsan/pr80349.C b/gcc/testsuite/g++.dg/ubsan/pr80349.C
new file mode 100644
index 00000000000..f705b92caff
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ubsan/pr80349.C
@@ -0,0 +1,11 @@
+// PR sanitizer/80349
+// { dg-do compile }
+// { dg-options "-fsanitize=undefined" }
+
+extern const long long int v;
+
+void
+foo ()
+{
+  (int)((v & 50 | 051UL) << 0) << 0;
+}
-- 
2.11.4.GIT