Skip to content

Commit

Permalink
PR sanitizer/60636
Browse files Browse the repository at this point in the history
	* ubsan.c (instrument_si_overflow): Instrument ABS_EXPR.

	* c-c++-common/ubsan/pr60636.c: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208841 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
jakub committed Mar 26, 2014
1 parent ce8e666 commit 57e011d
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 0 deletions.
3 changes: 3 additions & 0 deletions gcc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
2014-03-26 Jakub Jelinek <[email protected]>

PR sanitizer/60636
* ubsan.c (instrument_si_overflow): Instrument ABS_EXPR.

* tree-vrp.c (simplify_internal_call_using_ranges): If only
one range is range_int_cst_p, but not both, at least optimize
addition/subtraction of 0 and multiplication by 0 or 1.
Expand Down
5 changes: 5 additions & 0 deletions gcc/testsuite/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2014-03-26 Jakub Jelinek <[email protected]>

PR sanitizer/60636
* c-c++-common/ubsan/pr60636.c: New test.

2014-03-26 Andreas Schwab <[email protected]>

* g++.dg/torture/pr60315.C: Remove duplication.
Expand Down
15 changes: 15 additions & 0 deletions gcc/testsuite/c-c++-common/ubsan/pr60636.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* PR sanitizer/60636 */
/* { dg-do run } */
/* { dg-options "-fsanitize=undefined" } */

volatile long long int a;

int
main ()
{
long long int u = -__LONG_LONG_MAX__ - 1;
a = u > 0 ? u : -u;
return 0;
}

/* { dg-output "negation of -9223372036854775808 cannot be represented in type 'long long int'" } */
15 changes: 15 additions & 0 deletions gcc/ubsan.c
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,21 @@ instrument_si_overflow (gimple_stmt_iterator gsi)
gimple_call_set_lhs (g, lhs);
gsi_replace (&gsi, g, false);
break;
case ABS_EXPR:
/* Transform i = ABS_EXPR<u>;
into
_N = UBSAN_CHECK_SUB (0, u);
i = ABS_EXPR<_N>; */
a = build_int_cst (lhstype, 0);
b = gimple_assign_rhs1 (stmt);
g = gimple_build_call_internal (IFN_UBSAN_CHECK_SUB, 2, a, b);
a = make_ssa_name (lhstype, NULL);
gimple_call_set_lhs (g, a);
gimple_set_location (g, gimple_location (stmt));
gsi_insert_before (&gsi, g, GSI_SAME_STMT);
gimple_assign_set_rhs1 (stmt, a);
update_stmt (stmt);
break;
default:
break;
}
Expand Down

0 comments on commit 57e011d

Please sign in to comment.