diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/g++.dg/torture/pr104601.C | 32 | ||||
| -rw-r--r-- | gcc/tree-ssa-sccvn.cc | 26 |
2 files changed, 51 insertions, 7 deletions
diff --git a/gcc/testsuite/g++.dg/torture/pr104601.C b/gcc/testsuite/g++.dg/torture/pr104601.C new file mode 100644 index 0000000..bb56479 --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr104601.C @@ -0,0 +1,32 @@ +// PR tree-optimization/104601 +// { dg-do run } +// { dg-options "-std=c++17" } + +#include <algorithm> +#include <optional> + +inline std::optional<int> +foo (std::vector<int>::iterator b, std::vector<int>::iterator c, + std::optional<int> h (int)) +{ + std::optional<int> d; + find_if (b, c, [&](auto e) { d = h(e); return d; }); + return d; +} + +std::optional<int> +bar (int) +{ + return 1; +} + +int +main () +{ + std::vector<int> g(10); + auto b = g.begin (); + auto c = g.end (); + auto e = foo (b, c, bar); + if (!e) + __builtin_abort (); +} diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc index eb17549..1701861 100644 --- a/gcc/tree-ssa-sccvn.cc +++ b/gcc/tree-ssa-sccvn.cc @@ -5218,12 +5218,20 @@ visit_reference_op_call (tree lhs, gcall *stmt) if (vnresult) { - if (vnresult->result_vdef && vdef) - changed |= set_ssa_val_to (vdef, vnresult->result_vdef); - else if (vdef) - /* If the call was discovered to be pure or const reflect - that as far as possible. */ - changed |= set_ssa_val_to (vdef, vuse_ssa_val (gimple_vuse (stmt))); + if (vdef) + { + if (vnresult->result_vdef) + changed |= set_ssa_val_to (vdef, vnresult->result_vdef); + else if (!lhs && gimple_call_lhs (stmt)) + /* If stmt has non-SSA_NAME lhs, value number the vdef to itself, + as the call still acts as a lhs store. */ + changed |= set_ssa_val_to (vdef, vdef); + else + /* If the call was discovered to be pure or const reflect + that as far as possible. */ + changed |= set_ssa_val_to (vdef, + vuse_ssa_val (gimple_vuse (stmt))); + } if (!vnresult->result && lhs) vnresult->result = lhs; @@ -5248,7 +5256,11 @@ visit_reference_op_call (tree lhs, gcall *stmt) if (TREE_CODE (fn) == ADDR_EXPR && TREE_CODE (TREE_OPERAND (fn, 0)) == FUNCTION_DECL && (flags_from_decl_or_type (TREE_OPERAND (fn, 0)) - & (ECF_CONST | ECF_PURE))) + & (ECF_CONST | ECF_PURE)) + /* If stmt has non-SSA_NAME lhs, value number the + vdef to itself, as the call still acts as a lhs + store. */ + && (lhs || gimple_call_lhs (stmt) == NULL_TREE)) vdef_val = vuse_ssa_val (gimple_vuse (stmt)); } changed |= set_ssa_val_to (vdef, vdef_val); |