diff options
author | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-08-31 12:52:17 +0000 |
---|---|---|
committer | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-08-31 12:52:17 +0000 |
commit | e49a981971dab0bad9ee48e9c5a3bd0691d63159 (patch) | |
tree | 07b7dc4c38ed99480adb1d8ac12e3fa86d3742c5 /gcc/tree-ssa-alias.c | |
parent | eb67c215519d8619b801c38ac575c38f8777f07b (diff) | |
download | gcc-e49a981971dab0bad9ee48e9c5a3bd0691d63159.tar.gz |
2009-08-31 Richard Guenther <rguenther@suse.de>
* builtins.c (fold_builtin_memory_op): Use the alias oracle
to query if the memory regions for memmove overlap.
* tree-ssa-alias.c (ptr_deref_may_alias_decl_p): Relax the
asserts on pointers, instead deal with odd trees.
(ptr_derefs_may_alias_p): Likewise.
(refs_may_alias_p_1): Constructor bases also never alias.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151241 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree-ssa-alias.c')
-rw-r--r-- | gcc/tree-ssa-alias.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c index 7e83a84b82c..14f1fb47006 100644 --- a/gcc/tree-ssa-alias.c +++ b/gcc/tree-ssa-alias.c @@ -168,12 +168,9 @@ ptr_deref_may_alias_decl_p (tree ptr, tree decl) { struct ptr_info_def *pi; - gcc_assert ((TREE_CODE (ptr) == SSA_NAME - || TREE_CODE (ptr) == ADDR_EXPR - || TREE_CODE (ptr) == INTEGER_CST) - && (TREE_CODE (decl) == VAR_DECL - || TREE_CODE (decl) == PARM_DECL - || TREE_CODE (decl) == RESULT_DECL)); + gcc_assert (TREE_CODE (decl) == VAR_DECL + || TREE_CODE (decl) == PARM_DECL + || TREE_CODE (decl) == RESULT_DECL); /* Non-aliased variables can not be pointed to. */ if (!may_be_aliased (decl)) @@ -197,9 +194,9 @@ ptr_deref_may_alias_decl_p (tree ptr, tree decl) return true; } - /* We can end up with dereferencing constant pointers. + /* We can end up with dereferencing non-SSA name pointers. Just bail out in this case. */ - if (TREE_CODE (ptr) == INTEGER_CST) + if (TREE_CODE (ptr) != SSA_NAME) return true; /* If we do not have useful points-to information for this pointer @@ -220,13 +217,6 @@ ptr_derefs_may_alias_p (tree ptr1, tree ptr2) { struct ptr_info_def *pi1, *pi2; - gcc_assert ((TREE_CODE (ptr1) == SSA_NAME - || TREE_CODE (ptr1) == ADDR_EXPR - || TREE_CODE (ptr1) == INTEGER_CST) - && (TREE_CODE (ptr2) == SSA_NAME - || TREE_CODE (ptr2) == ADDR_EXPR - || TREE_CODE (ptr2) == INTEGER_CST)); - /* ADDR_EXPR pointers either just offset another pointer or directly specify the pointed-to set. */ if (TREE_CODE (ptr1) == ADDR_EXPR) @@ -254,10 +244,10 @@ ptr_derefs_may_alias_p (tree ptr1, tree ptr2) return true; } - /* We can end up with dereferencing constant pointers. + /* We can end up with dereferencing non-SSA name pointers. Just bail out in this case. */ - if (TREE_CODE (ptr1) == INTEGER_CST - || TREE_CODE (ptr2) == INTEGER_CST) + if (TREE_CODE (ptr1) != SSA_NAME + || TREE_CODE (ptr2) != SSA_NAME) return true; /* We may end up with two empty points-to solutions for two same pointers. @@ -781,7 +771,9 @@ refs_may_alias_p_1 (ao_ref *ref1, ao_ref *ref2, bool tbaa_p) if (TREE_CODE (base1) == SSA_NAME || TREE_CODE (base2) == SSA_NAME || is_gimple_min_invariant (base1) - || is_gimple_min_invariant (base2)) + || is_gimple_min_invariant (base2) + || TREE_CODE (base1) == CONSTRUCTOR + || TREE_CODE (base2) == CONSTRUCTOR) return false; /* Defer to simple offset based disambiguation if we have |