diff options
| author | Daniel Berlin <dberlin@dberlin.org> | 2004-08-20 16:48:00 +0000 |
|---|---|---|
| committer | Daniel Berlin <dberlin@gcc.gnu.org> | 2004-08-20 16:48:00 +0000 |
| commit | af75a7ea828d60f103de52f79e2d3f78e315d519 (patch) | |
| tree | 7f9e0f8eb04d3281ea4f4c056521694d7907ec2a /gcc/tree-ssa-pre.c | |
| parent | 8b84ead6fecd0ac9cb4f3d7213e00b27332c7d5d (diff) | |
| download | gcc-af75a7ea828d60f103de52f79e2d3f78e315d519.zip gcc-af75a7ea828d60f103de52f79e2d3f78e315d519.tar.gz gcc-af75a7ea828d60f103de52f79e2d3f78e315d519.tar.bz2 | |
re PR tree-optimization/17111 (tree check ICE in value_insert_into_set_bitmap on inlining a memcmp-like function)
2004-08-20 Daniel Berlin <dberlin@dberlin.org>
Fix PR tree-optimization/17111
* tree-ssa-pre.c (create_value_expr_from): Don't change the types
of non-value_handles.
(bitmap_set_contains): All constants are in every set.
From-SVN: r86331
Diffstat (limited to 'gcc/tree-ssa-pre.c')
| -rw-r--r-- | gcc/tree-ssa-pre.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index 95ee573..1267a54 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -629,6 +629,10 @@ set_contains_value (value_set_t set, tree val) static bool bitmap_set_contains (bitmap_set_t set, tree expr) { + /* All constants are in every set. */ + if (is_gimple_min_invariant (get_value_handle (expr))) + return true; + /* XXX: Bitmapped sets only contain SSA_NAME's for now. */ if (TREE_CODE (expr) != SSA_NAME) return false; @@ -734,6 +738,7 @@ static void bitmap_value_insert_into_set (bitmap_set_t set, tree expr) { tree val = get_value_handle (expr); + if (is_gimple_min_invariant (val)) return; @@ -1701,7 +1706,8 @@ create_value_expr_from (tree expr, basic_block block, vuse_optype vuses) tree val = vn_lookup_or_add (op, vuses); if (!is_undefined_value (op)) value_insert_into_set (EXP_GEN (block), op); - TREE_TYPE (val) = TREE_TYPE (TREE_OPERAND (vexpr, i)); + if (TREE_CODE (val) == VALUE_HANDLE) + TREE_TYPE (val) = TREE_TYPE (TREE_OPERAND (vexpr, i)); TREE_OPERAND (vexpr, i) = val; } } |