From e2575285fff751f7ab9ee97395b380ff417466f6 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 5 Jun 2020 15:16:55 -0400 Subject: [PATCH 209/315] FIXME: disable less of test_state_merging --- gcc/analyzer/region-model2.cc | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/gcc/analyzer/region-model2.cc b/gcc/analyzer/region-model2.cc index 0b961a27a96..db25ab5cdbe 100644 --- a/gcc/analyzer/region-model2.cc +++ b/gcc/analyzer/region-model2.cc @@ -9271,8 +9271,6 @@ test_state_merging () ASSERT_NE (model1, merged); } - // FIXME: uses "set_to_new_unknown_value" -#if 0 /* Verify handling of a PARM_DECL. */ { test_region_model2_context ctxt; @@ -9287,11 +9285,9 @@ test_state_merging () #endif model1.push_frame (DECL_STRUCT_FUNCTION (test_fndecl), NULL, &ctxt); - const svalue2 *sval_a - = model0.set_to_new_unknown_value (model0.get_lvalue (a, &ctxt), - integer_type_node, &ctxt); - model1.set_to_new_unknown_value (model1.get_lvalue (a, &ctxt), - integer_type_node, &ctxt); + placeholder_svalue2 test_sval (integer_type_node, "test sval"); + model0.set_value (model0.get_lvalue (a, &ctxt), &test_sval, &ctxt); + model1.set_value (model1.get_lvalue (a, &ctxt), &test_sval, &ctxt); ASSERT_EQ (model0, model1); // TODO: @@ -9304,24 +9300,20 @@ test_state_merging () region_model2 merged (&mgr); ASSERT_TRUE (model0.can_merge_with_p (model1, &merged)); ASSERT_EQ (model0, merged); - /* In particular, there should be an unknown value for "a". */ - const svalue2 *merged_a_sval = merged.get_rvalue (a, &ctxt); - ASSERT_EQ (merged_a_sval->get_kind (), svalue2::SK_UNKNOWN); + /* In particular, "a" should have the placeholder value. */ + ASSERT_EQ (merged.get_rvalue (a, &ctxt), &test_sval); } -#endif // FIXME: uses "set_to_new_unknown_value" -#if 0 /* Verify handling of a global. */ { test_region_model2_context ctxt; region_model2 model0 (&mgr); region_model2 model1 (&mgr); - const svalue2 *sval_x - = model0.set_to_new_unknown_value (model0.get_lvalue (x, &ctxt), - integer_type_node, &ctxt); - model1.set_to_new_unknown_value (model1.get_lvalue (x, &ctxt), - integer_type_node, &ctxt); + + placeholder_svalue2 test_sval (integer_type_node, "test sval"); + model0.set_value (model0.get_lvalue (x, &ctxt), &test_sval, &ctxt); + model1.set_value (model1.get_lvalue (x, &ctxt), &test_sval, &ctxt); ASSERT_EQ (model0, model1); // TODO @@ -9334,11 +9326,9 @@ test_state_merging () region_model2 merged (&mgr); ASSERT_TRUE (model0.can_merge_with_p (model1, &merged)); ASSERT_EQ (model0, merged); - /* In particular, there should be an unknown value for "x". */ - const svalue2 *merged_x_sval = merged.get_rvalue (x, &ctxt); - ASSERT_EQ (merged_x_sval->get_kind (), svalue2::SK_UNKNOWN); + /* In particular, "x" should have the placeholder value. */ + ASSERT_EQ (merged.get_rvalue (x, &ctxt), &test_sval); } -#endif /* Use global-handling to verify various combinations of values. */ -- 2.26.2