diff options
| author | Gary Funck <gfunck@gcc.gnu.org> | 2015-03-16 19:02:07 +0000 |
|---|---|---|
| committer | Gary Funck <gfunck@gcc.gnu.org> | 2015-03-16 19:02:07 +0000 |
| commit | 75a4c34f70d5b2ae04563813483c4752cdcff57a (patch) | |
| tree | cce2909d8beed735a24931eb40fc2b879e97e10c /gcc/c/c-convert.c | |
| parent | 05ad98f37416ae9357304bc09c6845d0f3d9a70c (diff) | |
| parent | e1be83cac827243d605912b910d8ede2e74475d2 (diff) | |
| download | gcc-75a4c34f70d5b2ae04563813483c4752cdcff57a.tar.gz | |
Merge trunk version 221445 into gupc branch.
From-SVN: r221465
Diffstat (limited to 'gcc/c/c-convert.c')
| -rw-r--r-- | gcc/c/c-convert.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gcc/c/c-convert.c b/gcc/c/c-convert.c index cda6b23f81f..40cbcc5e8fe 100644 --- a/gcc/c/c-convert.c +++ b/gcc/c/c-convert.c @@ -129,9 +129,7 @@ convert (tree type, tree expr) 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))) + && do_ubsan_in_current_function ()) { tree arg; if (in_late_binary_op) |