diff mbox

Fix ubsan ICE in the shift instrumentation

Message ID 20141128154927.GG15555@redhat.com
State New
Headers show

Commit Message

Marek Polacek Nov. 28, 2014, 3:49 p.m. UTC 
I forgot to adjust the C++ part of the shift instrumentation as well.

Bootstrapped/regtested on ppc64-linux, ok for trunk?

2014-11-28  Marek Polacek  <polacek@redhat.com>

	* c-ubsan.c (ubsan_instrument_shift): Use op1_utype for MINUS_EXPR
	instead of unsigned_type_node.

	* c-c++-common/ubsan/shift-8.c: New test.


	Marek

Comments

Jakub Jelinek Nov. 28, 2014, 3:51 p.m. UTC | #1 
On Fri, Nov 28, 2014 at 04:49:28PM +0100, Marek Polacek wrote:
> I forgot to adjust the C++ part of the shift instrumentation as well.
> 
> Bootstrapped/regtested on ppc64-linux, ok for trunk?
> 
> 2014-11-28  Marek Polacek  <polacek@redhat.com>
> 
> 	* c-ubsan.c (ubsan_instrument_shift): Use op1_utype for MINUS_EXPR
> 	instead of unsigned_type_node.
> 
> 	* c-c++-common/ubsan/shift-8.c: New test.

Sure, thanks.

> diff --git gcc/c-family/c-ubsan.c gcc/c-family/c-ubsan.c
> index 96afc67..5c039ca 100644
> --- gcc/c-family/c-ubsan.c
> +++ gcc/c-family/c-ubsan.c
> @@ -166,7 +166,7 @@ ubsan_instrument_shift (location_t loc, enum tree_code code,
>        && !TYPE_UNSIGNED (TREE_TYPE (op0))
>        && (cxx_dialect >= cxx11))
>      {
> -      tree x = fold_build2 (MINUS_EXPR, unsigned_type_node, uprecm1,
> +      tree x = fold_build2 (MINUS_EXPR, op1_utype, uprecm1,
>  			    fold_convert (op1_utype, op1));
>        tt = fold_convert_loc (loc, unsigned_type_for (type0), op0);
>        tt = fold_build2 (RSHIFT_EXPR, TREE_TYPE (tt), tt, x);
> diff --git gcc/testsuite/c-c++-common/ubsan/shift-8.c gcc/testsuite/c-c++-common/ubsan/shift-8.c
> index e69de29..8717f3f 100644
> --- gcc/testsuite/c-c++-common/ubsan/shift-8.c
> +++ gcc/testsuite/c-c++-common/ubsan/shift-8.c
> @@ -0,0 +1,64 @@
> +/* { dg-do compile } */
> +/* { dg-options "-fsanitize=undefined" } */
> +/* { dg-additional-options "-std=gnu11" { target c } } */
> +/* { dg-additional-options "-std=c++11" { target c++ } } */
> +
> +signed char
> +fn1 (signed char x, unsigned long y)
> +{
> +  return x << y;
> +}
> +
> +short int
> +fn2 (short int x, unsigned long y)
> +{
> +  return x << y;
> +}
> +
> +int
> +fn3 (int x, unsigned long y)
> +{
> +  return x << y;
> +}
> +
> +long int
> +fn4 (long int x, unsigned long y)
> +{
> +  return x << y;
> +}
> +
> +long long int
> +fn5 (long long int x, unsigned long y)
> +{
> +  return x << y;
> +}
> +
> +signed char
> +fn6 (signed char x, unsigned long long y)
> +{
> +  return x << y;
> +}
> +
> +short int
> +fn7 (short int x, unsigned long long y)
> +{
> +  return x << y;
> +}
> +
> +int
> +fn8 (int x, unsigned long long y)
> +{
> +  return x << y;
> +}
> +
> +long int
> +fn9 (long int x, unsigned long long y)
> +{
> +  return x << y;
> +}
> +
> +long long int
> +fn10 (long long int x, unsigned long long y)
> +{
> +  return x << y;
> +}

	Jakub
diff mbox

Patch

diff --git gcc/c-family/c-ubsan.c gcc/c-family/c-ubsan.c
index 96afc67..5c039ca 100644
--- gcc/c-family/c-ubsan.c
+++ gcc/c-family/c-ubsan.c
@@ -166,7 +166,7 @@  ubsan_instrument_shift (location_t loc, enum tree_code code,
       && !TYPE_UNSIGNED (TREE_TYPE (op0))
       && (cxx_dialect >= cxx11))
     {
-      tree x = fold_build2 (MINUS_EXPR, unsigned_type_node, uprecm1,
+      tree x = fold_build2 (MINUS_EXPR, op1_utype, uprecm1,
 			    fold_convert (op1_utype, op1));
       tt = fold_convert_loc (loc, unsigned_type_for (type0), op0);
       tt = fold_build2 (RSHIFT_EXPR, TREE_TYPE (tt), tt, x);
diff --git gcc/testsuite/c-c++-common/ubsan/shift-8.c gcc/testsuite/c-c++-common/ubsan/shift-8.c
index e69de29..8717f3f 100644
--- gcc/testsuite/c-c++-common/ubsan/shift-8.c
+++ gcc/testsuite/c-c++-common/ubsan/shift-8.c
@@ -0,0 +1,64 @@ 
+/* { dg-do compile } */
+/* { dg-options "-fsanitize=undefined" } */
+/* { dg-additional-options "-std=gnu11" { target c } } */
+/* { dg-additional-options "-std=c++11" { target c++ } } */
+
+signed char
+fn1 (signed char x, unsigned long y)
+{
+  return x << y;
+}
+
+short int
+fn2 (short int x, unsigned long y)
+{
+  return x << y;
+}
+
+int
+fn3 (int x, unsigned long y)
+{
+  return x << y;
+}
+
+long int
+fn4 (long int x, unsigned long y)
+{
+  return x << y;
+}
+
+long long int
+fn5 (long long int x, unsigned long y)
+{
+  return x << y;
+}
+
+signed char
+fn6 (signed char x, unsigned long long y)
+{
+  return x << y;
+}
+
+short int
+fn7 (short int x, unsigned long long y)
+{
+  return x << y;
+}
+
+int
+fn8 (int x, unsigned long long y)
+{
+  return x << y;
+}
+
+long int
+fn9 (long int x, unsigned long long y)
+{
+  return x << y;
+}
+
+long long int
+fn10 (long long int x, unsigned long long y)
+{
+  return x << y;
+}