From 00b96b27ff06c1b9569eda75480d5e8d4cf4bfce Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 10 Jul 2020 14:10:36 -0400 Subject: [PATCH 300/315] FIXME: merge flags in binding_cluster2::can_merge_p --- gcc/analyzer/store2.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/analyzer/store2.cc b/gcc/analyzer/store2.cc index a9b6bcf24e9..14d50cdbf56 100644 --- a/gcc/analyzer/store2.cc +++ b/gcc/analyzer/store2.cc @@ -781,7 +781,14 @@ binding_cluster2::can_merge_p (const binding_cluster2 *cluster_a, { gcc_assert (out_cluster); - // FIXME: what about m_escaped? + /* Merge flags ("ESCAPED" and "TOUCHED") by setting the merged flag to + true if either of the inputs is true. */ + if ((cluster_a && cluster_a->m_escaped) + || (cluster_b && cluster_b->m_escaped)) + out_cluster->m_escaped = true; + if ((cluster_a && cluster_a->m_touched) + || (cluster_b && cluster_b->m_touched)) + out_cluster->m_touched = true; /* At least one of CLUSTER_A and CLUSTER_B are non-NULL, but either could be NULL. Handle these cases. */ -- 2.26.2