PR middle-end/66178
* expr.c (expand_expr_real_2) [PLUS_EXPR, MINUS_EXPR]: Don't
drop EXPAND_INITIALIZER.
* rtl.h (contains_symbolic_reference_p): Declare.
* rtlanal.c (contains_symbolic_reference_p): New function.
* simplify-rtx.c (simplify_binary_operation_1): Don't turn
a subtraction into a NOT if symbolic constants are involved.
testsuite/
PR middle-end/66178
gcc.dg/torture/pr66178.c: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232689
138bc75d-0d04-0410-961f-
82ee72b054a4
+2016-01-21 Bernd Schmidt <bschmidt@redhat.com>
+
+ PR middle-end/66178
+ * expr.c (expand_expr_real_2) [PLUS_EXPR, MINUS_EXPR]: Don't
+ drop EXPAND_INITIALIZER.
+ * rtl.h (contains_symbolic_reference_p): Declare.
+ * rtlanal.c (contains_symbolic_reference_p): New function.
+ * simplify-rtx.c (simplify_binary_operation_1): Don't turn
+ a subtraction into a NOT if symbolic constants are involved.
+
2016-01-21 Anton Blanchard <anton@samba.org>
Bill Schmidt <wschmidt@linux.vnet.ibm.com>
if it's all in the wrong mode to form part of an address.
And force_operand won't know whether to sign-extend or
zero-extend. */
- if ((modifier != EXPAND_SUM && modifier != EXPAND_INITIALIZER)
- || mode != ptr_mode)
+ if (modifier != EXPAND_INITIALIZER
+ && (modifier != EXPAND_SUM || mode != ptr_mode))
{
expand_operands (treeop0, treeop1,
- subtarget, &op0, &op1, EXPAND_NORMAL);
+ subtarget, &op0, &op1, modifier);
if (op0 == const0_rtx)
return op1;
if (op1 == const0_rtx)
if it's all in the wrong mode to form part of an address.
And force_operand won't know whether to sign-extend or
zero-extend. */
- if ((modifier != EXPAND_SUM && modifier != EXPAND_INITIALIZER)
- || mode != ptr_mode)
+ if (modifier != EXPAND_INITIALIZER
+ && (modifier != EXPAND_SUM || mode != ptr_mode))
goto binop;
expand_operands (treeop0, treeop1,
extern rtx single_set_2 (const rtx_insn *, const_rtx);
extern bool contains_symbol_ref_p (const_rtx);
+extern bool contains_symbolic_reference_p (const_rtx);
/* Handle the cheap and common cases inline for performance. */
return false;
}
+/* Return true if RTL X contains a SYMBOL_REF or LABEL_REF. */
+
+bool
+contains_symbolic_reference_p (const_rtx x)
+{
+ subrtx_iterator::array_type array;
+ FOR_EACH_SUBRTX (iter, array, x, ALL)
+ if (SYMBOL_REF_P (*iter) || GET_CODE (*iter) == LABEL_REF)
+ return true;
+
+ return false;
+}
+
/* Return true if X contains a thread-local symbol. */
bool
if (!HONOR_SIGNED_ZEROS (mode) && trueop0 == CONST0_RTX (mode))
return simplify_gen_unary (NEG, mode, op1, mode);
- /* (-1 - a) is ~a. */
- if (trueop0 == constm1_rtx)
+ /* (-1 - a) is ~a, unless the expression avoids symbolic constants,
+ in which case not retaining additions and subtractions could
+ cause invalid assembly to be produced. */
+ if (trueop0 == constm1_rtx
+ && !contains_symbolic_reference_p (op1))
return simplify_gen_unary (NOT, mode, op1, mode);
/* Subtracting 0 has no effect unless the mode has signed zeros
+2016-01-21 Bernd Schmidt <bschmidt@redhat.com>
+
+ PR middle-end/66178
+ * gcc.dg/torture/pr66178.c: New test.
+
2016-01-21 Anton Blanchard <anton@samba.org>
Bill Schmidt <wschmidt@linux.vnet.ibm.com>
--- /dev/null
+/* { dg-do compile } */
+int test(void)
+{
+ static int a = ((char *)&&l1-(char *)&&l2)-1;
+l1:
+l2:
+ return a;
+}
+
+int test2(void)
+{
+ static int a = ((char *)&&l2-(char *)&&l3)+((char *)&&l1-(char *)&&l2);
+l1:
+l2:
+l3:
+ return a;
+}