From aee63acc76771bb7bec72073ca8a5a2efff2d6fd Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 2 May 2017 11:27:15 +0000 Subject: [PATCH] re PR tree-optimization/80591 (AArch64 kernel miscompilation starting with r246809) 2017-05-02 Richard Biener PR tree-optimization/80591 Revert 2017-04-10 Richard Biener * tree-ssa-structalias.c (find_func_aliases): Properly handle asm inputs. * gcc.dg/torture/pr80591.c: New testcase. From-SVN: r247488 --- gcc/ChangeLog | 9 +++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/torture/pr80591.c | 20 ++++++++++++++++++++ gcc/tree-ssa-structalias.c | 4 ++-- 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr80591.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5cbb7e77679..e411cc310be 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2017-05-02 Richard Biener + + PR tree-optimization/80591 + Revert + 2017-04-10 Richard Biener + + * tree-ssa-structalias.c (find_func_aliases): Properly handle + asm inputs. + 2017-05-02 Richard Biener PR tree-optimization/80549 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5c4b7dfdeaf..84f2c309f4c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-05-02 Richard Biener + + PR tree-optimization/80591 + * gcc.dg/torture/pr80591.c: New testcase. + 2017-05-02 Richard Biener PR tree-optimization/80549 diff --git a/gcc/testsuite/gcc.dg/torture/pr80591.c b/gcc/testsuite/gcc.dg/torture/pr80591.c new file mode 100644 index 00000000000..5958474bdf2 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr80591.c @@ -0,0 +1,20 @@ +/* PR tree-optimization/80591 */ +/* { dg-do compile } */ +/* { dg-skip-if "" { *-*-* } "-flto" } */ +/* { dg-additional-options "-fdump-tree-optimized" } */ + +static inline __attribute__((always_inline)) int * +foo (void) +{ + __UINTPTR_TYPE__ sp; + asm ("" : "=r" (sp)); + return (int *) sp; +} + +void +bar (void) +{ + foo ()[0] += 26; +} + +/* { dg-final { scan-tree-dump "\\+ 26;" "optimized" } } */ diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index 7b1bf10e1cf..2394edf3826 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -4978,14 +4978,14 @@ find_func_aliases (struct function *fn, gimple *origt) make_escape_constraint (build_fold_addr_expr (op)); /* The asm may read global memory, so outputs may point to - any global or escaped memory. */ + any global memory. */ if (op) { auto_vec lhsc; struct constraint_expr rhsc, *lhsp; unsigned j; get_constraint_for (op, &lhsc); - rhsc.var = escaped_id; + rhsc.var = nonlocal_id; rhsc.offset = 0; rhsc.type = SCALAR; FOR_EACH_VEC_ELT (lhsc, j, lhsp) -- 2.30.2