From 6a4da643ca8f52e973b89a76057b76fde7f0a708 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Fri, 28 Nov 2014 15:54:52 +0000 Subject: [PATCH] c-ubsan.c (ubsan_instrument_shift): Use op1_utype for MINUS_EXPR instead of unsigned_type_node. * 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. From-SVN: r218163 --- gcc/c-family/ChangeLog | 5 ++ gcc/c-family/c-ubsan.c | 2 +- gcc/testsuite/ChangeLog | 4 ++ gcc/testsuite/c-c++-common/ubsan/shift-8.c | 64 ++++++++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/c-c++-common/ubsan/shift-8.c diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index efb4735f01a..e329bf787e4 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2014-11-28 Marek Polacek + + * c-ubsan.c (ubsan_instrument_shift): Use op1_utype for MINUS_EXPR + instead of unsigned_type_node. + 2014-11-28 Marek Polacek PR c/63862 diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c index 96afc674866..5c039caa560 100644 --- a/gcc/c-family/c-ubsan.c +++ b/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 a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3528b18837b..39aa1789e43 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2014-11-28 Marek Polacek + + * c-c++-common/ubsan/shift-8.c: New test. + 2014-11-28 Vladimir Makarov PR rtl-optimization/64087 diff --git a/gcc/testsuite/c-c++-common/ubsan/shift-8.c b/gcc/testsuite/c-c++-common/ubsan/shift-8.c new file mode 100644 index 00000000000..8717f3f3427 --- /dev/null +++ b/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; +} -- 2.30.2