From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id vQ5DJxMhdWKtrAQAWB0awg (envelope-from ) for ; Fri, 06 May 2022 09:22:27 -0400 Received: by simark.ca (Postfix, from userid 112) id 939011E058; Fri, 6 May 2022 09:22:27 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, NICE_REPLY_A,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id E42951E00E for ; Fri, 6 May 2022 09:22:26 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4FF05394FC35 for ; Fri, 6 May 2022 13:22:26 +0000 (GMT) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by sourceware.org (Postfix) with ESMTPS id 51679395440E for ; Fri, 6 May 2022 13:21:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 51679395440E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-f47.google.com with SMTP id u3so10043536wrg.3 for ; Fri, 06 May 2022 06:21:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=vCrhTOl/DR/pr/2xLwRBc5Ge262lFwQScLTAUJLW5Rs=; b=SFqBDcPdEjMDXGAPHLJ2+f0D7gUV0L3LtkVCV6xg0QRBnxOAXLkRsYCycIb6IS3hA7 L0coWQ/Dyc35QyaE7jJYyFJDGwEwJi/KwFzXYlQAIN0xs+NfUPwc94YrVExJ+fvZ8mA7 Qhkn3bvzb/RLy1UBDKVXNEAiPkFdjYnYakx7swfLSBLmAUDdhgNq7FXbNylHiQ6D0e/w K72Mf3qQmIEpk4++Nue1wRpPfuyzEDyg5KBmx7x633B5TbUbS+IqYILjy2xmdNxlx9G/ SoI2Ci6BQ2sIe4345LIZ72lnajPNKNf1TcJyvxAWbAqW79FXqCczTtxKA/ZYhcB7Lqlq W0Bg== X-Gm-Message-State: AOAM5327q0nXxk+l5dxAm9jFT+oxzIx2AQdMEiNjKumLwea+spj6CpKI sYuNQIY1EPuB42RMkiBwiPs788dn8YY= X-Google-Smtp-Source: ABdhPJyjJnYgKAJnSV8vApkDcihejhW/JVDwwvHp/42fchYQt94CvH2mb9+FsmE+sa/fGkvF3VIS2g== X-Received: by 2002:a5d:526b:0:b0:20c:9ea8:4737 with SMTP id l11-20020a5d526b000000b0020c9ea84737mr2749286wrc.502.1651843276223; Fri, 06 May 2022 06:21:16 -0700 (PDT) Received: from ?IPV6:2001:8a0:f924:2600:209d:85e2:409e:8726? ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id p3-20020a05600c064300b003942a244f31sm8663332wmm.10.2022.05.06.06.21.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 May 2022 06:21:15 -0700 (PDT) Message-ID: <348740c4-3d3f-5a56-cbd6-ab7dfde1f2da@palves.net> Date: Fri, 6 May 2022 14:21:14 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: Re: [PATCH 1/3] Fix "b f(std::string)", always use DMGL_VERBOSE Content-Language: en-US To: Carl Love , gdb-patches@sourceware.org References: <20220505185020.3648774-1-pedro@palves.net> <20220505185020.3648774-2-pedro@palves.net> From: Pedro Alves In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" On 2022-05-05 22:49, Carl Love wrote: > Pedro: > > I pulled down a fresh copy of gdb and tried to apply the first patch. > There were issues with patching the files: > > patch -p 1 < Fix__b_f_std_string__,_always_use_DMGL_VERBOSE_1.patch > (Stripping trailing CRs from patch; use --binary to disable.) > patching file gdb/cp-name-parser.y > (Stripping trailing CRs from patch; use --binary to disable.) > patching file gdb/cp-support.c > (Stripping trailing CRs from patch; use --binary to disable.) > patching file gdb/cp-support.h > patching file gdb/testsuite/gdb.cp/break-f-std-string.cc (renamed from > gdb/testsuite/gdb.cp/no-dmgl-verbose.cc) > (Stripping trailing CRs from patch; use --binary to disable.) > patching file gdb/testsuite/gdb.cp/break-f-std-string.exp > (Stripping trailing CRs from patch; use --binary to disable.) > patching file gdb/testsuite/gdb.cp/no-dmgl-verbose.exp > Reversed (or previously applied) patch detected! Assume -R? [n] n > Apply anyway? [n] n > Skipping patch. > 1 out of 1 hunk ignored -- saving rejects to file > gdb/testsuite/gdb.cp/no-dmgl-verbose.exp.rej > > The issue seems to be with deleting the file: > gdb/testsuite/gdb.cp/no-dmgl-verbose.exp > > I manually deleted it. I then used git to commit the patch to my local > git directory so I could add the second patch. This looks like something on your end. I sent the patches using git send-email, which typically is the best way to send emails in the right format. To check, I downloaded the whole email from the copy I got via the list (in Thunderbird for example, just save the email to a file), and used "git am", and it applied cleanly: $ git reset --hard upstream/master ... $ git am /tmp/patch1.mbox Applying: Fix "b f(std::string)", always use DMGL_VERBOSE As a second experiment, I also tried copy/pasting the patch to a patch file, and apply that with "patch" as you're doing, and it applies cleanly: $ git reset --hard upstream/master ... $ patch -p1 -i /tmp/patch.diff patching file gdb/cp-name-parser.y patching file gdb/cp-support.c patching file gdb/cp-support.h patching file gdb/testsuite/gdb.cp/break-f-std-string.cc (renamed from gdb/testsuite/gdb.cp/no-dmgl-verbose.cc) patching file gdb/testsuite/gdb.cp/break-f-std-string.exp patching file gdb/testsuite/gdb.cp/no-dmgl-verbose.exp > > The second patch applied cleanly. > > The third patch applied cleanly. > > I ran the test gdb.cp/break-f-std-string.exp. It runs without errors > on a Power 10 system. > > testcase gdb/testsuite/gdb.cp/break-f-std-string.exp completed in 1 > seconds > > === gdb Summary === > > # of expected passes 16 > > I also ran the full regression suite with and without the patch. No > regression failures were found. > > Other than the patch not cleanly removing gdb/testsuite/gdb.cp/no-dmgl- > verbose.exp it all looks good. > > Thanks for fixing this test. Thanks for testing.