diff options
| author | Richard Guenther <rguenther@suse.de> | 2010-11-22 13:18:48 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2010-11-22 13:18:48 +0000 |
| commit | e9615971330ecdb83b191135075c44a6ee01d091 (patch) | |
| tree | 9955bf63053ef899a56cecced5b989e2239a8063 /gcc/gimple-fold.c | |
| parent | 993466f3d18992422941c1a57b53cff04acffce6 (diff) | |
| download | gcc-e9615971330ecdb83b191135075c44a6ee01d091.zip gcc-e9615971330ecdb83b191135075c44a6ee01d091.tar.gz gcc-e9615971330ecdb83b191135075c44a6ee01d091.tar.bz2 | |
gimple-fold.c (maybe_fold_reference): When canonicalizing MEM_REFs, preserve volatileness.
2010-11-22 Richard Guenther <rguenther@suse.de>
* gimple-fold.c (maybe_fold_reference): When canonicalizing
MEM_REFs, preserve volatileness.
* cgraphbuild.c (mark_address): Properly check for FUNCTION_DECL
addresses.
From-SVN: r167030
Diffstat (limited to 'gcc/gimple-fold.c')
| -rw-r--r-- | gcc/gimple-fold.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index e561a63..8d0157b 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -600,15 +600,15 @@ maybe_fold_reference (tree expr, bool is_lhs) } /* Canonicalize MEM_REFs invariant address operand. */ else if (TREE_CODE (*t) == MEM_REF - && TREE_CODE (TREE_OPERAND (*t, 0)) == ADDR_EXPR - && !DECL_P (TREE_OPERAND (TREE_OPERAND (*t, 0), 0)) - && !CONSTANT_CLASS_P (TREE_OPERAND (TREE_OPERAND (*t, 0), 0))) + && !is_gimple_mem_ref_addr (TREE_OPERAND (*t, 0))) { + bool volatile_p = TREE_THIS_VOLATILE (*t); tree tem = fold_binary (MEM_REF, TREE_TYPE (*t), TREE_OPERAND (*t, 0), TREE_OPERAND (*t, 1)); if (tem) { + TREE_THIS_VOLATILE (tem) = volatile_p; *t = tem; tem = maybe_fold_reference (expr, is_lhs); if (tem) |