Commit 61c25908 by Olivier Hainque Committed by Olivier Hainque

gimplify.c (gimplify_scalar_mode_aggregate_compare): New function.

	* gimplify.c (gimplify_scalar_mode_aggregate_compare): New function.
	(gimplify_expr): Use it for tcc_comparison of operands of non BLKmode
	aggregate types.

	* tree-ssa-loop-im.c (for_each_index): Handle ARRAY_RANGE_REF as
	ARRAY_REF, so have the callback called for the low bound expression.

	* gnat.dg/scalar_mode_agg_compare_loop.adb: New test.
	* gnat.dg/scalar_mode_agg_compare.adb: New test.

From-SVN: r114963
parent 7606c786
2006-06-24 Olivier Hainque <hainque@adacore.com>
* gimplify.c (gimplify_scalar_mode_aggregate_compare): New function.
(gimplify_expr): Use it for tcc_comparison of operands of non BLKmode
aggregate types.
2006-06-24 Olivier Hainque <hainque@adacore.com>
* tree-ssa-loop-im.c (for_each_index): Handle ARRAY_RANGE_REF as
ARRAY_REF, so have the callback called for the low bound expression.
2006-06-23 Janis Johnson <janis187@us.ibm.com> 2006-06-23 Janis Johnson <janis187@us.ibm.com>
* tree.h (DECIMAL_FLOAT_TYPE_P): New. * tree.h (DECIMAL_FLOAT_TYPE_P): New.
......
...@@ -3582,6 +3582,27 @@ gimplify_variable_sized_compare (tree *expr_p) ...@@ -3582,6 +3582,27 @@ gimplify_variable_sized_compare (tree *expr_p)
return GS_OK; return GS_OK;
} }
/* Gimplify a comparison between two aggregate objects of integral scalar
mode as a comparison between the bitwise equivalent scalar values. */
static enum gimplify_status
gimplify_scalar_mode_aggregate_compare (tree *expr_p)
{
tree op0 = TREE_OPERAND (*expr_p, 0);
tree op1 = TREE_OPERAND (*expr_p, 1);
tree type = TREE_TYPE (op0);
tree scalar_type = lang_hooks.types.type_for_mode (TYPE_MODE (type), 1);
op0 = fold_build1 (VIEW_CONVERT_EXPR, scalar_type, op0);
op1 = fold_build1 (VIEW_CONVERT_EXPR, scalar_type, op1);
*expr_p
= fold_build2 (TREE_CODE (*expr_p), TREE_TYPE (*expr_p), op0, op1);
return GS_OK;
}
/* Gimplify TRUTH_ANDIF_EXPR and TRUTH_ORIF_EXPR expressions. EXPR_P /* Gimplify TRUTH_ANDIF_EXPR and TRUTH_ORIF_EXPR expressions. EXPR_P
points to the expression to gimplify. points to the expression to gimplify.
...@@ -5687,16 +5708,28 @@ gimplify_expr (tree *expr_p, tree *pre_p, tree *post_p, ...@@ -5687,16 +5708,28 @@ gimplify_expr (tree *expr_p, tree *pre_p, tree *post_p,
switch (TREE_CODE_CLASS (TREE_CODE (*expr_p))) switch (TREE_CODE_CLASS (TREE_CODE (*expr_p)))
{ {
case tcc_comparison: case tcc_comparison:
/* If this is a comparison of objects of aggregate type, /* Handle comparison of objects of non scalar mode aggregates
handle it specially (by converting to a call to with a call to memcmp. It would be nice to only have to do
memcmp). It would be nice to only have to do this this for variable-sized objects, but then we'd have to allow
for variable-sized objects, but then we'd have to the same nest of reference nodes we allow for MODIFY_EXPR and
allow the same nest of reference nodes we allow for that's too complex.
MODIFY_EXPR and that's too complex. */
if (!AGGREGATE_TYPE_P (TREE_TYPE (TREE_OPERAND (*expr_p, 1)))) Compare scalar mode aggregates as scalar mode values. Using
goto expr_2; memcmp for them would be very inefficient at best, and is
ret = gimplify_variable_sized_compare (expr_p); plain wrong if bitfields are involved. */
break;
{
tree type = TREE_TYPE (TREE_OPERAND (*expr_p, 1));
if (!AGGREGATE_TYPE_P (type))
goto expr_2;
else if (TYPE_MODE (type) != BLKmode)
ret = gimplify_scalar_mode_aggregate_compare (expr_p);
else
ret = gimplify_variable_sized_compare (expr_p);
break;
}
/* If *EXPR_P does not need to be special-cased, handle it /* If *EXPR_P does not need to be special-cased, handle it
according to its class. */ according to its class. */
......
2006-06-24 Olivier Hainque <hainque@adacore.com>
* gnat.dg/scalar_mode_agg_compare_loop.adb: New test.
* gnat.dg/scalar_mode_agg_compare.adb: New test.
2006-06-23 Janis Johnson <janis187@us.ibm.com> 2006-06-23 Janis Johnson <janis187@us.ibm.com>
* gcc.dg/dfp/usual-arith-conv-bad.c: New test. * gcc.dg/dfp/usual-arith-conv-bad.c: New test.
-- { dg-do run }
procedure Scalar_Mode_Agg_Compare is
type Point is record
Mapped : Boolean;
Tag : String (1 .. 2); -- HImode
end record;
pragma Pack (Point); -- Tag possibly at bitpos 1
function My_Point return Point is
begin
return (Mapped => True, Tag => "XX");
end;
A, B : Point := My_Point;
begin
-- The comparison below should find the two Tag fields equal and not
-- attempt to take their address, which might not be byte aligned.
if A.Tag /= B.Tag then
raise Program_Error;
end if;
end;
-- { dg-do compile }
-- { dg-options "-O2 -gnatp" }
function Scalar_Mode_Agg_Compare_Loop return Boolean is
S : constant String (1 .. 4) := "ABCD";
F : constant Natural := S'First;
L : constant Natural := S'Last;
begin
for J in F .. L - 1 loop
if S (F .. F) = "X" or (J <= L - 2 and S (J .. J + 1) = "YY") then
return True;
end if;
end loop;
return False;
end;
...@@ -174,7 +174,6 @@ for_each_index (tree *addr_p, bool (*cbck) (tree, tree *, void *), void *data) ...@@ -174,7 +174,6 @@ for_each_index (tree *addr_p, bool (*cbck) (tree, tree *, void *), void *data)
case BIT_FIELD_REF: case BIT_FIELD_REF:
case VIEW_CONVERT_EXPR: case VIEW_CONVERT_EXPR:
case ARRAY_RANGE_REF:
case REALPART_EXPR: case REALPART_EXPR:
case IMAGPART_EXPR: case IMAGPART_EXPR:
nxt = &TREE_OPERAND (*addr_p, 0); nxt = &TREE_OPERAND (*addr_p, 0);
...@@ -192,6 +191,7 @@ for_each_index (tree *addr_p, bool (*cbck) (tree, tree *, void *), void *data) ...@@ -192,6 +191,7 @@ for_each_index (tree *addr_p, bool (*cbck) (tree, tree *, void *), void *data)
break; break;
case ARRAY_REF: case ARRAY_REF:
case ARRAY_RANGE_REF:
nxt = &TREE_OPERAND (*addr_p, 0); nxt = &TREE_OPERAND (*addr_p, 0);
if (!cbck (*addr_p, &TREE_OPERAND (*addr_p, 1), data)) if (!cbck (*addr_p, &TREE_OPERAND (*addr_p, 1), data))
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment