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 ESMTPS id 407943858C2D for ; Tue, 11 Oct 2022 14:08:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 407943858C2D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665497293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=M1msqLHAnN/zBzX8UyAJgxmtJ0obLwXXz3mI0V/jkNE=; b=fcYXIeU530x3WE3nY4xOr7LaUXWGQWlJHd0vhVNianVSQ61o1j18GuBE5oJEaxSEKAWjVZ lQfKCTt15x+vw+xyczK6w+2JljzoqirYa/3xmtk4TYI3unSCOo2O9hYsgSQMytNQIlTu2l Y114EaA/w8Oq7qEg4XYoMFfzub8zBMk= Received: from mail-yb1-f197.google.com (mail-yb1-f197.google.com [209.85.219.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-554-W3AGcTMvMK6Y0Yb6SGQv4g-1; Tue, 11 Oct 2022 10:08:12 -0400 X-MC-Unique: W3AGcTMvMK6Y0Yb6SGQv4g-1 Received: by mail-yb1-f197.google.com with SMTP id t6-20020a25b706000000b006b38040b6f7so13414048ybj.6 for ; Tue, 11 Oct 2022 07:08:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=M1msqLHAnN/zBzX8UyAJgxmtJ0obLwXXz3mI0V/jkNE=; b=SPi14ziGQ/COzsh6k1sF4cudcHn32gMVnkVTLUn5DxIm6nCsceEffd8W4Ht2GnpQvV +SfIu+rILILf/CD0eFWsQdpw54bBkq//UhrjT0j+svXdKcV/Y+KzHZgaLGh1mK9U9eQV V3bKILzQGehZcUL+qR49mmHt+b6o5+SXavIjfDsErErvrMlYCSCfWXodM1iT/NK9jhRi J7au86cACdmjYnl3XlW2szYAMou/I9liwFcbGQQkJa1iPPOSoYO8DgPYoo39tLl5cU0S tyFn/A/PJEegIjvg6iOPJXAXGVeeGtiwWN1lJccBPrFMU+tll4n01/AE5tgTbGjmduXa ebcA== X-Gm-Message-State: ACrzQf093gG2XlxQvwI5QjSynPP+k1UavInj3gLRD0UNpVz/S1Dn9ydU Ja1JvVKmUUi8TptPvCDRn7kCiPau5oK7WXhxTBW5XkvGFkFRPSRYEF3RcFQ/DO83G4mKT2GBMMh 0slqh/8vIcTJuyN8PFo1mgO9twVoK24HEbw== X-Received: by 2002:a25:c205:0:b0:6b8:eca8:d97d with SMTP id s5-20020a25c205000000b006b8eca8d97dmr23975949ybf.172.1665497291971; Tue, 11 Oct 2022 07:08:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5yBSZU2oX1x5UBuiclP/+3BueVSHzonpqSuT45X+nXySHBLbpEdVuROOmGNcKe6A1KidxzEaXL7hbPDxTSy34= X-Received: by 2002:a25:c205:0:b0:6b8:eca8:d97d with SMTP id s5-20020a25c205000000b006b8eca8d97dmr23975931ybf.172.1665497291646; Tue, 11 Oct 2022 07:08:11 -0700 (PDT) MIME-Version: 1.0 References: <20221010185829.312666-1-aldyh@redhat.com> In-Reply-To: From: Aldy Hernandez Date: Tue, 11 Oct 2022 16:08:00 +0200 Message-ID: Subject: Re: [PATCH] Avoid calling tracer.trailer() twice. To: Andrew MacLeod Cc: GCC patches X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="00000000000071dea405eac2ce95" X-Spam-Status: No, score=-11.7 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,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 List-Id: --00000000000071dea405eac2ce95 Content-Type: text/plain; charset="UTF-8" Sure. OK? Aldy On Tue, Oct 11, 2022 at 3:11 PM Andrew MacLeod wrote: > > It probably should just be changed to a print if it doesn't return.. > something like > > if (idx && res) > { > tracer.print (idx, "logical_combine produced"); > r.dump (dump_file); > fputc ('\n', dump_file); > } > > Andrew > > On 10/10/22 14:58, Aldy Hernandez wrote: > > [Andrew, you OK with this? I can't tell whether the trailer() call was > > actually needed.] > > > > logical_combine is calling tracer.trailer() one too many times causing > > the second trailer() call to subtract a 0 indent by 2, yielding an > > indent of SOMETHING_REALLY_BIG :). You'd be surprised how many tools > > can't handle incredibly long lines. > > > > gcc/ChangeLog: > > > > * gimple-range-gori.cc (gori_compute::logical_combine): Avoid > > calling tracer.trailer(). > > --- > > gcc/gimple-range-gori.cc | 10 +--------- > > 1 file changed, 1 insertion(+), 9 deletions(-) > > > > diff --git a/gcc/gimple-range-gori.cc b/gcc/gimple-range-gori.cc > > index b37d03cddda..469382aa477 100644 > > --- a/gcc/gimple-range-gori.cc > > +++ b/gcc/gimple-range-gori.cc > > @@ -798,20 +798,12 @@ gori_compute::logical_combine (vrange &r, enum tree_code code, > > // would be lost. > > if (!range_is_either_true_or_false (lhs)) > > { > > - bool res; > > Value_Range r1 (r); > > if (logical_combine (r1, code, m_bool_zero, op1_true, op1_false, > > op2_true, op2_false) > > && logical_combine (r, code, m_bool_one, op1_true, op1_false, > > op2_true, op2_false)) > > - { > > - r.union_ (r1); > > - res = true; > > - } > > - else > > - res = false; > > - if (idx) > > - tracer.trailer (idx, "logical_combine", res, NULL_TREE, r); > > + r.union_ (r1); > > } > > > > switch (code) > --00000000000071dea405eac2ce95 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Avoid-calling-tracer.trailer-twice.patch" Content-Disposition: attachment; filename="0001-Avoid-calling-tracer.trailer-twice.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l94a2ovz0 RnJvbSBlN2ZiNDY3OTUyOGQxOTA0NjNjZjNkMGQ0YTRkYWE3MzMzYjVhNTUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGR5IEhlcm5hbmRleiA8YWxkeWhAcmVkaGF0LmNvbT4KRGF0 ZTogVHVlLCAxMSBPY3QgMjAyMiAxNjowMDozMyArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIEF2b2lk IGNhbGxpbmcgdHJhY2VyLnRyYWlsZXIoKSB0d2ljZS4KCmdjYy9DaGFuZ2VMb2c6CgogICAgICAg ICogZ2ltcGxlLXJhbmdlLWdvcmkuY2MgKGdvcmlfY29tcHV0ZTo6bG9naWNhbF9jb21iaW5lKTog QXZvaWQKICAgICAgICBjYWxsaW5nIHRyYWNlci50cmFpbGVyKCkuCi0tLQogZ2NjL2dpbXBsZS1y YW5nZS1nb3JpLmNjIHwgOCArKysrKystLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygr KSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nY2MvZ2ltcGxlLXJhbmdlLWdvcmkuY2Mg Yi9nY2MvZ2ltcGxlLXJhbmdlLWdvcmkuY2MKaW5kZXggYjM3ZDAzY2RkZGEuLjVmZjA2N2NhZGI1 IDEwMDY0NAotLS0gYS9nY2MvZ2ltcGxlLXJhbmdlLWdvcmkuY2MKKysrIGIvZ2NjL2dpbXBsZS1y YW5nZS1nb3JpLmNjCkBAIC04MTAsOCArODEwLDEyIEBAIGdvcmlfY29tcHV0ZTo6bG9naWNhbF9j b21iaW5lICh2cmFuZ2UgJnIsIGVudW0gdHJlZV9jb2RlIGNvZGUsCiAJfQogICAgICAgZWxzZQog CXJlcyA9IGZhbHNlOwotICAgICAgaWYgKGlkeCkKLQl0cmFjZXIudHJhaWxlciAoaWR4LCAibG9n aWNhbF9jb21iaW5lIiwgcmVzLCBOVUxMX1RSRUUsIHIpOworICAgICAgaWYgKGlkeCAmJiByZXMp CisJeworCSAgdHJhY2VyLnByaW50IChpZHgsICJsb2dpY2FsX2NvbWJpbmUgcHJvZHVjZWQgIik7 CisJICByLmR1bXAgKGR1bXBfZmlsZSk7CisJICBmcHV0YyAoJ1xuJywgZHVtcF9maWxlKTsKKwl9 CiAgICAgfQogCiAgIHN3aXRjaCAoY29kZSkKLS0gCjIuMzcuMwoK --00000000000071dea405eac2ce95--