From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id 4FDC43858D28 for ; Sun, 30 Apr 2023 02:00:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4FDC43858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1a68f2345c5so9991105ad.2 for ; Sat, 29 Apr 2023 19:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682820012; x=1685412012; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=pm0pR+81WfrSnJkKmXfE+iVe2mNiAuOkZntEXzw4Wgk=; b=FxrwgGG6a6XOUIajUONs+a2gc3TuexXCB7Cz6wkW5r5c7AQlk+uwWdKISIa6KXy7wg K3Els0IVmIp8sS2ARhpaLneRSnmehf3qxuKLVM7mLrvFzokIhR3fF7CEKS+Z3ZAbS20r WoxPGvtKudZ4NCijGmg9Wo1K+y+mKaSG3DYnWCbi8QVCrHXmjmbzKslJ2mUBLWMMgMp6 QbBNvzIEqmiYSdCNZw+OLvuP0fIJuO6H3Z4YwTQ/o7gUtRqttV6Hg4XLdp0MahB/K2ER 2LRmmnf4WyM1htGMMhUBJeV1dB98EstAsgQ9dNSPi5Z/6qBliDjXTJGzQq087hQz8z6E v+gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682820012; x=1685412012; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pm0pR+81WfrSnJkKmXfE+iVe2mNiAuOkZntEXzw4Wgk=; b=kS5WPYnHKiuaWEopY50ZMYf1gqSqCTMgQEy/3/+z3lVuHdBNpeQ5rOx1OtAnskOlxg ZFKQFGUAHPFUfgrt/SNVWRUNXSy2FFLDwP3XMFA4RJoqcFIbmYPabLwct0MrLZuuLS+c 29kGex6wC2cxHknnI0e9VDGei+RFAo1WqdeCz9IEFnyFEdKg6NZD0gfxfXs2CGgoN08V jq0+EaIzG12d5y2ys3BvefmFQ5yD0xIL2IMqXvc7ldQoWR4688MuWwumbv9aIkmJrzYi rkAGRG5HRbgy+QPrpILyBwBfmI4f8+O8agRnbGPtS5Z+VhEXc46oF1s5OANw1G0owp8h TK8g== X-Gm-Message-State: AC+VfDxLUOF8/rZCD0VNVZP0pL+K0hTSAUatDADhcykdmC5nGqGyEiSO a81ZTRNddq/YjMlxL3v6+Cf1w82tq88= X-Google-Smtp-Source: ACHHUZ7YbpjrduxoOOTWeG7RBdiZsfea8XcpiejS2/th2Ghr5MAALD+RGJrG7VfiWeZfZQjImDcUSw== X-Received: by 2002:a17:902:aa92:b0:1a1:bede:5e54 with SMTP id d18-20020a170902aa9200b001a1bede5e54mr9622957plr.59.1682820011608; Sat, 29 Apr 2023 19:00:11 -0700 (PDT) Received: from Thaum.localdomain (125-209-144-50.tpgi.com.au. [125.209.144.50]) by smtp.gmail.com with ESMTPSA id x12-20020a1709027c0c00b001a52e3e3745sm15350426pll.296.2023.04.29.19.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 19:00:11 -0700 (PDT) Date: Sun, 30 Apr 2023 12:00:05 +1000 From: Nathaniel Shead To: gcc-patches@gcc.gnu.org Cc: Nathaniel Shead Subject: [PATCH] c++: Report invalid id-expression in decltype [PR100482] Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: This patch ensures that any errors raised by finish_id_expression when parsing a decltype expression are properly reported, rather than potentially going ignored and causing invalid code to be accepted. We can also now remove the separate check for templates without args as this is also checked for in finish_id_expression. PR 100482 gcc/cp/ChangeLog: * parser.cc (cp_parser_decltype_expr): Report errors raised by finish_id_expression. gcc/testsuite/ChangeLog: * g++.dg/pr100482.C: New test. Signed-off-by: Nathaniel Shead --- gcc/cp/parser.cc | 22 +++++++++++----------- gcc/testsuite/g++.dg/pr100482.C | 11 +++++++++++ 2 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 gcc/testsuite/g++.dg/pr100482.C diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index e5f032f2330..20ebcdc3cfd 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -16508,10 +16508,6 @@ cp_parser_decltype_expr (cp_parser *parser, expr = cp_parser_lookup_name_simple (parser, expr, id_expr_start_token->location); - if (expr && TREE_CODE (expr) == TEMPLATE_DECL) - /* A template without args is not a complete id-expression. */ - expr = error_mark_node; - if (expr && expr != error_mark_node && TREE_CODE (expr) != TYPE_DECL @@ -16532,13 +16528,17 @@ cp_parser_decltype_expr (cp_parser *parser, &error_msg, id_expr_start_token->location)); - if (expr == error_mark_node) - /* We found an id-expression, but it was something that we - should not have found. This is an error, not something - we can recover from, so note that we found an - id-expression and we'll recover as gracefully as - possible. */ - id_expression_or_member_access_p = true; + if (error_msg) + { + /* We found an id-expression, but it was something that we + should not have found. This is an error, not something + we can recover from, so report the error we found and + we'll recover as gracefully as possible. */ + cp_parser_parse_definitely (parser); + cp_parser_error (parser, error_msg); + id_expression_or_member_access_p = true; + return error_mark_node; + } } if (expr diff --git a/gcc/testsuite/g++.dg/pr100482.C b/gcc/testsuite/g++.dg/pr100482.C new file mode 100644 index 00000000000..dcf6722fda5 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr100482.C @@ -0,0 +1,11 @@ +// { dg-do compile { target c++11 } } + +namespace N {} +decltype(std) x; // { dg-error "expected primary-expression" } + +struct S {}; +decltype(S) y; // { dg-error "argument to .decltype. must be an expression" } + +template +struct U {}; +decltype(U) z; // { dg-error "missing template arguments" } -- 2.40.0