From 8f94a8c4cc27e04b3c8ef2f8b650263aab6ff4db Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 17 Dec 2014 10:26:49 +0100 Subject: re PR sanitizer/64289 (ICE with -fsanitize=float-cast-overflow) PR sanitizer/64289 * c-convert.c: Include ubsan.h. (convert): For real -> integral casts and -fsanitize=float-cast-overflow don't call convert_to_integer, but instead instrument the float cast directly. * c-c++-common/ubsan/pr64289.c: New test. From-SVN: r218811 --- gcc/c/c-convert.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gcc/c/c-convert.c') diff --git a/gcc/c/c-convert.c b/gcc/c/c-convert.c index 95be453..ba565da 100644 --- a/gcc/c/c-convert.c +++ b/gcc/c/c-convert.c @@ -34,6 +34,7 @@ along with GCC; see the file COPYING3. If not see #include "c-tree.h" #include "langhooks.h" #include "target.h" +#include "ubsan.h" /* Change of width--truncation and extension of integers or reals-- is represented with NOP_EXPR. Proper functioning of many things @@ -109,6 +110,20 @@ convert (tree type, tree expr) case INTEGER_TYPE: case ENUMERAL_TYPE: + if (flag_sanitize & SANITIZE_FLOAT_CAST + && TREE_CODE (TREE_TYPE (expr)) == REAL_TYPE + && COMPLETE_TYPE_P (type) + && current_function_decl != NULL_TREE + && !lookup_attribute ("no_sanitize_undefined", + DECL_ATTRIBUTES (current_function_decl))) + { + expr = c_save_expr (expr); + tree check = ubsan_instrument_float_cast (loc, type, expr); + expr = fold_build1 (FIX_TRUNC_EXPR, type, expr); + if (check == NULL) + return expr; + return fold_build2 (COMPOUND_EXPR, TREE_TYPE (expr), check, expr); + } ret = convert_to_integer (type, e); goto maybe_fold; -- cgit v1.1