diff options
author | Jing Yu <jingyu@google.com> | 2012-02-15 15:40:16 -0800 |
---|---|---|
committer | Jing Yu <jingyu@google.com> | 2012-02-15 15:40:16 -0800 |
commit | 3f73d6ef90458b45bbbb33ef4c2b174d4662a22d (patch) | |
tree | 1b5f0d96c51b51168b3713058a1b62e92f1136eb /gcc-4.6/gcc/tree-inline.c | |
parent | d7030123e04baab5dbff9c9ee04c0de99bd9a774 (diff) | |
download | toolchain_gcc-3f73d6ef90458b45bbbb33ef4c2b174d4662a22d.tar.gz toolchain_gcc-3f73d6ef90458b45bbbb33ef4c2b174d4662a22d.tar.bz2 toolchain_gcc-3f73d6ef90458b45bbbb33ef4c2b174d4662a22d.zip |
Sync down FSF r184235@google/gcc-4_6_2-mobile branch
1) Get mostly new patches from FSF gcc-4.6 branch
2) Fix PR52129
3) Insert GNU-stack note for all ARM targets
Change-Id: I2b9926981210e517e4021242908074319a91d6bd
Diffstat (limited to 'gcc-4.6/gcc/tree-inline.c')
-rw-r--r-- | gcc-4.6/gcc/tree-inline.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc-4.6/gcc/tree-inline.c b/gcc-4.6/gcc/tree-inline.c index 94cb9fcfe..45c32bf17 100644 --- a/gcc-4.6/gcc/tree-inline.c +++ b/gcc-4.6/gcc/tree-inline.c @@ -848,14 +848,16 @@ remap_gimple_op_r (tree *tp, int *walk_subtrees, void *data) build_int_cst (TREE_TYPE (TREE_OPERAND (*tp, 1)), 0)); *tp = tem; + TREE_THIS_VOLATILE (*tem_basep) = TREE_THIS_VOLATILE (old); + TREE_THIS_NOTRAP (*tem_basep) = TREE_THIS_NOTRAP (old); } else { *tp = fold_build2 (MEM_REF, type, ptr, TREE_OPERAND (*tp, 1)); - TREE_THIS_VOLATILE (*tp) = TREE_THIS_VOLATILE (old); TREE_THIS_NOTRAP (*tp) = TREE_THIS_NOTRAP (old); } + TREE_THIS_VOLATILE (*tp) = TREE_THIS_VOLATILE (old); TREE_NO_WARNING (*tp) = TREE_NO_WARNING (old); *walk_subtrees = 0; return NULL; |