From 6a05a982d3043894e1880195ff5723d68e25e9e7 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 22 Dec 2017 11:14:06 -0500 Subject: [PATCH 17/25] FIXME: fixups for "{v3 of [08/14], approved} cp/tree.c: strip location wrappers in lvalue_kind" --- gcc/cp/tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 6900bc7..7477693 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -5360,11 +5360,11 @@ test_lvalue_kind () /* Verify constants and parameters, without and with location wrappers. */ tree int_cst = build_int_cst (integer_type_node, 42); - ASSERT_EQ (clk_none, lvalue_kind (integer_zero_node)); + ASSERT_EQ (clk_none, lvalue_kind (int_cst)); tree wrapped_int_cst = maybe_wrap_with_location (int_cst, loc); ASSERT_TRUE (location_wrapper_p (wrapped_int_cst)); - ASSERT_EQ (clk_none, lvalue_kind (integer_zero_node)); + ASSERT_EQ (clk_none, lvalue_kind (wrapped_int_cst)); tree string_lit = build_string (4, "foo"); TREE_TYPE (string_lit) = char_array_type_node; @@ -5382,7 +5382,7 @@ test_lvalue_kind () tree wrapped_parm = maybe_wrap_with_location (parm, loc); ASSERT_TRUE (location_wrapper_p (wrapped_parm)); - ASSERT_EQ (clk_ordinary, lvalue_kind (parm)); + ASSERT_EQ (clk_ordinary, lvalue_kind (wrapped_parm)); /* Verify that lvalue_kind of std::move on a parm isn't affected by location wrappers. */ -- 1.8.5.3