OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jakub Jelinek 2014-12-17 10:26:49 +01:00 committed by Jakub Jelinek
parent e16a69a8f2
commit 8f94a8c4cc
4 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/c/ChangeLog
View File

@ -1,3 +1,11 @@
2014-12-17 Jakub Jelinek <jakub@redhat.com>
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.
2014-11-29 Jakub Jelinek <jakub@redhat.com>
* c-typeck.c (convert_lvalue_to_rvalue, build_atomic_assign,

15
gcc/c/c-convert.c
View File

@ -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;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2014-12-17 Jakub Jelinek <jakub@redhat.com>
PR sanitizer/64289
* c-c++-common/ubsan/pr64289.c: New test.
2014-12-16 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58650

9
gcc/testsuite/c-c++-common/ubsan/pr64289.c Normal file
View File

@ -0,0 +1,9 @@
/* PR sanitizer/64289 */
/* { dg-do compile } */
/* { dg-options "-fsanitize=float-cast-overflow" } */
int
foo (int a)
{
return (int) (0 ? 0 : a ? a : 0.5);
}