From be3c9981162ea120666356f56fa631514710a2e7 Mon Sep 17 00:00:00 2001 From: mpolacek Date: Wed, 6 Jan 2016 10:24:15 +0000 Subject: PR sanitizer/69099 * c-convert.c (convert) [INTEGER_TYPE]: Drop ARG. Don't pass ARG to ubsan_instrument_float_cast. Fold EXPR. Use NULL_TREE instead of NULL. * convert.c (convert_to_integer_1): Adjust call to ubsan_instrument_float_cast. Use NULL_TREE instead of NULL. * ubsan.c (ubsan_instrument_float_cast): Drop the ARG parameter. Use EXPR instead of ARG. * ubsan.h (ubsan_instrument_float_cast): Adjust declaration. * gcc.dg/ubsan/float-cast-overflow-atomic.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232099 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/convert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gcc/convert.c') diff --git a/gcc/convert.c b/gcc/convert.c index 4b1e1f17760..dd7d818b67b 100644 --- a/gcc/convert.c +++ b/gcc/convert.c @@ -920,9 +920,9 @@ convert_to_integer_1 (tree type, tree expr, bool dofold) && do_ubsan_in_current_function ()) { expr = save_expr (expr); - tree check = ubsan_instrument_float_cast (loc, type, expr, expr); + tree check = ubsan_instrument_float_cast (loc, type, expr); expr = build1 (FIX_TRUNC_EXPR, type, expr); - if (check == NULL) + if (check == NULL_TREE) return expr; return maybe_fold_build2_loc (dofold, loc, COMPOUND_EXPR, TREE_TYPE (expr), check, expr); -- cgit v1.2.1