re PR middle-end/52478 (-ftrapv calls the wrong functions in libgcc)

2014-07-29  Richard Biener  <rguenther@suse.de>

	PR middle-end/52478
	* expr.c (expand_expr_real_2): Revert last change.

From-SVN: r213153

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 484a5e18101a4a079e5ab2c9c73c214dd177a43b..2166cd76ac2a023edd1910a1cfb48219f84fefde 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-29  Richard Biener  <rguenther@suse.de>
+
+       PR middle-end/52478
+       * expr.c (expand_expr_real_2): Revert last change.
+
 2014-07-28  Jan Hubicka  <hubicka@ucw.cz>
 
        * cgraph.c (cgraph_node::create_indirect_edge): Copy speculative data.

diff --git a/gcc/expr.c b/gcc/expr.c
index de0da345198819fa6ac2cce9bad0829a26cf3d4c..d8328eebfbf62e676420115ba6c3d110895e5615 100644 (file)
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -9212,9 +9212,7 @@ expand_expr_real_2 (sepops ops, rtx target, enum machine_mode tmode,
   if (modifier == EXPAND_STACK_PARM)
     target = 0;
   temp = expand_binop (mode, this_optab, op0, op1, target,
-                      unsignedp,
-                      trapv_binoptab_p (this_optab)
-                      ? OPTAB_LIB : OPTAB_LIB_WIDEN);
+                      unsignedp, OPTAB_LIB_WIDEN);
   gcc_assert (temp);
   /* Bitwise operations do not need bitfield reduction as we expect their
      operands being properly truncated.  */