From 4d8b2003e0fb61ace95ccc79f2432e9ba3adbc2c Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Thu, 21 May 2020 11:38:57 -0400
Subject: [PATCH 167/179] FIXME: re-enable
 add_any_constraints_from_ssa_def_stmt

---
 gcc/analyzer/region-model2.cc | 4 +---
 gcc/analyzer/region-model2.h  | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gcc/analyzer/region-model2.cc b/gcc/analyzer/region-model2.cc
index d0fcb0d0101..f5a2656c190 100644
--- a/gcc/analyzer/region-model2.cc
+++ b/gcc/analyzer/region-model2.cc
@@ -5886,9 +5886,9 @@ region_model2::add_constraint (tree lhs, enum tree_code op, tree rhs,
   /* Store the constraint.  */
   m_constraints2->add_constraint (lhs_sval, op, rhs_sval);
 
-#if 0
   add_any_constraints_from_ssa_def_stmt (lhs, op, rhs, ctxt);
 
+#if 0
   /* If we now know a symbolic_region2 is non-NULL, clear its
      m_possibly_null.  */
   if (zerop (rhs) && op == NE_EXPR)
@@ -5910,7 +5910,6 @@ region_model2::add_constraint (tree lhs, enum tree_code op, tree rhs,
   return true;
 }
 
-#if 0
 /* Subroutine of region_model2::add_constraint for handling optimized
    && and || conditionals.
 
@@ -6040,7 +6039,6 @@ region_model2::add_any_constraints_from_gcall (enum tree_code op,
       add_constraint (gimple_call_arg (call, 0), op, rhs, ctxt);
     }
 }
-#endif
 
 /* Determine what is known about the condition "LHS OP RHS" within
    this model.
diff --git a/gcc/analyzer/region-model2.h b/gcc/analyzer/region-model2.h
index 27eb83ad2cb..8d5c483dded 100644
--- a/gcc/analyzer/region-model2.h
+++ b/gcc/analyzer/region-model2.h
@@ -1999,7 +1999,7 @@ private:
 			  region_model2_context *ctxt);
   void copy_array_region2 (region2_id dst_rid, array_region2 *dst_reg,
 			  array_region2 *src_reg, region_model2_context *ctxt);
-
+#endif
   void add_any_constraints_from_ssa_def_stmt (tree lhs,
 					      enum tree_code op,
 					      tree rhs,
@@ -2007,11 +2007,12 @@ private:
   void add_any_constraints_from_gassign (enum tree_code op,
 					 tree rhs,
 					 const gassign *assign,
+					 region_model2_context *ctxt);
   void add_any_constraints_from_gcall (enum tree_code op,
 				       tree rhs,
 				       const gcall *call,
 				       region_model2_context *ctxt);
-#endif
+
   void update_for_call_superedge (const call_superedge &call_edge,
 				  region_model2_context *ctxt);
   void update_for_return_superedge (const return_superedge &return_edge,
-- 
2.21.0