From patchwork Tue Jul 18 17:33:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 122169 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1903358vqt; Tue, 18 Jul 2023 10:34:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlH4Oz7UgCTWsB1XAQ6M/YW6ul/ThXEZXGH9vQCg1zRYYBSTAgIt8dn3l5T8mgBWbJMZz6dz X-Received: by 2002:a17:906:5187:b0:993:d7c4:1a78 with SMTP id y7-20020a170906518700b00993d7c41a78mr431187ejk.10.1689701656622; Tue, 18 Jul 2023 10:34:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689701656; cv=none; d=google.com; s=arc-20160816; b=AEx/XMb6mYBwuNXaT5+P2x1cDh4QqrzfL9dMoDY78M39L9swB+j+r3gWWtRlgsj0De ipntsdHY1ng4vAD/R+eJhHRbdyGWGoDIbv9Kv8j0rcS9v1ZRsGKABt3PsySC6uKDNWLJ EoLiQwG3xK0YHRb92jq7S9j7Az0msFLXvU+1VjV/8cxmj72WzS08g2sUgJdP6jLxA1j+ N1Hez1XMhm5XqwNv4CMt2WuG7+FDAQpgPZG9vJsPuMjw21/mx1IEQYl9+8yXqmuTi6j0 LksYto/kbpd4mR8mHTQj/x2rhj2f0NZgIlnJwqFaeR6gAZexEDySietk/yKEM/p2yRPV UCjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=QkajGyHVOCxxjblDb4vXKHUoUUQq5iCPDqBDg7TD7wI=; fh=iVTbkP5HqqiCPIDOqGBZ/HfODBKviPi4lm5FNp1B8wU=; b=LKzE4OhSH8PIUp/27ixh+ezum9H62/UdJQM6Q841PtW7+yOvx7X8G4jW6xPSfW4ESw RCuD0m64jQ0rqOQBzr8CdJ1SticnvTGmSQBU8lF56iUZBEcRZTSnP2q2cWNESJGXb/I8 ZYELO+FjQsRXB9EX05u0rqbiwa8QzeRzFtcmyT9b/4Yj1AVEohYRjBuxtljuoRq0wX3K PRudjH5ulQJUH4z8Fj68Htl8KmmoyKeWvqbCIYj1f2LWisXNwJo+z+AbBXn4P7X9mlv6 Qc9P86mNHvybO1kpUlv21lH+a/CR86/NhRU3Kyx3yR7ZVsgwr0yj3OGXkQXb57ncNfAv D80g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=N0YlK7k5; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id gx3-20020a170906f1c300b0099349f9c248si1616092ejb.592.2023.07.18.10.34.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 10:34:16 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=N0YlK7k5; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E71C5385AFAE for ; Tue, 18 Jul 2023 17:34:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E71C5385AFAE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689701653; bh=QkajGyHVOCxxjblDb4vXKHUoUUQq5iCPDqBDg7TD7wI=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=N0YlK7k5MybAcOSU7UQhIqN3jxjMoXOQ0sz7OY300lrsVwZqmIKegRITDLlF9WRhj yUUdemm53cibkVZEUGOtLPDUXC3Q322NKtto9tJAGmj+/L6Vkgn7nHKYnPGBpzp5qs 7ZBoaIds13cW7rrwX7jyswzt40i1hjFiSHwHB06o= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 069A8385773C for ; Tue, 18 Jul 2023 17:33:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 069A8385773C Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-118-_JT7w176PRS49A8gfw18wA-1; Tue, 18 Jul 2023 13:33:26 -0400 X-MC-Unique: _JT7w176PRS49A8gfw18wA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 654C91C2C5A0 for ; Tue, 18 Jul 2023 17:33:26 +0000 (UTC) Received: from pdp-11.redhat.com (unknown [10.22.10.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4673A492B01; Tue, 18 Jul 2023 17:33:26 +0000 (UTC) To: GCC Patches Cc: Jason Merrill Subject: [pushed] c++: Add tests for P2621, no UB in lexer [PR110340] Date: Tue, 18 Jul 2023 13:33:14 -0400 Message-ID: <20230718173314.72666-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Marek Polacek via Gcc-patches From: Marek Polacek Reply-To: Marek Polacek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771780604413259475 X-GMAIL-MSGID: 1771780604413259475 Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- C++26 P2621 removes UB in the lexer and either makes the construct valid or ill-formed. We're already handling this correctly so this patch only adds tests. PR c++/110340 gcc/testsuite/ChangeLog: * g++.dg/cpp/string-4.C: New test. * g++.dg/cpp/ucn-2.C: New test. --- gcc/testsuite/g++.dg/cpp/string-4.C | 6 ++++++ gcc/testsuite/g++.dg/cpp/ucn-2.C | 15 +++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp/string-4.C create mode 100644 gcc/testsuite/g++.dg/cpp/ucn-2.C base-commit: 05fc7db93452841280ddc5cdf71b33498ed576dc diff --git a/gcc/testsuite/g++.dg/cpp/string-4.C b/gcc/testsuite/g++.dg/cpp/string-4.C new file mode 100644 index 00000000000..37d0388413c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp/string-4.C @@ -0,0 +1,6 @@ +// P2621R2 - UB? In My Lexer? +// { dg-do compile } + +// [lex.phases] If a U+0027 APOSTROPHE or a U+0022 QUOTATION +// MARK matches the last category, the program is ill-formed. +const char * foo=" // { dg-error "terminating|expected" } diff --git a/gcc/testsuite/g++.dg/cpp/ucn-2.C b/gcc/testsuite/g++.dg/cpp/ucn-2.C new file mode 100644 index 00000000000..c5583e06dd6 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp/ucn-2.C @@ -0,0 +1,15 @@ +// P2621R2 - UB? In My Lexer? +// { dg-do compile } + +// Line splicing can form a universal-character-name [lex.charset]. +int \\ +u\ +0\ +3\ +9\ +1 = 0; + +// [cpp.concat] Concatenation can form a universal-character-name. +#define CONCAT(x,y) x##y + +int CONCAT(\,u0393)=0;