Remove my previous kludge in operand_equal_p
Richard Kenner
kenner@vlsi1.ultra.nyu.edu
Wed Nov 24 16:10:00 GMT 2004
I was going to hold off on doing anything with the patches I have in my tree
until I got ACATS fully working again, but that seems wrong, so I'll start
dealing with them.
This is a very old patch that was discussed months ago and actually checked
in at that point. However, there was a lot of instability in the tree, so
I reverted it just in case it was the cause, but it was not.
Tested on x86_64-linux-gnu.
2004-11-24 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
* fold-const.c (operand_equal_p): Remove kludge allowing ARG0 and
ARG1 to be null; instead define OP_SAME and OP_SAME_NULL and use them.
*** fold-const.c 23 Nov 2004 01:27:37 -0000 1.477
--- fold-const.c 24 Nov 2004 14:54:58 -0000
*************** int
*** 2332,2346 ****
operand_equal_p (tree arg0, tree arg1, unsigned int flags)
{
- /* If one is specified and the other isn't, they aren't equal and if
- neither is specified, they are.
-
- ??? This is temporary and is meant only to handle the cases of the
- optional operands for COMPONENT_REF and ARRAY_REF. */
- if ((arg0 && !arg1) || (!arg0 && arg1))
- return 0;
- else if (!arg0 && !arg1)
- return 1;
/* If either is ERROR_MARK, they aren't equal. */
! else if (TREE_CODE (arg0) == ERROR_MARK || TREE_CODE (arg1) == ERROR_MARK)
return 0;
--- 2332,2337 ----
operand_equal_p (tree arg0, tree arg1, unsigned int flags)
{
/* If either is ERROR_MARK, they aren't equal. */
! if (TREE_CODE (arg0) == ERROR_MARK || TREE_CODE (arg1) == ERROR_MARK)
return 0;
*************** operand_equal_p (tree arg0, tree arg1, u
*** 2434,2437 ****
--- 2425,2439 ----
return 0;
+ /* Define macros to test an operan from arg0 and arg1 for equality and a
+ variant that allows null and views null as being different from any
+ non-null value. In the latter case, if either is null, the both
+ must be; otherwise, do the normal comparison. */
+ #define OP_SAME(N) operand_equal_p (TREE_OPERAND (arg0, N), \
+ TREE_OPERAND (arg1, N), flags)
+
+ #define OP_SAME_WITH_NULL(N) \
+ ((!TREE_OPERAND (arg0, N) || !TREE_OPERAND (arg1, N)) \
+ ? TREE_OPERAND (arg0, N) == TREE_OPERAND (arg1, N) : OP_SAME (N))
+
switch (TREE_CODE_CLASS (TREE_CODE (arg0)))
{
*************** operand_equal_p (tree arg0, tree arg1, u
*** 2454,2466 ****
}
! return operand_equal_p (TREE_OPERAND (arg0, 0),
! TREE_OPERAND (arg1, 0), flags);
case tcc_comparison:
case tcc_binary:
! if (operand_equal_p (TREE_OPERAND (arg0, 0),
! TREE_OPERAND (arg1, 0), flags)
! && operand_equal_p (TREE_OPERAND (arg0, 1),
! TREE_OPERAND (arg1, 1), flags))
return 1;
--- 2456,2465 ----
}
! return OP_SAME (0);
!
case tcc_comparison:
case tcc_binary:
! if (OP_SAME (0) && OP_SAME (1))
return 1;
*************** operand_equal_p (tree arg0, tree arg1, u
*** 2486,2520 ****
case REALPART_EXPR:
case IMAGPART_EXPR:
! return operand_equal_p (TREE_OPERAND (arg0, 0),
! TREE_OPERAND (arg1, 0), flags);
case ARRAY_REF:
case ARRAY_RANGE_REF:
! return (operand_equal_p (TREE_OPERAND (arg0, 0),
! TREE_OPERAND (arg1, 0), flags)
! && operand_equal_p (TREE_OPERAND (arg0, 1),
! TREE_OPERAND (arg1, 1), flags)
! && operand_equal_p (TREE_OPERAND (arg0, 2),
! TREE_OPERAND (arg1, 2), flags)
! && operand_equal_p (TREE_OPERAND (arg0, 3),
! TREE_OPERAND (arg1, 3), flags));
!
case COMPONENT_REF:
! return (operand_equal_p (TREE_OPERAND (arg0, 0),
! TREE_OPERAND (arg1, 0), flags)
! && operand_equal_p (TREE_OPERAND (arg0, 1),
! TREE_OPERAND (arg1, 1), flags)
! && operand_equal_p (TREE_OPERAND (arg0, 2),
! TREE_OPERAND (arg1, 2), flags));
!
case BIT_FIELD_REF:
! return (operand_equal_p (TREE_OPERAND (arg0, 0),
! TREE_OPERAND (arg1, 0), flags)
! && operand_equal_p (TREE_OPERAND (arg0, 1),
! TREE_OPERAND (arg1, 1), flags)
! && operand_equal_p (TREE_OPERAND (arg0, 2),
! TREE_OPERAND (arg1, 2), flags));
default:
return 0;
--- 2485,2505 ----
case REALPART_EXPR:
case IMAGPART_EXPR:
! return OP_SAME (0);
case ARRAY_REF:
case ARRAY_RANGE_REF:
! /* Operands 2 and 3 may be null. */
! return (OP_SAME (0)
! && OP_SAME (1)
! && OP_SAME_WITH_NULL (2)
! && OP_SAME_WITH_NULL (3));
case COMPONENT_REF:
! /* Handle operand 2 the same as for ARRAY_REF. */
! return OP_SAME (0) && OP_SAME (1) && OP_SAME_WITH_NULL (2);
case BIT_FIELD_REF:
! return OP_SAME (0) && OP_SAME (1) && OP_SAME (2);
!
default:
return 0;
*************** operand_equal_p (tree arg0, tree arg1, u
*** 2526,2556 ****
case ADDR_EXPR:
case TRUTH_NOT_EXPR:
! return operand_equal_p (TREE_OPERAND (arg0, 0),
! TREE_OPERAND (arg1, 0), flags);
case TRUTH_ANDIF_EXPR:
case TRUTH_ORIF_EXPR:
! return operand_equal_p (TREE_OPERAND (arg0, 0),
! TREE_OPERAND (arg1, 0), flags)
! && operand_equal_p (TREE_OPERAND (arg0, 1),
! TREE_OPERAND (arg1, 1), flags);
case TRUTH_AND_EXPR:
case TRUTH_OR_EXPR:
case TRUTH_XOR_EXPR:
return (operand_equal_p (TREE_OPERAND (arg0, 0),
! TREE_OPERAND (arg1, 0), flags)
&& operand_equal_p (TREE_OPERAND (arg0, 1),
! TREE_OPERAND (arg1, 1), flags))
! || (operand_equal_p (TREE_OPERAND (arg0, 0),
! TREE_OPERAND (arg1, 1), flags)
! && operand_equal_p (TREE_OPERAND (arg0, 1),
! TREE_OPERAND (arg1, 0), flags));
case CALL_EXPR:
/* If the CALL_EXPRs call different functions, then they
clearly can not be equal. */
! if (! operand_equal_p (TREE_OPERAND (arg0, 0),
! TREE_OPERAND (arg1, 0), flags))
return 0;
--- 2511,2536 ----
case ADDR_EXPR:
case TRUTH_NOT_EXPR:
! return OP_SAME (0);
case TRUTH_ANDIF_EXPR:
case TRUTH_ORIF_EXPR:
! return OP_SAME (0) && OP_SAME (1);
case TRUTH_AND_EXPR:
case TRUTH_OR_EXPR:
case TRUTH_XOR_EXPR:
+ if (OP_SAME (0) && OP_SAME (1))
+ return 1;
+
+ /* Otherwise take into account this is a commutative operation. */
return (operand_equal_p (TREE_OPERAND (arg0, 0),
! TREE_OPERAND (arg1, 1), flags)
&& operand_equal_p (TREE_OPERAND (arg0, 1),
! TREE_OPERAND (arg1, 0), flags));
case CALL_EXPR:
/* If the CALL_EXPRs call different functions, then they
clearly can not be equal. */
! if (!OP_SAME (0))
return 0;
*************** operand_equal_p (tree arg0, tree arg1, u
*** 2598,2601 ****
--- 2578,2584 ----
return 0;
}
+
+ #undef OP_SAME
+ #undef OP_SAME_WITH_NULL
}
More information about the Gcc-patches
mailing list