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 ESMTP id C30EE3959E64 for ; Mon, 19 Apr 2021 10:06:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C30EE3959E64 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-484-X6nhl2g6PhmMYN6OMieKig-1; Mon, 19 Apr 2021 06:06:38 -0400 X-MC-Unique: X6nhl2g6PhmMYN6OMieKig-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA93C802B7E; Mon, 19 Apr 2021 10:06:37 +0000 (UTC) Received: from tucnak.zalov.cz (ovpn-115-183.ams2.redhat.com [10.36.115.183]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5405560D43; Mon, 19 Apr 2021 10:06:37 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.16.1/8.16.1) with ESMTPS id 13JA6ZdM2080770 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 19 Apr 2021 12:06:35 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.16.1/8.16.1/Submit) id 13JA6Y7u2080769; Mon, 19 Apr 2021 12:06:34 +0200 Date: Mon, 19 Apr 2021 12:06:34 +0200 From: Jakub Jelinek To: Richard Biener Cc: gcc-patches@gcc.gnu.org, nathan@acm.org Subject: Re: [PATCH] preprocessor/100142 - revert unwanted change in last commit Message-ID: <20210419100634.GE1179226@tucnak> Reply-To: Jakub Jelinek References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-5.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Mon, 19 Apr 2021 10:06:51 -0000 On Mon, Apr 19, 2021 at 11:26:04AM +0200, Richard Biener wrote: > This reverts a s/column_offset/column/ change in the fix for PR99446. > > This time with testcase included in the patch and the necessary reversion > of the testsuite change of the offending rev. > > Bootstrapped and tested on x86_64-unknown-linux-gnu, OK? > > Thanks, > Richard. > > 2021-04-19 Richard Biener > > PR preprocessor/100142 > libcpp/ > * line-map.c (linemap_position_for_loc_and_offset): Revert > unintended s/column_offset/column/ change. > > * gcc.dg/pr100142.c: New testcase. > * g++.dg/diagnostic/pr72803.C: Revert last change. LGTM, but please give Nathan 2-3 hours to chime in if the change was intentional. Jakub