From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D7DB63947C2D for ; Tue, 15 Nov 2022 23:58:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D7DB63947C2D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668556724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lkuZkLM01/CWV3fRD8Trd6RAdDl0oPRfr9ObLhsNZn4=; b=WKZgurxfEtmmJNguIEx7a5DckGuPAvgAdt+HW5y6mxlkm9uq2qsztWXjp3epX8+PlXxGu8 j2WusvtWUSyhSASHqxct2J09nFEmGlWWtCDgwuO6QADcRHz34/Y/zuH21/Fuc5sIzeqbsf CHWd4RqpzFRutpSsieGueHAge1Dq1vg= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-648-4wXGSucYOTW_op80swHm6g-1; Tue, 15 Nov 2022 18:58:43 -0500 X-MC-Unique: 4wXGSucYOTW_op80swHm6g-1 Received: by mail-qv1-f69.google.com with SMTP id mb6-20020a056214550600b004bc0f14f7b2so11818387qvb.2 for ; Tue, 15 Nov 2022 15:58:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lkuZkLM01/CWV3fRD8Trd6RAdDl0oPRfr9ObLhsNZn4=; b=70L3TYIISZXjhDZ+cZVsZ99ylY0aZynG+1/prs8Kc4o90LajpsUFCyqk1yKOWm6uo6 fjWPPRMjYNwqgKf2LxAPvRoDhn/zbHAitvUnOAw/dy+9jzJu33NvABZwnRrJMyJXWr3x 2fgflV4XcX5UA2r4daljCKclKoJo8289uopK5BoynaFN4CZZqp8RmFRZfkCcsdoXgw6A zBYISz7ZdmQ10Fi1i5AqEFgS2ms5s2RZBrh9IP/6a0nc1ZrhC+0sCLhXRbZkUCutiTtE 8tidcDep5mcYnOJgWjDlbbCe8Tx/mycifC6UtA2Ns8pBw0Wbh4+tWMIfXuiDGQo8fXYY F5aw== X-Gm-Message-State: ANoB5pnRpUnUdqU7Vn2tRvR+ERUdIyLJOoZLuaj+yEB52HS6Sz2oV8ET r3MMvJauNmPPshn/PtEYD24taX3jEhtPx8hZxwzcw0uGyChgUTn3afXHeFrVrOKktOW3LkdEJ8M U12YFZkw83yvWlbS42A== X-Received: by 2002:a0c:c20a:0:b0:496:6092:9f0f with SMTP id l10-20020a0cc20a000000b0049660929f0fmr19087932qvh.32.1668556722661; Tue, 15 Nov 2022 15:58:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf7riXLyK7oznmyAEH3zEC+mrqsu29AUOS7/aHMOmEUkc7fw46mWYEzIcyz5R+Fq63KXHnaLmg== X-Received: by 2002:a0c:c20a:0:b0:496:6092:9f0f with SMTP id l10-20020a0cc20a000000b0049660929f0fmr19087914qvh.32.1668556722285; Tue, 15 Nov 2022 15:58:42 -0800 (PST) Received: from [192.168.1.101] (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id bn4-20020a05620a2ac400b006f1187ca494sm8927748qkb.28.2022.11.15.15.58.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Nov 2022 15:58:41 -0800 (PST) Message-ID: Date: Tue, 15 Nov 2022 18:58:39 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH] c++: Reject UDLs in certain contexts [PR105300] To: Marek Polacek , GCC Patches References: <20221112165331.349041-1-polacek@redhat.com> From: Jason Merrill In-Reply-To: <20221112165331.349041-1-polacek@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 11/12/22 06:53, Marek Polacek wrote: > In this PR, we are crashing because we've encountered a UDL where a > string-literal is expected. This patch makes the parser reject string > and character UDLs in all places where the grammar requires a > string-literal and not a user-defined-string-literal. > > Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? Since the grammar has user-defined-string-literal : string-literal ud-suffix maybe we want to move the UDL handling out to a cp_parser_udl_string_literal that calls cp_parser_string_literal? > PR c++/105300 > > gcc/c-family/ChangeLog: > > * c-pragma.cc (handle_pragma_message): Warn for CPP_STRING_USERDEF. > > gcc/cp/ChangeLog: > > * parser.cc (cp_parser_string_literal): Add a bool parameter. > Give an error when UDLs are not permitted. > (cp_parser_primary_expression): Adjust the call to > cp_parser_string_literal. > (cp_parser_linkage_specification): Likewise. > (cp_parser_static_assert): Likewise. > (cp_parser_operator): Likewise. > (cp_parser_asm_definition): Likewise. > (cp_parser_asm_specification_opt): Likewise. > (cp_parser_asm_operand_list): Likewise. > (cp_parser_asm_clobber_list): Likewise. > (cp_parser_omp_context_selector): Likewise. > (pragma_lex): Likewise. > > gcc/testsuite/ChangeLog: > > * g++.dg/cpp0x/udlit-error1.C: New test. > --- > gcc/c-family/c-pragma.cc | 3 + > gcc/cp/parser.cc | 69 ++++++++++++++--------- > gcc/testsuite/g++.dg/cpp0x/udlit-error1.C | 21 +++++++ > 3 files changed, 65 insertions(+), 28 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/cpp0x/udlit-error1.C > > diff --git a/gcc/c-family/c-pragma.cc b/gcc/c-family/c-pragma.cc > index 142a46441ac..49f405b605b 100644 > --- a/gcc/c-family/c-pragma.cc > +++ b/gcc/c-family/c-pragma.cc > @@ -1390,6 +1390,9 @@ handle_pragma_message (cpp_reader *) > } > else if (token == CPP_STRING) > message = x; > + else if (token == CPP_STRING_USERDEF) > + GCC_BAD ("string literal with user-defined suffix is invalid in this " > + "context"); > else > GCC_BAD ("expected a string after %<#pragma message%>"); > > diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc > index e4021835ed5..ae2798e2a33 100644 > --- a/gcc/cp/parser.cc > +++ b/gcc/cp/parser.cc > @@ -2226,7 +2226,7 @@ pop_unparsed_function_queues (cp_parser *parser) > static cp_expr cp_parser_identifier > (cp_parser *); > static cp_expr cp_parser_string_literal > - (cp_parser *, bool, bool, bool); > + (cp_parser *, bool, bool, bool, bool); > static cp_expr cp_parser_userdef_char_literal > (cp_parser *); > static tree cp_parser_userdef_string_literal > @@ -4402,7 +4402,8 @@ cp_parser_identifier (cp_parser* parser) > TREE_STRING representing the combined, nul-terminated string > constant. If TRANSLATE is true, translate the string to the > execution character set. If WIDE_OK is true, a wide string is > - invalid here. > + valid here. If UDL_OK is true, a string literal with user-defined > + suffix can be used in this context. > > C++98 [lex.string] says that if a narrow string literal token is > adjacent to a wide string literal token, the behavior is undefined. > @@ -4414,7 +4415,7 @@ cp_parser_identifier (cp_parser* parser) > FUTURE: ObjC++ will need to handle @-strings here. */ > static cp_expr > cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok, > - bool lookup_udlit = true) > + bool udl_ok, bool lookup_udlit = true) > { > tree value; > size_t count; > @@ -4439,6 +4440,12 @@ cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok, > > if (cpp_userdef_string_p (tok->type)) > { > + if (!udl_ok) > + { > + error_at (loc, "string literal with user-defined suffix " > + "is invalid in this context"); > + return error_mark_node; > + } > string_tree = USERDEF_LITERAL_VALUE (tok->u.value); > curr_type = cpp_userdef_string_remove_type (tok->type); > curr_tok_is_userdef_p = true; > @@ -5655,7 +5662,7 @@ cp_parser_primary_expression (cp_parser *parser, > argument to cp_parser_string_literal. */ > return (cp_parser_string_literal (parser, > parser->translate_strings_p, > - true) > + /*wide_ok=*/true, /*udl_ok=*/true) > .maybe_add_location_wrapper ()); > > case CPP_OPEN_PAREN: > @@ -16161,15 +16168,14 @@ cp_parser_function_specifier_opt (cp_parser* parser, > static void > cp_parser_linkage_specification (cp_parser* parser, tree prefix_attr) > { > - tree linkage; > - > /* Look for the `extern' keyword. */ > cp_token *extern_token > = cp_parser_require_keyword (parser, RID_EXTERN, RT_EXTERN); > > /* Look for the string-literal. */ > cp_token *string_token = cp_lexer_peek_token (parser->lexer); > - linkage = cp_parser_string_literal (parser, false, false); > + tree linkage = cp_parser_string_literal (parser, /*translate=*/false, > + /*wide_ok=*/false, /*udl_ok=*/false); > > /* Transform the literal into an identifier. If the literal is a > wide-character string, or contains embedded NULs, then we can't > @@ -16300,8 +16306,8 @@ cp_parser_static_assert(cp_parser *parser, bool member_p) > > /* Parse the string-literal message. */ > message = cp_parser_string_literal (parser, > - /*translate=*/false, > - /*wide_ok=*/true); > + /*translate=*/false, /*wide_ok=*/true, > + /*udl_ok=*/false); > > /* A `)' completes the static assertion. */ > if (!parens.require_close (parser)) > @@ -17349,7 +17355,6 @@ cp_parser_operator (cp_parser* parser, location_t start_loc) > case CPP_STRING16_USERDEF: > case CPP_STRING32_USERDEF: > { > - cp_expr str; > tree string_tree; > int sz, len; > > @@ -17357,8 +17362,10 @@ cp_parser_operator (cp_parser* parser, location_t start_loc) > maybe_warn_cpp0x (CPP0X_USER_DEFINED_LITERALS); > > /* Consume the string. */ > - str = cp_parser_string_literal (parser, /*translate=*/true, > - /*wide_ok=*/true, /*lookup_udlit=*/false); > + cp_expr str = cp_parser_string_literal (parser, /*translate=*/true, > + /*wide_ok=*/true, > + /*udl_ok=*/true, > + /*lookup_udlit=*/false); > if (str == error_mark_node) > return error_mark_node; > else if (TREE_CODE (str) == USERDEF_LITERAL) > @@ -21975,7 +21982,6 @@ cp_parser_using_directive (cp_parser* parser) > static void > cp_parser_asm_definition (cp_parser* parser) > { > - tree string; > tree outputs = NULL_TREE; > tree inputs = NULL_TREE; > tree clobbers = NULL_TREE; > @@ -22083,7 +22089,8 @@ cp_parser_asm_definition (cp_parser* parser) > if (!cp_parser_require (parser, CPP_OPEN_PAREN, RT_OPEN_PAREN)) > return; > /* Look for the string. */ > - string = cp_parser_string_literal (parser, false, false); > + tree string = cp_parser_string_literal (parser, /*translate=*/false, > + /*wide_ok=*/false, /*udl_ok=*/false); > if (string == error_mark_node) > { > cp_parser_skip_to_closing_parenthesis (parser, true, false, > @@ -28485,11 +28492,8 @@ cp_parser_yield_expression (cp_parser* parser) > static tree > cp_parser_asm_specification_opt (cp_parser* parser) > { > - cp_token *token; > - tree asm_specification; > - > /* Peek at the next token. */ > - token = cp_lexer_peek_token (parser->lexer); > + cp_token *token = cp_lexer_peek_token (parser->lexer); > /* If the next token isn't the `asm' keyword, then there's no > asm-specification. */ > if (!cp_parser_is_keyword (token, RID_ASM)) > @@ -28502,7 +28506,10 @@ cp_parser_asm_specification_opt (cp_parser* parser) > parens.require_open (parser); > > /* Look for the string-literal. */ > - asm_specification = cp_parser_string_literal (parser, false, false); > + tree asm_specification = cp_parser_string_literal (parser, > + /*translate=*/false, > + /*wide_ok=*/false, > + /*udl_ok=*/false); > > /* Look for the `)'. */ > parens.require_close (parser); > @@ -28535,8 +28542,6 @@ cp_parser_asm_operand_list (cp_parser* parser) > > while (true) > { > - tree string_literal; > - tree expression; > tree name; > > if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_SQUARE)) > @@ -28554,13 +28559,16 @@ cp_parser_asm_operand_list (cp_parser* parser) > else > name = NULL_TREE; > /* Look for the string-literal. */ > - string_literal = cp_parser_string_literal (parser, false, false); > + tree string_literal = cp_parser_string_literal (parser, > + /*translate=*/false, > + /*wide_ok=*/false, > + /*udl_ok=*/false); > > /* Look for the `('. */ > matching_parens parens; > parens.require_open (parser); > /* Parse the expression. */ > - expression = cp_parser_expression (parser); > + tree expression = cp_parser_expression (parser); > /* Look for the `)'. */ > parens.require_close (parser); > > @@ -28600,10 +28608,11 @@ cp_parser_asm_clobber_list (cp_parser* parser) > > while (true) > { > - tree string_literal; > - > /* Look for the string literal. */ > - string_literal = cp_parser_string_literal (parser, false, false); > + tree string_literal = cp_parser_string_literal (parser, > + /*translate=*/false, > + /*wide_ok=*/false, > + /*udl_ok=*/false); > /* Add it to the list. */ > clobbers = tree_cons (NULL_TREE, string_literal, clobbers); > /* If the next token is not a `,', then the list is > @@ -45761,7 +45770,10 @@ cp_parser_omp_context_selector (cp_parser *parser, tree set, bool has_parms_p) > cp_lexer_consume_token (parser->lexer); > } > else if (cp_lexer_next_token_is (parser->lexer, CPP_STRING)) > - value = cp_parser_string_literal (parser, false, false); > + value = cp_parser_string_literal (parser, > + /*translate=*/false, > + /*wide_ok=*/false, > + /*udl_ok=*/false); > else > { > cp_parser_error (parser, "expected identifier or " > @@ -48783,7 +48795,8 @@ pragma_lex (tree *value, location_t *loc) > if (ret == CPP_PRAGMA_EOL) > ret = CPP_EOF; > else if (ret == CPP_STRING) > - *value = cp_parser_string_literal (the_parser, false, false); > + *value = cp_parser_string_literal (the_parser, /*translate=*/false, > + /*wide_ok=*/false, /*udl_ok=*/false); > else > { > if (ret == CPP_KEYWORD) > diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-error1.C b/gcc/testsuite/g++.dg/cpp0x/udlit-error1.C > new file mode 100644 > index 00000000000..66e300e350f > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp0x/udlit-error1.C > @@ -0,0 +1,21 @@ > +// PR c++/105300 > +// { dg-do compile { target c++11 } } > + > +void operator""_x(const char *, decltype(sizeof(0))); > + > +#include ""_x // { dg-error "include expects" } > +#line ""_x // { dg-error "not a positive integer" } > +#if __has_include(""_x) // { dg-error "requires a header-name" } > +#endif > + > +#pragma message "hi"_x // { dg-warning "string literal with user-defined suffix is invalid in this context" } > + > +extern "C"_x { void g(); } // { dg-error "before user-defined string literal" } > +static_assert(true, "foo"_x); // { dg-error "string literal with user-defined suffix is invalid in this context|expected" } > + > +[[deprecated("oof"_x)]] > +void > +lol () // { dg-error "not a string" } > +{ > + asm (""_x); // { dg-error "string literal with user-defined suffix is invalid in this context" } > +} > > base-commit: f232715d15618e91c90eb210e23de10909590944