From b2dd75cb9cd962dbc29c20ead99de15698ad2409 Mon Sep 17 00:00:00 2001 From: rguenth Date: Sat, 17 Oct 2009 11:47:56 +0000 Subject: [PATCH] 2009-10-17 Richard Guenther * lto-streamer-in.c (input_gimple_stmt): Fixup FIELD_DECL operands in COMPONENT_REFs. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@152937 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/lto-streamer-in.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index aed9418d470..084ec33521e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2009-10-17 Richard Guenther + + * lto-streamer-in.c (input_gimple_stmt): Fixup FIELD_DECL + operands in COMPONENT_REFs. + 2009-10-17 Anatoly Sokolov * targhooks.c (default_libcall_value): Don't use LIBCALL_VALUE macro diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c index 71faf0f39f6..45be0c2d47b 100644 --- a/gcc/lto-streamer-in.c +++ b/gcc/lto-streamer-in.c @@ -1061,6 +1061,36 @@ input_gimple_stmt (struct lto_input_block *ib, struct data_in *data_in, { tree op = lto_input_tree (ib, data_in); gimple_set_op (stmt, i, op); + + /* Fixup FIELD_DECLs. */ + while (op && handled_component_p (op)) + { + if (TREE_CODE (op) == COMPONENT_REF) + { + tree field, type, tem; + field = TREE_OPERAND (op, 1); + type = DECL_CONTEXT (field); + for (tem = TYPE_FIELDS (type); tem; tem = TREE_CHAIN (tem)) + { + if (tem == field + || (TREE_TYPE (tem) == TREE_TYPE (field) + && (DECL_FIELD_OFFSET (tem) + == DECL_FIELD_OFFSET (field)) + && (DECL_FIELD_BIT_OFFSET (tem) + == DECL_FIELD_BIT_OFFSET (field)) + && (DECL_OFFSET_ALIGN (tem) + == DECL_OFFSET_ALIGN (field)))) + break; + } + /* In case of type mismatches across units we can fail + to unify some types and thus not find a proper + field-decl here. Just do nothing in this case. */ + if (tem != NULL_TREE) + TREE_OPERAND (op, 1) = tem; + } + + op = TREE_OPERAND (op, 0); + } } break; -- 2.11.4.GIT