aboutsummaryrefslogtreecommitdiff
path: root/gcc/gimple-streamer-in.c
diff options
context:
space:
mode:
authorRichard Biener <rguenther@suse.de>2012-12-05 08:47:40 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2012-12-05 08:47:40 +0000
commit08d8c74533fd7dc5f28549c7b8cdd4fddbb9f458 (patch)
tree9e2ad021c3ca3de780585ae8882dd464e353619b /gcc/gimple-streamer-in.c
parent7fb1e5929d40fd3eb4345d2aed4cd068b3c9eec7 (diff)
downloadgcc-08d8c74533fd7dc5f28549c7b8cdd4fddbb9f458.zip
gcc-08d8c74533fd7dc5f28549c7b8cdd4fddbb9f458.tar.gz
gcc-08d8c74533fd7dc5f28549c7b8cdd4fddbb9f458.tar.bz2
re PR lto/55525 (ICE: tree check: expected array_type, have pointer_type in array_ref_low_bound, at expr.c:6768)
2012-12-05 Richard Biener <rguenther@suse.de> PR lto/55525 * gimple-streamer-in.c (input_gimple_stmt): Fixup ARRAY_REFs as well. * gcc.dg/lto/pr55525_0.c: New testcase. * gcc.dg/lto/pr55525_1.c: Likewise. From-SVN: r194183
Diffstat (limited to 'gcc/gimple-streamer-in.c')
-rw-r--r--gcc/gimple-streamer-in.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/gcc/gimple-streamer-in.c b/gcc/gimple-streamer-in.c
index 6736def..49c4fe4 100644
--- a/gcc/gimple-streamer-in.c
+++ b/gcc/gimple-streamer-in.c
@@ -148,14 +148,14 @@ input_gimple_stmt (struct lto_input_block *ib, struct data_in *data_in,
if (!op)
continue;
- /* Fixup FIELD_DECLs in COMPONENT_REFs, they are not handled
- by decl merging. */
if (TREE_CODE (op) == ADDR_EXPR)
op = TREE_OPERAND (op, 0);
while (handled_component_p (op))
{
if (TREE_CODE (op) == COMPONENT_REF)
{
+ /* Fixup FIELD_DECLs in COMPONENT_REFs, they are not handled
+ by decl merging. */
tree field, type, tem;
tree closest_match = NULL_TREE;
field = TREE_OPERAND (op, 1);
@@ -215,6 +215,18 @@ input_gimple_stmt (struct lto_input_block *ib, struct data_in *data_in,
else
TREE_OPERAND (op, 1) = tem;
}
+ else if ((TREE_CODE (op) == ARRAY_REF
+ || TREE_CODE (op) == ARRAY_RANGE_REF)
+ && (TREE_CODE (TREE_TYPE (TREE_OPERAND (op, 0)))
+ != ARRAY_TYPE))
+ {
+ /* And ARRAY_REFs to objects that had mismatched types
+ during symbol merging to avoid ICEs. */
+ TREE_OPERAND (op, 0)
+ = build1 (VIEW_CONVERT_EXPR,
+ build_array_type (TREE_TYPE (op), NULL_TREE),
+ TREE_OPERAND (op, 0));
+ }
op = TREE_OPERAND (op, 0);
}