aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2018-11-22 10:26:29 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2018-11-22 10:26:29 +0100
commit3bcd988251e21dbc5bc6617b1c67aad6cf24a465 (patch)
tree20b684332a75aafb0ef85201fcf449b25f7aaa2f
parent577fe16a1aa9f4c7e5634a59830d663c93779c5c (diff)
downloadgcc-3bcd988251e21dbc5bc6617b1c67aad6cf24a465.zip
gcc-3bcd988251e21dbc5bc6617b1c67aad6cf24a465.tar.gz
gcc-3bcd988251e21dbc5bc6617b1c67aad6cf24a465.tar.bz2
re PR c++/87386 (Error message for static_assert show wrong range)
PR c++/87386 * parser.c (cp_parser_operator): Use str.get_value () instead of just str in USERDEF_LITERAL_VALUE and USERDEF_LITERAL_SUFFIX_ID arguments. From-SVN: r266369
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/parser.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ad061f2..e870205 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-11-22 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/87386
+ * parser.c (cp_parser_operator): Use str.get_value () instead of just
+ str in USERDEF_LITERAL_VALUE and USERDEF_LITERAL_SUFFIX_ID arguments.
+
2018-11-21 Jakub Jelinek <jakub@redhat.com>
PR c++/88122
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index e3569b2..3a98ed9 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -15306,8 +15306,8 @@ cp_parser_operator (cp_parser* parser, location_t start_loc)
return error_mark_node;
else if (TREE_CODE (str) == USERDEF_LITERAL)
{
- string_tree = USERDEF_LITERAL_VALUE (str);
- id = USERDEF_LITERAL_SUFFIX_ID (str);
+ string_tree = USERDEF_LITERAL_VALUE (str.get_value ());
+ id = USERDEF_LITERAL_SUFFIX_ID (str.get_value ());
end_loc = str.get_location ();
}
else