From ea4b48ea9b632c4aa2515f7511a44c624bb8d65b Mon Sep 17 00:00:00 2001 From: amylaar Date: Mon, 16 Nov 2009 15:11:31 +0000 Subject: [PATCH] Small changes to remove go past a few of the bootstrap errors: * tree-inline.c (generic_cloning_remap_gimple_op_r): Supply location parameter to fold_indirect_ref_1. (generic_cloning_copy_tree_body_r): Supply location parameter to build_empty_stmt and fold_indirect_ref_1. Remove RESX_EXPR handling. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/ici-20091108-branch@154204 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/tree-inline.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 4d854fdd1b6..194c485d1a7 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -1410,7 +1410,8 @@ generic_cloning_remap_gimple_op_r (tree *tp, int *walk_subtrees, void *data) { if (TREE_CODE (new_tree) == ADDR_EXPR) { - *tp = fold_indirect_ref_1 (type, new_tree); + *tp = fold_indirect_ref_1 (EXPR_LOCATION (new_tree), + type, new_tree); /* ??? We should either assert here or build a VIEW_CONVERT_EXPR instead of blindly leaking incompatible types to our IL. */ @@ -1887,7 +1888,7 @@ generic_cloning_copy_tree_body_r (tree *tp, int *walk_subtrees, void *data) STRIP_TYPE_NOPS (value); if (TREE_CONSTANT (value) || TREE_READONLY (value)) { - *tp = build_empty_stmt (); + *tp = build_empty_stmt (EXPR_LOCATION (*tp)); return generic_cloning_copy_tree_body_r (tp, walk_subtrees, data); } } @@ -1918,7 +1919,8 @@ generic_cloning_copy_tree_body_r (tree *tp, int *walk_subtrees, void *data) { if (TREE_CODE (new_tree) == ADDR_EXPR) { - *tp = fold_indirect_ref_1 (type, new_tree); + *tp = fold_indirect_ref_1 (EXPR_LOCATION (new_tree), + type, new_tree); /* ??? We should either assert here or build a VIEW_CONVERT_EXPR instead of blindly leaking incompatible types to our IL. */ @@ -1966,12 +1968,6 @@ generic_cloning_copy_tree_body_r (tree *tp, int *walk_subtrees, void *data) /*TREE_BLOCK (*tp) = new_block;*/ } - if (TREE_CODE (*tp) == RESX_EXPR && id->eh_region_offset) - TREE_OPERAND (*tp, 0) = - build_int_cst (NULL_TREE, - id->eh_region_offset - + TREE_INT_CST_LOW (TREE_OPERAND (*tp, 0))); - if (TREE_CODE (*tp) != OMP_CLAUSE) TREE_TYPE (*tp) = generic_cloning_remap_type (TREE_TYPE (*tp), id); -- 2.11.4.GIT