diff options
-rw-r--r-- | gcc/c-family/ChangeLog | 4 | ||||
-rw-r--r-- | gcc/c-family/c-ubsan.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index b73558a..df874d6 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2015-05-25 Marek Polacek <polacek@redhat.com> + + * c-ubsan.c (ubsan_instrument_shift): Use type0. + 2015-05-22 Marek Polacek <polacek@redhat.com> PR c/47043 diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c index dbbdc5b..8fbc66c 100644 --- a/gcc/c-family/c-ubsan.c +++ b/gcc/c-family/c-ubsan.c @@ -173,7 +173,7 @@ ubsan_instrument_shift (location_t loc, enum tree_code code, x < 0 || ((unsigned) x >> (uprecm1 - y)) if > 1, is undefined. */ if (code == LSHIFT_EXPR - && !TYPE_UNSIGNED (TREE_TYPE (op0)) + && !TYPE_UNSIGNED (type0) && (cxx_dialect >= cxx11)) { tree x = fold_build2 (MINUS_EXPR, op1_utype, uprecm1, |