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 21989385740B for ; Tue, 17 May 2022 15:45:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 21989385740B Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-594-Iddc9tD0PyCF6RNoOMCJAA-1; Tue, 17 May 2022 11:45:14 -0400 X-MC-Unique: Iddc9tD0PyCF6RNoOMCJAA-1 Received: by mail-qv1-f71.google.com with SMTP id t15-20020ad45bcf000000b0045a8cfef66bso15072346qvt.11 for ; Tue, 17 May 2022 08:45:14 -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 :content-language:to:cc:from:subject; bh=4SQjiH7kJc0Krpn217Cwu6PvKAjOEPhF893ZJVtcPyo=; b=cDnlQJNZrfPoIBmzKEAPr1IFvVKG7x2iWX22C1ySHNxLPEE1RTpqzkEwgFzwhcS5/k yzRwizndCJlzzMO6ess/qg+yLfo/ZJZSI1bHONvLKyInIO1xZiLllcKYifx8z0Mv+gwy MHg8EsOwpQefju9qxxylpM/sHY7diTTpajjGXn6RBm5MxoCTaPboFZoBmwOM6V+ySpCu gQHexZWmeQOFOGLkOOxh9d7TU6HW2gSOwGOBByQo7eRLGnCcGKGt+R8M72hAYuZirBGj rpBJ8pvZl/atY9KlndWL4V/jM9KO3nwKlxXYWDjk9pAZnOocnRpNpinzF623VT9ke6gR 2KOw== X-Gm-Message-State: AOAM530kshpE1Fyp5XrURVaqdt2THXn9RJCxtLuurauvUSnAx35NFCqL bzZwMFlv2D8OHIT0q76RyJ7VzsieefIHxMm9/CddnlzhyQr0aKxiwu+RKk4D9fr4phG+iuCvRMr 8O5Mtq6yTSEy0evYz7wJlMcXiLLy+NVuBX/hCb5EtBE0TGjKPb/QTMbtgStida3bluKn2MQ== X-Received: by 2002:a05:620a:280d:b0:67d:2480:fdea with SMTP id f13-20020a05620a280d00b0067d2480fdeamr16609939qkp.157.1652802313465; Tue, 17 May 2022 08:45:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZDWyOVKZROSJCfpu7pBRDoPfSrKhu0ptwmo1MNK9CB14HvH02BN2VsqQxWt5oyg4BrOQ/uA== X-Received: by 2002:a05:620a:280d:b0:67d:2480:fdea with SMTP id f13-20020a05620a280d00b0067d2480fdeamr16609921qkp.157.1652802313120; Tue, 17 May 2022 08:45:13 -0700 (PDT) Received: from ?IPV6:2607:fea8:a261:5e00::94b0? ([2607:fea8:a261:5e00::94b0]) by smtp.gmail.com with ESMTPSA id i9-20020ae9ee09000000b006a0ba4b8f48sm7705654qkg.49.2022.05.17.08.45.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 May 2022 08:45:12 -0700 (PDT) Message-ID: Date: Tue, 17 May 2022 11:45:11 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 To: gcc-patches From: Andrew MacLeod Subject: [PATCH] PR tree-optimization/105458 - Check for equivalence after merging relations. X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="------------dUjUz2lzNVYsgkZUinBUo0eA" Content-Language: en-CA X-Spam-Status: No, score=-12.8 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_LOW, 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-List-Received-Date: Tue, 17 May 2022 15:45:17 -0000 This is a multi-part message in MIME format. --------------dUjUz2lzNVYsgkZUinBUo0eA Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sorry, missed this one earlier. When we register a relation, such as LE_EXPR,  we first check if there is an existing relation that applies, and if so they are combined. We were checking if the relation being registered was an EQ_EXPR, and if so, invoked the equivalence oracle.  I was doing the check for EQ_EXPR first, then merging with any existing relation.   In this case, the merge resulted in transforming the LE_EXPR into an EQ_EXPR, but the check to invoke the equivalence_oracle had already been done, and we got to a place we shouldn't have. doh! The fix is to do the merge first, then check for EQ_EXPR. The patch is a hair different (due to VREL_*  renames in gcc13), so I've attached both patches. bootstraps on gcc12 and gcc13 with no regressions.  pushed on trunk. OK for GCC12? Andrew --------------dUjUz2lzNVYsgkZUinBUo0eA Content-Type: text/x-patch; charset=UTF-8; name="pr105458.patch" Content-Disposition: attachment; filename="pr105458.patch" Content-Transfer-Encoding: base64 Y29tbWl0IDg0YzBlODAxZjI2Mjc1YTQ3MDBjMTBhNzEwYTE4NWMxN2YwNDE4ZTUKQXV0aG9yOiBB bmRyZXcgTWFjTGVvZCA8YW1hY2xlb2RAcmVkaGF0LmNvbT4KRGF0ZTogICBNb24gTWF5IDE2IDIx OjM5OjMwIDIwMjIgLTA0MDAKCiAgICBDaGVjayBmb3IgZXF1aXZhbGVuY2UgYWZ0ZXIgbWVyZ2lu ZyByZWxhdGlvbnMuCiAgICAKICAgIFdoZW4gcmVnaXN0ZXJpbmcgYSByZWxhdGlvbiwgd2UgbmVl ZCB0byBtZXJnZSB3aXRoIGFueSBleGlzdGluZyByZWxhdGlvbgogICAgYmVmb3JlIGNoZWNraW5n IGlmIGl0IHdhcyBhbiBlcXVpdmFsZW5jZS4uLiBvdGhlcndpc2UgaXQgd2FzIG5vdCBiZWluZwog ICAgaGFuZGxlZCBwcm9wZXJseS4KICAgIAogICAgICAgICAgICBnY2MvCiAgICAgICAgICAgIFBS IHRyZWUtb3B0aW1pemF0aW9uLzEwNTQ1OAogICAgICAgICAgICAqIHZhbHVlLXJlbGF0aW9uLmNj IChwYXRoX29yYWNsZTo6cmVnaXN0ZXJfcmVsYXRpb24pOiBNZXJnZSwgdGhlbiBjaGVjawogICAg ICAgICAgICBmb3IgZXF1aXZhbGVuY2UuCiAgICAKICAgICAgICAgICAgZ2NjL3Rlc3RzdWl0ZS8K ICAgICAgICAgICAgKiBnY2MuZGcvcHIxMDU0NTguYzogTmV3LgoKZGlmZiAtLWdpdCBhL2djYy90 ZXN0c3VpdGUvZ2NjLmRnL3ByMTA1NDU4LmMgYi9nY2MvdGVzdHN1aXRlL2djYy5kZy9wcjEwNTQ1 OC5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi5lYjU4YmYyMWYzMgot LS0gL2Rldi9udWxsCisrKyBiL2djYy90ZXN0c3VpdGUvZ2NjLmRnL3ByMTA1NDU4LmMKQEAgLTAs MCArMSwyMCBAQAorLyogUFIgdHJlZS1vcHRpbWl6YXRpb24vMTA1NDU4ICovCisvKiB7IGRnLWRv IGNvbXBpbGUgfSAqLworLyogeyBkZy1vcHRpb25zICItTzEgLWZleHBlbnNpdmUtb3B0aW1pemF0 aW9ucyAtZm5vLXRyZWUtZG9taW5hdG9yLW9wdHMgIiB9ICovCisKK3ZvaWQKK3lqIChpbnQgajQp Cit7CisgIGludCB0MzsKKworICBmb3IgKHQzID0gMDsgdDMgPCA2OyArK3QzKQorICAgIHsKKyAg ICAgIHNob3J0IGludCB2NCA9IHQzOworCisgICAgICBpZiAodjQgPT0gajQgfHwgdjQgPiB0MykK KyAgICAgICAgZm9yICg7OykKKyAgICAgICAgICB7CisgICAgICAgICAgfQorICAgIH0KK30KKwpk aWZmIC0tZ2l0IGEvZ2NjL3ZhbHVlLXJlbGF0aW9uLmNjIGIvZ2NjL3ZhbHVlLXJlbGF0aW9uLmNj CmluZGV4IGE5MzU2NTEwOWY5Li44NWQxNTlmNWQ5NiAxMDA2NDQKLS0tIGEvZ2NjL3ZhbHVlLXJl bGF0aW9uLmNjCisrKyBiL2djYy92YWx1ZS1yZWxhdGlvbi5jYwpAQCAtMTM4NCwxNiArMTM4NCwx NiBAQCBwYXRoX29yYWNsZTo6cmVnaXN0ZXJfcmVsYXRpb24gKGJhc2ljX2Jsb2NrIGJiLCByZWxh dGlvbl9raW5kIGssIHRyZWUgc3NhMSwKICAgICAgIGZwcmludGYgKGR1bXBfZmlsZSwgIiAocm9v dDogYmIlZClcbiIsIGJiLT5pbmRleCk7CiAgICAgfQogCisgIHJlbGF0aW9uX2tpbmQgY3VyciA9 IHF1ZXJ5X3JlbGF0aW9uIChiYiwgc3NhMSwgc3NhMik7CisgIGlmIChjdXJyICE9IFZSRUxfVkFS WUlORykKKyAgICBrID0gcmVsYXRpb25faW50ZXJzZWN0IChjdXJyLCBrKTsKKwogICBpZiAoayA9 PSBWUkVMX0VRKQogICAgIHsKICAgICAgIHJlZ2lzdGVyX2VxdWl2IChiYiwgc3NhMSwgc3NhMik7 CiAgICAgICByZXR1cm47CiAgICAgfQogCi0gIHJlbGF0aW9uX2tpbmQgY3VyciA9IHF1ZXJ5X3Jl bGF0aW9uIChiYiwgc3NhMSwgc3NhMik7Ci0gIGlmIChjdXJyICE9IFZSRUxfVkFSWUlORykKLSAg ICBrID0gcmVsYXRpb25faW50ZXJzZWN0IChjdXJyLCBrKTsKLQogICBiaXRtYXBfc2V0X2JpdCAo bV9yZWxhdGlvbnMubV9uYW1lcywgU1NBX05BTUVfVkVSU0lPTiAoc3NhMSkpOwogICBiaXRtYXBf c2V0X2JpdCAobV9yZWxhdGlvbnMubV9uYW1lcywgU1NBX05BTUVfVkVSU0lPTiAoc3NhMikpOwog ICByZWxhdGlvbl9jaGFpbiAqcHRyID0gKHJlbGF0aW9uX2NoYWluICopIG9ic3RhY2tfYWxsb2Mg KCZtX2NoYWluX29ic3RhY2ssCg== --------------dUjUz2lzNVYsgkZUinBUo0eA Content-Type: text/x-patch; charset=UTF-8; name="gcc12-pr105458.patch" Content-Disposition: attachment; filename="gcc12-pr105458.patch" Content-Transfer-Encoding: base64 Y29tbWl0IGM0OGZlOGQzNDMwZTgxZGRlYTYyMWMyNGU5YjY2ZDU1YWFkZmIzMTYKQXV0aG9yOiBB bmRyZXcgTWFjTGVvZCA8YW1hY2xlb2RAcmVkaGF0LmNvbT4KRGF0ZTogICBUdWUgTWF5IDE3IDA5 OjM2OjM5IDIwMjIgLTA0MDAKCiAgICBDaGVjayBmb3IgZXF1aXZhbGVuY2UgYWZ0ZXIgbWVyZ2lu ZyByZWxhdGlvbnMuCiAgICAKICAgIFdoZW4gcmVnaXN0ZXJpbmcgYSByZWxhdGlvbiwgd2UgbmVl ZCB0byBtZXJnZSB3aXRoIGFueSBleGlzdGluZyByZWxhdGlvbgogICAgYmVmb3JlIGNoZWNraW5n IGlmIGl0IHdhcyBhbiBlcXVpdmFsZW5jZS4uLiBvdGhlcndpc2UgaXQgd2FzIG5vdCBiZWluZwog ICAgaGFuZGxlZCBwcm9wZXJseS4KICAgIAogICAgICAgICAgICBnY2MvCiAgICAgICAgICAgIFBS IHRyZWUtb3B0aW1pemF0aW9uLzEwNTQ1OAogICAgICAgICAgICAqIHZhbHVlLXJlbGF0aW9uLmNj IChwYXRoX29yYWNsZTo6cmVnaXN0ZXJfcmVsYXRpb24pOiBNZXJnZSwgdGhlbiBjaGVjawogICAg ICAgICAgICBmb3IgZXF1aXZhbGVuY2UuCiAgICAKICAgICAgICAgICAgZ2NjL3Rlc3RzdWl0ZS8K ICAgICAgICAgICAgKiBnY2MuZGcvcHIxMDU0NTguYzogTmV3LgoKZGlmZiAtLWdpdCBhL2djYy90 ZXN0c3VpdGUvZ2NjLmRnL3ByMTA1NDU4LmMgYi9nY2MvdGVzdHN1aXRlL2djYy5kZy9wcjEwNTQ1 OC5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi5lYjU4YmYyMWYzMgot LS0gL2Rldi9udWxsCisrKyBiL2djYy90ZXN0c3VpdGUvZ2NjLmRnL3ByMTA1NDU4LmMKQEAgLTAs MCArMSwyMCBAQAorLyogUFIgdHJlZS1vcHRpbWl6YXRpb24vMTA1NDU4ICovCisvKiB7IGRnLWRv IGNvbXBpbGUgfSAqLworLyogeyBkZy1vcHRpb25zICItTzEgLWZleHBlbnNpdmUtb3B0aW1pemF0 aW9ucyAtZm5vLXRyZWUtZG9taW5hdG9yLW9wdHMgIiB9ICovCisKK3ZvaWQKK3lqIChpbnQgajQp Cit7CisgIGludCB0MzsKKworICBmb3IgKHQzID0gMDsgdDMgPCA2OyArK3QzKQorICAgIHsKKyAg ICAgIHNob3J0IGludCB2NCA9IHQzOworCisgICAgICBpZiAodjQgPT0gajQgfHwgdjQgPiB0MykK KyAgICAgICAgZm9yICg7OykKKyAgICAgICAgICB7CisgICAgICAgICAgfQorICAgIH0KK30KKwpk aWZmIC0tZ2l0IGEvZ2NjL3ZhbHVlLXJlbGF0aW9uLmNjIGIvZ2NjL3ZhbHVlLXJlbGF0aW9uLmNj CmluZGV4IDA3N2FiNDIzMGE3Li5hNjlhZDA4MGU0NyAxMDA2NDQKLS0tIGEvZ2NjL3ZhbHVlLXJl bGF0aW9uLmNjCisrKyBiL2djYy92YWx1ZS1yZWxhdGlvbi5jYwpAQCAtMTM4OCwxNiArMTM4OCwx NiBAQCBwYXRoX29yYWNsZTo6cmVnaXN0ZXJfcmVsYXRpb24gKGJhc2ljX2Jsb2NrIGJiLCByZWxh dGlvbl9raW5kIGssIHRyZWUgc3NhMSwKICAgICAgIGZwcmludGYgKGR1bXBfZmlsZSwgIiAocm9v dDogYmIlZClcbiIsIGJiLT5pbmRleCk7CiAgICAgfQogCisgIHJlbGF0aW9uX2tpbmQgY3VyciA9 IHF1ZXJ5X3JlbGF0aW9uIChiYiwgc3NhMSwgc3NhMik7CisgIGlmIChjdXJyICE9IFZSRUxfTk9O RSkKKyAgICBrID0gcmVsYXRpb25faW50ZXJzZWN0IChjdXJyLCBrKTsKKwogICBpZiAoayA9PSBF UV9FWFBSKQogICAgIHsKICAgICAgIHJlZ2lzdGVyX2VxdWl2IChiYiwgc3NhMSwgc3NhMik7CiAg ICAgICByZXR1cm47CiAgICAgfQogCi0gIHJlbGF0aW9uX2tpbmQgY3VyciA9IHF1ZXJ5X3JlbGF0 aW9uIChiYiwgc3NhMSwgc3NhMik7Ci0gIGlmIChjdXJyICE9IFZSRUxfTk9ORSkKLSAgICBrID0g cmVsYXRpb25faW50ZXJzZWN0IChjdXJyLCBrKTsKLQogICBiaXRtYXBfc2V0X2JpdCAobV9yZWxh dGlvbnMubV9uYW1lcywgU1NBX05BTUVfVkVSU0lPTiAoc3NhMSkpOwogICBiaXRtYXBfc2V0X2Jp dCAobV9yZWxhdGlvbnMubV9uYW1lcywgU1NBX05BTUVfVkVSU0lPTiAoc3NhMikpOwogICByZWxh dGlvbl9jaGFpbiAqcHRyID0gKHJlbGF0aW9uX2NoYWluICopIG9ic3RhY2tfYWxsb2MgKCZtX2No YWluX29ic3RhY2ssCg== --------------dUjUz2lzNVYsgkZUinBUo0eA--