Reduce nesting of parentheses in conditionals generated by genattrtab

gcc/ChangeLog:

	* genattrtab.c (write_test_expr): New parameter EMIT_PARENS
	which defaults to true.  Emit an outer pair of parentheses only if
	EMIT_PARENS.  When continuing a chain of && or || (or & or |),
	don't emit parentheses for the right-hand operand.

From-SVN: r235536
This commit is contained in:
Patrick Palka 2016-04-27 21:18:05 +00:00
parent 565f407037
commit 044a73da40
2 changed files with 30 additions and 8 deletions

View File

@ -1,3 +1,10 @@
2016-04-27 Patrick Palka <ppalka@gcc.gnu.org>
* genattrtab.c (write_test_expr): New parameter EMIT_PARENS
which defaults to true. Emit an outer pair of parentheses only if
EMIT_PARENS. When continuing a chain of && or || (or & or |),
don't emit parentheses for the right-hand operand.
2016-04-27 Jeff Law <law@redhat.com>
* tree-ssa-dom.c (record_temporary_equivalences): Fix typo in comment.

View File

@ -3416,7 +3416,10 @@ find_attrs_to_cache (rtx exp, bool create)
/* Given a piece of RTX, print a C expression to test its truth value to OUTF.
We use AND and IOR both for logical and bit-wise operations, so
interpret them as logical unless they are inside a comparison expression. */
interpret them as logical unless they are inside a comparison expression.
An outermost pair of parentheses is emitted around this C expression unless
EMIT_PARENS is false. */
/* Interpret AND/IOR as bit-wise operations instead of logical. */
#define FLG_BITWISE 1
@ -3432,16 +3435,16 @@ find_attrs_to_cache (rtx exp, bool create)
#define FLG_OUTSIDE_AND 8
static unsigned int
write_test_expr (FILE *outf, rtx exp, unsigned int attrs_cached, int flags)
write_test_expr (FILE *outf, rtx exp, unsigned int attrs_cached, int flags,
bool emit_parens = true)
{
int comparison_operator = 0;
RTX_CODE code;
struct attr_desc *attr;
/* In order not to worry about operator precedence, surround our part of
the expression with parentheses. */
if (emit_parens)
fprintf (outf, "(");
fprintf (outf, "(");
code = GET_CODE (exp);
switch (code)
{
@ -3575,8 +3578,18 @@ write_test_expr (FILE *outf, rtx exp, unsigned int attrs_cached, int flags)
|| GET_CODE (XEXP (exp, 1)) == EQ_ATTR
|| (GET_CODE (XEXP (exp, 1)) == NOT
&& GET_CODE (XEXP (XEXP (exp, 1), 0)) == EQ_ATTR)))
attrs_cached
= write_test_expr (outf, XEXP (exp, 1), attrs_cached, flags);
{
bool need_parens = true;
/* No need to emit parentheses around the right-hand operand if we are
continuing a chain of && or || (or & or |). */
if (GET_CODE (XEXP (exp, 1)) == code)
need_parens = false;
attrs_cached
= write_test_expr (outf, XEXP (exp, 1), attrs_cached, flags,
need_parens);
}
else
write_test_expr (outf, XEXP (exp, 1), attrs_cached,
flags | comparison_operator);
@ -3794,7 +3807,9 @@ write_test_expr (FILE *outf, rtx exp, unsigned int attrs_cached, int flags)
GET_RTX_NAME (code));
}
fprintf (outf, ")");
if (emit_parens)
fprintf (outf, ")");
return attrs_cached;
}