From: David Malcolm <dmalcolm@redhat.com>
To: Jason Merrill <jason@redhat.com>
Cc: Nathan Sidwell <nathan@acm.org>, Jakub Jelinek <jakub@redhat.com>,
Richard Biener <richard.guenther@gmail.com>,
gcc-patches List <gcc-patches@gcc.gnu.org>,
David Malcolm <dmalcolm@redhat.com>
Subject: [v3 of PATCH 08/14] cp/tree.c: strip location wrappers in lvalue_kind
Date: Thu, 21 Dec 2017 17:47:00 -0000 [thread overview]
Message-ID: <1513878659-57155-1-git-send-email-dmalcolm@redhat.com> (raw)
In-Reply-To: <CADzB+2ko+x-viTGbKjz6monGUAsnPJiWk0pnDC0ujRLbRi6kpg@mail.gmail.com>
On Wed, 2017-12-20 at 23:56 -0500, Jason Merrill wrote:
> On Wed, Dec 20, 2017 at 5:14 PM, David Malcolm <dmalcolm@redhat.com>
> wrote:
> > On Mon, 2017-12-11 at 18:39 -0500, Jason Merrill wrote:
> > > On 11/10/2017 04:45 PM, David Malcolm wrote:
> > > > Without this, then lvalue_p returns false for decls, and hence
> > > > e.g. uses of them for references fail.
> > > >
> > > > Stripping location wrappers in lvalue_kind restores the correct
> > > > behavior of lvalue_p etc.
> > > >
> > > > gcc/cp/ChangeLog:
> > > > * tree.c (lvalue_kind): Strip any location wrapper.
> > >
> > > Rather, lvalue_kind should learn to handle VIEW_CONVERT_EXPR.
> > This patch does so, using:
> >
> > case NON_LVALUE_EXPR:
> > case VIEW_CONVERT_EXPR:
> > if (location_wrapper_p (ref))
> > return lvalue_kind (TREE_OPERAND (ref, 0));
> >
> > As well as the VIEW_CONVERT_EXPR, lvalue_kind needs to handle
> > NON_LVALUE_EXPR, otherwise a location-wrapped string literal
> > hits this clause in the "default" case:
> >
> > if (CLASS_TYPE_P (TREE_TYPE (ref))
> > || TREE_CODE (TREE_TYPE (ref)) == ARRAY_TYPE)
> > return clk_class;
> >
> > when it should have hit this one (after removing the
> > location wrapper):
> >
> > case STRING_CST:
> > case COMPOUND_LITERAL_EXPR:
> > return clk_ordinary;
>
> Ah, the issue is that string literals should use VIEW_CONVERT_EXPR
> rather than NON_LVALUE_EXPR, since they are lvalues. With that
> change, we shouldn't need to handle NON_LVALUE_EXPR specifically.
>
> Jason
Thanks. Here's an updated version of the patch which tweaks
maybe_wrap_with_location (from patch 02/14 [1]) for STRING_CST to do so,
also adding some more test coverage to selftest::test_location_wrappers
for the STRING_CST case. With that, it only adds the VIEW_CONVERT_EXPR
case to lvalue_kind.
Successfully bootstrapped®rtested on x86_64-pc-linux-gnu, as
part of the kit.
Manually tested with "make s-selftest-c++" (since we don't run
the selftests for cc1plus by default).
OK for trunk once the rest of the kit is approved?
[1] https://gcc.gnu.org/ml/gcc-patches/2017-11/msg02611.html
gcc/cp/ChangeLog:
* cp-lang.c (selftest::run_cp_tests): Call
selftest::cp_tree_c_tests.
* cp-tree.h (selftest::run_cp_tests): Move decl to bottom of file.
(selftest::cp_tree_c_tests): New decl.
* tree.c: Include "selftest.h".
(lvalue_kind): Handle VIEW_CONVERT_EXPR location wrapper nodes.
(selftest::test_lvalue_kind): New function.
(selftest::cp_tree_c_tests): New function.
gcc/ChangeLog:
* tree.c (maybe_wrap_with_location): Use VIEW_CONVERT_EXPR for
STRING_CST.
(selftest::test_location_wrappers): Add coverage for STRING_CST.
* tree.h (location_wrapper_p): Update comment to reflect change to
STRING_CST.
---
gcc/cp/cp-lang.c | 1 +
gcc/cp/cp-tree.h | 16 ++++++++------
gcc/cp/tree.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
gcc/tree.c | 19 +++++++++++++---
gcc/tree.h | 4 ++--
5 files changed, 95 insertions(+), 11 deletions(-)
diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c
index 805319a..9bb4ce7 100644
--- a/gcc/cp/cp-lang.c
+++ b/gcc/cp/cp-lang.c
@@ -247,6 +247,7 @@ run_cp_tests (void)
c_family_tests ();
/* Additional C++-specific tests. */
+ cp_tree_c_tests ();
}
} // namespace selftest
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 9879e16..bb405f2 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -7415,12 +7415,6 @@ extern tree cp_ubsan_maybe_instrument_downcast (location_t, tree, tree, tree);
extern tree cp_ubsan_maybe_instrument_cast_to_vbase (location_t, tree, tree);
extern void cp_ubsan_maybe_initialize_vtbl_ptrs (tree);
-#if CHECKING_P
-namespace selftest {
- extern void run_cp_tests (void);
-} // namespace selftest
-#endif /* #if CHECKING_P */
-
/* Inline bodies. */
inline tree
@@ -7451,6 +7445,16 @@ named_decl_hash::equal (const value_type existing, compare_type candidate)
return candidate == name;
}
+#if CHECKING_P
+namespace selftest {
+ extern void run_cp_tests (void);
+
+ /* Declarations for specific families of tests within cp,
+ by source file, in alphabetical order. */
+ extern void cp_tree_c_tests (void);
+} // namespace selftest
+#endif /* #if CHECKING_P */
+
/* -- end of C++ */
#endif /* ! GCC_CP_TREE_H */
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 0ae2eff..6900bc7 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -35,6 +35,7 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "attribs.h"
#include "flags.h"
+#include "selftest.h"
static tree bot_manip (tree *, int *, void *);
static tree bot_replace (tree *, int *, void *);
@@ -240,6 +241,11 @@ lvalue_kind (const_tree ref)
case NON_DEPENDENT_EXPR:
return lvalue_kind (TREE_OPERAND (ref, 0));
+ case VIEW_CONVERT_EXPR:
+ if (location_wrapper_p (ref))
+ return lvalue_kind (TREE_OPERAND (ref, 0));
+ /* Fallthrough. */
+
default:
if (!TREE_TYPE (ref))
return clk_none;
@@ -5339,4 +5345,64 @@ lang_check_failed (const char* file, int line, const char* function)
}
#endif /* ENABLE_TREE_CHECKING */
+#if CHECKING_P
+
+namespace selftest {
+
+/* Verify that lvalue_kind () works, for various expressions,
+ and that location wrappers don't affect the results. */
+
+static void
+test_lvalue_kind ()
+{
+ location_t loc = BUILTINS_LOCATION;
+
+ /* 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));
+
+ 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));
+
+ tree string_lit = build_string (4, "foo");
+ TREE_TYPE (string_lit) = char_array_type_node;
+ string_lit = fix_string_type (string_lit);
+ ASSERT_EQ (clk_ordinary, lvalue_kind (string_lit));
+
+ tree wrapped_string_lit = maybe_wrap_with_location (string_lit, loc);
+ ASSERT_TRUE (location_wrapper_p (wrapped_string_lit));
+ ASSERT_EQ (clk_ordinary, lvalue_kind (wrapped_string_lit));
+
+ tree parm = build_decl (UNKNOWN_LOCATION, PARM_DECL,
+ get_identifier ("some_parm"),
+ integer_type_node);
+ ASSERT_EQ (clk_ordinary, lvalue_kind (parm));
+
+ tree wrapped_parm = maybe_wrap_with_location (parm, loc);
+ ASSERT_TRUE (location_wrapper_p (wrapped_parm));
+ ASSERT_EQ (clk_ordinary, lvalue_kind (parm));
+
+ /* Verify that lvalue_kind of std::move on a parm isn't
+ affected by location wrappers. */
+ tree rvalue_ref_of_parm = move (parm);
+ ASSERT_EQ (clk_rvalueref, lvalue_kind (rvalue_ref_of_parm));
+ tree rvalue_ref_of_wrapped_parm = move (wrapped_parm);
+ ASSERT_EQ (clk_rvalueref, lvalue_kind (rvalue_ref_of_wrapped_parm));
+}
+
+/* Run all of the selftests within this file. */
+
+void
+cp_tree_c_tests ()
+{
+ test_lvalue_kind ();
+}
+
+} // namespace selftest
+
+#endif /* #if CHECKING_P */
+
+
#include "gt-cp-tree.h"
diff --git a/gcc/tree.c b/gcc/tree.c
index b72f963..517f4a4 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -13811,8 +13811,8 @@ set_source_range (tree expr, source_range src_range)
/* Return EXPR, potentially wrapped with a node expression LOC,
if !CAN_HAVE_LOCATION_P (expr).
- NON_LVALUE_EXPR is used for wrapping constants.
- VIEW_CONVERT_EXPR is used for wrapping non-constants.
+ NON_LVALUE_EXPR is used for wrapping constants, apart from STRING_CST.
+ VIEW_CONVERT_EXPR is used for wrapping non-constants and STRING_CST.
Wrapper nodes can be identified using location_wrapper_p. */
@@ -13834,7 +13834,7 @@ maybe_wrap_with_location (tree expr, location_t loc)
if (EXCEPTIONAL_CLASS_P (expr))
return expr;
- if (CONSTANT_CLASS_P (expr))
+ if (CONSTANT_CLASS_P (expr) && TREE_CODE (expr) != STRING_CST)
return build1_loc (loc, NON_LVALUE_EXPR, TREE_TYPE (expr), expr);
else
return build1_loc (loc, VIEW_CONVERT_EXPR, TREE_TYPE (expr), expr);
@@ -14238,6 +14238,18 @@ test_location_wrappers ()
ASSERT_EQ (loc, EXPR_LOCATION (wrapped_int_cst));
ASSERT_EQ (int_cst, tree_strip_any_location_wrapper (wrapped_int_cst));
+ /* Wrapping a STRING_CST. */
+ tree string_cst = build_string (4, "foo");
+ ASSERT_FALSE (CAN_HAVE_LOCATION_P (string_cst));
+ ASSERT_FALSE (location_wrapper_p (string_cst));
+
+ tree wrapped_string_cst = maybe_wrap_with_location (string_cst, loc);
+ ASSERT_TRUE (location_wrapper_p (wrapped_string_cst));
+ ASSERT_EQ (VIEW_CONVERT_EXPR, TREE_CODE (wrapped_string_cst));
+ ASSERT_EQ (loc, EXPR_LOCATION (wrapped_string_cst));
+ ASSERT_EQ (string_cst, tree_strip_any_location_wrapper (wrapped_string_cst));
+
+
/* Wrapping a variable. */
tree int_var = build_decl (UNKNOWN_LOCATION, VAR_DECL,
get_identifier ("some_int_var"),
@@ -14258,6 +14270,7 @@ test_location_wrappers ()
/* Verify that STRIP_NOPS removes wrappers. */
check_strip_nops (wrapped_int_cst, int_cst);
+ check_strip_nops (wrapped_string_cst, string_cst);
check_strip_nops (wrapped_int_var, int_var);
/* operand_equal_p should "see through" any location wrapper... */
diff --git a/gcc/tree.h b/gcc/tree.h
index de085ca..7f4ea5e 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -3679,8 +3679,8 @@ location_wrapper_p (const_tree exp)
/* A wrapper node has code NON_LVALUE_EXPR or VIEW_CONVERT_EXPR, and the
same type as its operand.
- NON_LVALUE_EXPR is used for wrapping constants.
- VIEW_CONVERT_EXPR is used for wrapping non-constants.
+ NON_LVALUE_EXPR is used for wrapping constants, apart from STRING_CST.
+ VIEW_CONVERT_EXPR is used for wrapping non-constants and STRING_CST.
A subtlety is that we may have to test whether we have the correct
TREE_CODE for the wrapped TREE_CODE. Otherwise, e.g. the C++ expression:
--
1.8.5.3
next prev parent reply other threads:[~2017-12-21 17:47 UTC|newest]
Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-20 22:38 [PATCH] RFC: Preserving locations for variable-uses and constants (PR 43486) David Malcolm
2017-10-24 14:05 ` Jason Merrill
2017-10-31 21:28 ` David Malcolm
2017-11-02 14:46 ` Jason Merrill
2017-11-10 21:43 ` [PATCH v2: 00/14] " David Malcolm
2017-11-10 21:43 ` [PATCH 03/14] C++: add location_t wrapper nodes during parsing (minimal impl) David Malcolm
2017-12-12 2:10 ` Jason Merrill
2017-12-14 19:25 ` David Malcolm
2017-12-15 15:02 ` Jason Merrill
2017-12-15 16:35 ` David Malcolm
2017-12-15 18:59 ` Jason Merrill
2017-12-15 22:49 ` David Malcolm
2017-12-29 17:03 ` [v2 of PATCH " David Malcolm
2018-01-05 20:29 ` Jason Merrill
2018-01-05 22:20 ` David Malcolm
2018-01-08 17:10 ` Location wrappers vs decls that change type (was Re: [v2 of PATCH 03/14] C++: add location_t wrapper nodes during parsing (minimal impl)) David Malcolm
2018-01-08 17:14 ` Nathan Sidwell
2018-01-08 17:18 ` Jakub Jelinek
2018-01-08 17:28 ` Nathan Sidwell
2018-01-08 18:08 ` David Malcolm
2018-01-08 18:23 ` Jakub Jelinek
2018-01-09 11:34 ` [PATCH v2.4 of 02/14] Support for adding and stripping location_t wrapper nodes David Malcolm
2018-01-09 14:59 ` Jason Merrill
2018-01-08 21:48 ` [v2 of PATCH 03/14] C++: add location_t wrapper nodes during parsing (minimal impl) Jason Merrill
2018-01-08 21:03 ` David Malcolm
2018-01-08 21:59 ` Jason Merrill
2018-01-08 22:27 ` Jason Merrill
2018-01-09 12:03 ` [PATCH v3 of " David Malcolm
2018-01-09 14:39 ` Jason Merrill
2018-01-09 14:39 ` Jakub Jelinek
2018-01-09 18:32 ` [PATCH v4 " David Malcolm
2018-01-09 19:45 ` Jason Merrill
2017-11-10 21:43 ` [PATCH 05/14] tree.c: strip location wrappers from integer_zerop etc David Malcolm
2017-12-11 23:36 ` Jason Merrill
2017-12-16 13:09 ` [PATCH] C++: handle locations wrappers when calling warn_for_memset David Malcolm
2017-12-16 20:01 ` Martin Sebor
2017-12-19 20:02 ` Jason Merrill
2017-12-20 19:23 ` [v3 of 05/14] " David Malcolm
2017-12-21 4:58 ` Jason Merrill
2017-11-10 21:43 ` [PATCH 01/14] C++: preserve locations within build_address David Malcolm
2017-12-11 23:25 ` Jason Merrill
2017-11-10 21:43 ` [PATCH 06/14] Fix Wsizeof-pointer-memaccess*.c David Malcolm
2017-12-11 23:37 ` Jason Merrill
2017-12-18 2:04 ` [v2 of PATCH 06/14] Strip location wrappers in operand_equal_p David Malcolm
2017-12-18 8:00 ` Jakub Jelinek
2017-12-19 20:13 ` Jason Merrill
2017-12-19 20:49 ` Jakub Jelinek
2017-12-19 21:59 ` Jason Merrill
2017-12-19 22:03 ` Jakub Jelinek
2017-12-20 0:41 ` [PATCH] Eliminate location wrappers in tree_nop_conversion/STRIP_NOPS David Malcolm
2017-12-20 4:27 ` Jeff Law
2017-11-10 21:43 ` [PATCH 07/14] reject_gcc_builtin: strip any location wrappers David Malcolm
2017-12-11 23:38 ` Jason Merrill
2017-11-10 21:43 ` [PATCH 02/14] Support for adding and stripping location_t wrapper nodes David Malcolm
2017-11-15 6:31 ` Trevor Saunders
2017-11-15 11:23 ` Richard Biener
2017-11-15 15:40 ` David Malcolm
2017-11-16 10:04 ` Richard Biener
2017-11-30 17:25 ` [PATCH v2.1] " David Malcolm
2017-11-30 17:46 ` Jason Merrill
2017-11-30 18:38 ` [PATCH, v2.2] " David Malcolm
2017-11-30 20:30 ` Jason Merrill
2017-11-10 21:44 ` [PATCH 14/14] pp_c_cast_expression: don't print casts for location wrappers David Malcolm
2017-12-11 23:46 ` Jason Merrill
2017-11-10 21:44 ` [PATCH 10/14] warn_for_memset: handle " David Malcolm
2017-12-11 23:41 ` Jason Merrill
2017-11-10 21:44 ` [PATCH 04/14] Update testsuite to show improvements David Malcolm
2017-11-10 21:44 ` [PATCH 11/14] Handle location wrappers in string_conv_p David Malcolm
2017-12-11 23:42 ` Jason Merrill
2017-11-10 21:44 ` [PATCH 08/14] cp/tree.c: strip location wrappers in lvalue_kind David Malcolm
2017-12-11 23:39 ` Jason Merrill
2017-12-20 22:11 ` [v2 of PATCH " David Malcolm
2017-12-21 4:56 ` Jason Merrill
2017-12-21 17:47 ` David Malcolm [this message]
2017-12-21 22:44 ` [v3 " Jason Merrill
2017-11-10 21:44 ` [PATCH 13/14] c-format.c: handle location wrappers David Malcolm
2017-12-11 23:45 ` Jason Merrill
2017-12-17 16:26 ` [v2 of PATCH " David Malcolm
2017-12-19 19:55 ` Jason Merrill
2017-12-20 17:33 ` David Malcolm
2017-12-21 5:03 ` Jason Merrill
2017-12-22 19:07 ` [v3 " David Malcolm
2018-01-05 17:35 ` PING " David Malcolm
2018-01-05 17:48 ` Joseph Myers
2018-01-05 20:21 ` Jason Merrill
2017-11-10 21:44 ` [PATCH 09/14] Strip location wrappers in null_ptr_cst_p David Malcolm
2017-12-11 23:39 ` Jason Merrill
2017-11-10 22:11 ` [PATCH 12/14] C++: introduce null_node_p David Malcolm
2017-12-11 23:42 ` Jason Merrill
2017-11-13 19:20 ` [PATCH v2: 00/14] Preserving locations for variable-uses and constants (PR 43486) David Malcolm
2017-11-18 2:50 ` [RFC v3 00/11] C++: locations for (almost) everything " David Malcolm
2017-11-18 2:50 ` [PATCH 06/11] gcc: Handle location wrappers in operand_equal_p David Malcolm
2017-11-18 2:50 ` [PATCH 03/11] Implement STRIP_ANY_LOCATION_WRAPPER_SAFE David Malcolm
2017-11-18 2:50 ` [PATCH 02/11] cp_tree::maybe_add_location_wrapper: no-op for template decls David Malcolm
2017-11-18 2:50 ` [PATCH 01/11] C++: Add location wrappers for all constants and decls David Malcolm
2017-11-18 2:51 ` [PATCH 05/11] C++: finish_call_expr: strip location wrapper David Malcolm
2017-11-18 2:51 ` [PATCH 08/11] C++: handle location wrappers David Malcolm
2017-11-18 2:51 ` [PATCH 09/11] objc: handle location wrappers in objc_maybe_build_component_ref David Malcolm
2017-11-18 2:51 ` [PATCH 04/11] C++: add cp_expr::strip_any_location_wrapper method David Malcolm
2017-11-18 2:51 ` [PATCH 07/11] c-family: handle location wrappers David Malcolm
2017-11-18 3:23 ` [PATCH 11/11] config: handle location wrappers in various attributes (untested) David Malcolm
2017-11-18 3:54 ` [PATCH 10/11] i386: handle location wrappers in ix86_handle_cconv_attribute David Malcolm
2017-11-30 20:54 ` [PATCH v2: 00/14] Preserving locations for variable-uses and constants (PR 43486) David Malcolm
2017-12-11 16:08 ` [PING ^ 2] " David Malcolm
2017-12-17 1:10 ` [PATCH 15/14] Use fold_for_warn in get_atomic_generic_size David Malcolm
2017-12-19 20:35 ` Jason Merrill
2017-12-20 0:50 ` [v2 of PATCH " David Malcolm
2017-12-20 4:22 ` Jason Merrill
2017-12-20 19:33 ` [v3 " David Malcolm
2017-12-21 4:57 ` Jason Merrill
2018-01-10 19:51 ` [committed] Preserving locations for variable-uses and constants (PR c++/43486) David Malcolm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1513878659-57155-1-git-send-email-dmalcolm@redhat.com \
--to=dmalcolm@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
--cc=jason@redhat.com \
--cc=nathan@acm.org \
--cc=richard.guenther@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).