From patchwork Tue Jan 24 22:11:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1731454 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=dTPxCO5Y; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P1h5h5QYTz23gY for ; Wed, 25 Jan 2023 09:11:52 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A23573858404 for ; Tue, 24 Jan 2023 22:11:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A23573858404 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674598310; bh=J0TgpkmTP/nNOz9Nvi6/EI4I0tOKNcZrFZh7CiCN4SA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=dTPxCO5Y0toXweReBPuLOBsXs2DYbOs/1zU3UBoB7ndpI3pkuTBi6XZsKYpHMezXT y7ou1YXUesT8p87nmG5T5pH8hoxMeFZmjB5ukMj+eWntaq9f9g8Tr69oYTnXNVzTMl g8vBvuAgfid1AV6cl6iX+Sa2VGCmYjrM6qZOEJUc= 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 54BC73858C30 for ; Tue, 24 Jan 2023 22:11:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 54BC73858C30 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-622-ApcfIsqSM6CwvQrgHfig6g-1; Tue, 24 Jan 2023 17:11:29 -0500 X-MC-Unique: ApcfIsqSM6CwvQrgHfig6g-1 Received: by mail-qv1-f69.google.com with SMTP id l6-20020ad44446000000b00537721bfd2dso263021qvt.11 for ; Tue, 24 Jan 2023 14:11:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=J0TgpkmTP/nNOz9Nvi6/EI4I0tOKNcZrFZh7CiCN4SA=; b=XfOKIqvmtPv/ZPUfYmX74e8GQWYKFNoWmqbxcp3ic8RcE4JACVf+x8FOtFMGZPm0lU HObCO3A6/7rkubYGxJ/yJumweBL5rxgXNVmcgK6RzfW1Qfk4sprS3Xt15SE97TBATmMy D6O/ZjRfVSHuR8Rg3lU6fhJP5VjYix883sd97WJTzXGvouEhdwhkSxO9aKt+Kgdb4AEe xumdFjzEiZVybuRYCwR/nC/P/IHSkML+JOrHEf0sekjngiR3kIjRHJn5anyjdNWZOeyN 39UfEqC/Yv5I7yZuHAxl6rcBnTM5nIddAzOIxDfVrIwFgVAqA86iwBgnfBq/Q+8gg2mf TDog== X-Gm-Message-State: AFqh2koDgrPwJ14GSU1s/wUchUgYGQC7aygjWM2lQBEQlwWYo0AjO00e YcRfQV6OujrbUEZDtIP/AC0OxiafuHj3wFDDU56o3BHFGhcJH0UhtkOpmCB1z0nMTvPNj36yi57 KdD02xlpziG5QWb4bDdJoy6dKpqCzX3DfFU+L5RgoHjzofDTu50Ym0v0pyvx7qHqNAg== X-Received: by 2002:ac8:1199:0:b0:3b6:2c0d:87e8 with SMTP id d25-20020ac81199000000b003b62c0d87e8mr38134504qtj.35.1674598288919; Tue, 24 Jan 2023 14:11:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXt6kCbFsmkVoYMvI2UMXF4GVffPzonH5Q4J2pwQOSclzUCAW3vS8IjBZYglzX3WvOLl4ZnpKQ== X-Received: by 2002:ac8:1199:0:b0:3b6:2c0d:87e8 with SMTP id d25-20020ac81199000000b003b62c0d87e8mr38134474qtj.35.1674598288481; Tue, 24 Jan 2023 14:11:28 -0800 (PST) Received: from jason.com (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 y6-20020a05622a120600b003b2d890752dsm2051814qtx.88.2023.01.24.14.11.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 14:11:27 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: "" #pragma at BOF [PR108504] Date: Tue, 24 Jan 2023 17:11:23 -0500 Message-Id: <20230124221123.299474-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 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_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 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: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- Since r11-2095 we pass flags to cp_lexer_get_preprocessor_token, and cp_lexer_new_main passes C_LEX_STRING_NO_JOIN when lexing most of the translation unit, but doesn't do that for the very first token; as a result, if the first token is a string literal, we try to join strings and get confused if that encounters a pragma. PR c++/108504 gcc/cp/ChangeLog: * parser.cc (cp_lexer_new_main): Pass C_LEX_STRING_NO_JOIN for first token, too. gcc/testsuite/ChangeLog: * g++.dg/ext/pragma1.C: New test. --- gcc/cp/parser.cc | 2 +- gcc/testsuite/g++.dg/ext/pragma1.C | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/ext/pragma1.C base-commit: 049a52909075117f5112971cc83952af2a818bc1 diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index b38c22e9a3d..07ec0e14491 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -705,7 +705,7 @@ cp_lexer_new_main (void) /* It's possible that parsing the first pragma will load a PCH file, which is a GC collection point. So we have to do that before allocating any memory. */ - cp_lexer_get_preprocessor_token (0, &token); + cp_lexer_get_preprocessor_token (C_LEX_STRING_NO_JOIN, &token); cp_parser_initial_pragma (&token); c_common_no_more_pch (); diff --git a/gcc/testsuite/g++.dg/ext/pragma1.C b/gcc/testsuite/g++.dg/ext/pragma1.C new file mode 100644 index 00000000000..bb258dac9a7 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/pragma1.C @@ -0,0 +1,4 @@ +// PR c++/108504 + +"1" // { dg-error "" } +#pragma GCC diagnostic push