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 2A49C3858D1E for ; Thu, 9 Nov 2023 18:25:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2A49C3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2A49C3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699554351; cv=none; b=ZAKosR2miTokkvB7mwANwpZjqIsCbNUwOU+T+tsb7ilCr4WQ3IO0eqwtPsM0pT0WoNHj+GdWjHISdx7qDbiAAy7H9qDGuSCtsw71XF5/LGklgdt5alRNoWWwFalpJX7du5vKytePAk2IGCDlvq4pT0jWJograKQivAglcbQwUOc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699554351; c=relaxed/simple; bh=Pq8AVYp7p2EdOMmVRd7YX4hWLiE2JsVD33zjtQlGlYc=; h=DKIM-Signature:Message-ID:Date:MIME-Version:From:Subject:To; b=KabdZu023HHjgf3Zuc01oekAzm1MZYa1jwI7Z9zHORAHsDgNIaLAZ/6RuO7I3BDdaffmnhzxVhFV2PBtoWsbM8/URAc7GRiVfqsvEB1LgDkcyKYzMlgFTG2diupy0Wmumh+8jMYD7RT/YuixXOOsG75bbSrIMZJkYim6LFEdKT0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699554349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=cdv6p0F4DKiMvjc4ah/eYidydfblDjwV8s+xpMt+ITU=; b=FDgAaJeX0Cj6Jgr5fPgJGILqrUH/x8uAdW8rHki2tjnHb0Gm/rcQ6Cs0O/D4R8zPeQE7jW qQmpnfcxtgvKcY/VyYyA57wCaiD9U1E3WNTbuSfEfbGNGUdG6IhtAL1jBO/ipQhAwCNs5b PodgVkeos8R/Ys50sQ6JnBMB9+Og1JM= Received: from mail-oo1-f71.google.com (mail-oo1-f71.google.com [209.85.161.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-610-MddSu2BxPGmbqyAKMUiUrg-1; Thu, 09 Nov 2023 13:25:48 -0500 X-MC-Unique: MddSu2BxPGmbqyAKMUiUrg-1 Received: by mail-oo1-f71.google.com with SMTP id 006d021491bc7-587b3885465so1062099eaf.1 for ; Thu, 09 Nov 2023 10:25:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699554347; x=1700159147; h=to:subject:from:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=a6rVDCQ6g0FrxdAbTZlqyIzAl39JsTPbGBPIt6dT3xI=; b=UQkjXDp/i4ww/5CiJnuB0+X2L9KbBRL5IIBCcucVwX6yjlRR8tkUxUYZfNSgEhADky 6X5xpzatKDgVoAj7jqHNbFwnFhRlGT4iCquV327+cI3qu0Z66VmHBkW9xAjLZ8iQby3x +/EuHDsKwIGoz960VDNKdyC0uC6wSdXO3T7J4fBjMRPV3lJWbJkvhAaNnJf1ndRhjUPu V600Xm5fpxXsbZDf+e4J1oOrudHrN9AOtREckNX3ahq8LgqTQ3lrc7D3A1RUj6E7zDnW cb4xbFzlLBB2EVLSCCnyK9isv/A7R7vFnj+p8eZX6p7KsTY23/tTBWe46itiCdqsBzQ/ AxiQ== X-Gm-Message-State: AOJu0YwVDFXWXS7dP6964KweOAEQSjSFVpD9Ua+S9CABtEM/7/XCPILH NLZN9DT0b99CxQjtqCwTZ5ROo9qmqD5NKXBZPY92iEWFti3T57Xn5da1cBwWbd5cPb7Y5KZI6sz 1UFnsJhfrIU0+khLtpwfaXhnQnmr79oUo1TiVLMCP6Gec1mbrxC6I0X/wuEQ7UNDIpODz9XwehP YH3Q== X-Received: by 2002:a05:6358:7209:b0:16b:858c:1ed8 with SMTP id h9-20020a056358720900b0016b858c1ed8mr4889232rwa.5.1699554346786; Thu, 09 Nov 2023 10:25:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IEHht9Ab8gcrJO8lIKGMSL0GiMF07rftUg/54XWGy5ON3ycEM+DWtCK7ZMza/Y2ZlILNATC4w== X-Received: by 2002:a05:6358:7209:b0:16b:858c:1ed8 with SMTP id h9-20020a056358720900b0016b858c1ed8mr4889218rwa.5.1699554346235; Thu, 09 Nov 2023 10:25:46 -0800 (PST) Received: from [192.168.1.88] (23-233-12-249.cpe.pppoe.ca. [23.233.12.249]) by smtp.gmail.com with ESMTPSA id k5-20020ac80745000000b004198d026be6sm2148324qth.35.2023.11.09.10.25.45 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 09 Nov 2023 10:25:45 -0800 (PST) Message-ID: <0430c00f-f8b4-dd19-4e47-e76a3e9dccb0@redhat.com> Date: Thu, 9 Nov 2023 13:25:44 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 From: Vladimir Makarov Subject: [pushed] [IRA]: Fixing conflict calculation from region landing pads. To: "gcc-patches@gcc.gnu.org" X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="------------oXKnnmgzJnCNmMDIprN26r0I" Content-Language: en-US X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 List-Id: This is a multi-part message in MIME format. --------------oXKnnmgzJnCNmMDIprN26r0I Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit This is one more patch for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110215 The patch was successfully tested and bootstrapped on x86-64, aarch64, ppc64le. --------------oXKnnmgzJnCNmMDIprN26r0I Content-Type: text/x-patch; charset=UTF-8; name="pr110215-2.patch" Content-Disposition: attachment; filename="pr110215-2.patch" Content-Transfer-Encoding: base64 Y29tbWl0IGRmMTRmMWMwNTgyY2Q2NzQyYTM3YWJmM2E5N2Y0YzRiZjBjYWY4NjQKQXV0aG9yOiBW bGFkaW1pciBOLiBNYWthcm92IDx2bWFrYXJvdkByZWRoYXQuY29tPgpEYXRlOiAgIFRodSBOb3Yg OSAwODo1MToxNSAyMDIzIC0wNTAwCgogICAgW0lSQV06IEZpeGluZyBjb25mbGljdCBjYWxjdWxh dGlvbiBmcm9tIHJlZ2lvbiBsYW5kaW5nIHBhZHMuCiAgICAKICAgIFRoZSBmb2xsb3dpbmcgcGF0 Y2ggZml4ZXMgY29uZmxpY3QgY2FsY3VsYXRpb24gZnJvbSBleGNlcHRpb24gbGFuZGluZwogICAg cGFkcy4gIFRoZSBwcmV2aW91cyBwYXRjaCBwcm9jZXNzZWQgb25seSBvbmUgbmV3bHkgY3JlYXRl ZCBsYW5kaW5nIHBhZC4KICAgIEJlc2lkZXMgaXQgd2FzIHdyb25nLCBpdCBhbHNvIHJlc3VsdGVk IGluIGxhcmdlIG1lbW9yeSBjb25zdW1wdGlvbiBieSBJUkEuCiAgICAKICAgIGdjYy9DaGFuZ2VM b2c6CiAgICAKICAgICAgICAgICAgUFIgcnRsLW9wdGltaXphdGlvbi8xMTAyMTUKICAgICAgICAg ICAgKiBpcmEtbGl2ZXMuY2M6IChhZGRfY29uZmxpY3RfZnJvbV9yZWdpb25fbGFuZGluZ19wYWRz KTogTmV3CiAgICAgICAgICAgIGZ1bmN0aW9uLgogICAgICAgICAgICAocHJvY2Vzc19iYl9ub2Rl X2xpdmVzKTogVXNlIGl0LgoKZGlmZiAtLWdpdCBhL2djYy9pcmEtbGl2ZXMuY2MgYi9nY2MvaXJh LWxpdmVzLmNjCmluZGV4IGJjODQ5Mzg1NmE0Li44MWFmNWMwNjQ2MCAxMDA2NDQKLS0tIGEvZ2Nj L2lyYS1saXZlcy5jYworKysgYi9nY2MvaXJhLWxpdmVzLmNjCkBAIC0xMjE0LDYgKzEyMTQsMzIg QEAgcHJvY2Vzc19vdXRfb2ZfcmVnaW9uX2VoX3JlZ3MgKGJhc2ljX2Jsb2NrIGJiKQogCiAjZW5k aWYKIAorLyogQWRkIGNvbmZsaWN0cyBmb3Igb2JqZWN0IE9CSiBmcm9tIFJFR0lPTiBsYW5kaW5n IHBhZHMgdXNpbmcgQ0FMTEVFX0FCSS4gICovCitzdGF0aWMgdm9pZAorYWRkX2NvbmZsaWN0X2Zy b21fcmVnaW9uX2xhbmRpbmdfcGFkcyAoZWhfcmVnaW9uIHJlZ2lvbiwgaXJhX29iamVjdF90IG9i aiwKKwkJCQkgICAgICAgZnVuY3Rpb25fYWJpIGNhbGxlZV9hYmkpCit7CisgIGlyYV9hbGxvY25v X3QgYSA9IE9CSkVDVF9BTExPQ05PIChvYmopOworICBydHhfY29kZV9sYWJlbCAqbGFuZGluZ19s YWJlbDsKKyAgYmFzaWNfYmxvY2sgbGFuZGluZ19iYjsKKworICBmb3IgKGVoX2xhbmRpbmdfcGFk IGxwID0gcmVnaW9uLT5sYW5kaW5nX3BhZHM7IGxwIDsgbHAgPSBscC0+bmV4dF9scCkKKyAgICB7 CisgICAgICBpZiAoKGxhbmRpbmdfbGFiZWwgPSBscC0+bGFuZGluZ19wYWQpICE9IE5VTEwKKwkg ICYmIChsYW5kaW5nX2JiID0gQkxPQ0tfRk9SX0lOU04gKGxhbmRpbmdfbGFiZWwpKSAhPSBOVUxM CisJICAmJiAocmVnaW9uLT50eXBlICE9IEVSVF9DTEVBTlVQCisJICAgICAgfHwgYml0bWFwX2Jp dF9wIChkZl9nZXRfbGl2ZV9pbiAobGFuZGluZ19iYiksCisJCQkgICAgICAgQUxMT0NOT19SRUdO TyAoYSkpKSkKKwl7CisJICBIQVJEX1JFR19TRVQgbmV3X2NvbmZsaWN0X3JlZ3MKKwkgICAgPSBj YWxsZWVfYWJpLm1vZGVfY2xvYmJlcnMgKEFMTE9DTk9fTU9ERSAoYSkpOworCSAgT0JKRUNUX0NP TkZMSUNUX0hBUkRfUkVHUyAob2JqKSB8PSBuZXdfY29uZmxpY3RfcmVnczsKKwkgIE9CSkVDVF9U T1RBTF9DT05GTElDVF9IQVJEX1JFR1MgKG9iaikgfD0gbmV3X2NvbmZsaWN0X3JlZ3M7CisJICBy ZXR1cm47CisJfQorICAgIH0KK30KKwogLyogUHJvY2VzcyBpbnNucyBvZiB0aGUgYmFzaWMgYmxv Y2sgZ2l2ZW4gYnkgaXRzIExPT1BfVFJFRV9OT0RFIHRvCiAgICB1cGRhdGUgYWxsb2NubyBsaXZl IHJhbmdlcywgYWxsb2NubyBoYXJkIHJlZ2lzdGVyIGNvbmZsaWN0cywKICAgIGludGVyc2VjdGVk IGNhbGxzLCBhbmQgcmVnaXN0ZXIgcHJlc3N1cmUgaW5mbyBmb3IgYWxsb2Nub3MgZm9yIHRoZQpA QCAtMTM4NSwyMyArMTQxMSw5IEBAIHByb2Nlc3NfYmJfbm9kZV9saXZlcyAoaXJhX2xvb3BfdHJl ZV9ub2RlX3QgbG9vcF90cmVlX25vZGUpCiAJCSAgICAgIFNFVF9IQVJEX1JFR19TRVQgKE9CSkVD VF9UT1RBTF9DT05GTElDVF9IQVJEX1JFR1MgKG9iaikpOwogCQkgICAgfQogCQkgIGVoX3JlZ2lv biByOwotCQkgIGVoX2xhbmRpbmdfcGFkIGxwOwotCQkgIHJ0eF9jb2RlX2xhYmVsICpsYW5kaW5n X2xhYmVsOwotCQkgIGJhc2ljX2Jsb2NrIGxhbmRpbmdfYmI7CiAJCSAgaWYgKGNhbl90aHJvd19p bnRlcm5hbCAoaW5zbikKLQkJICAgICAgJiYgKHIgPSBnZXRfZWhfcmVnaW9uX2Zyb21fcnR4IChp bnNuKSkgIT0gTlVMTAotCQkgICAgICAmJiAobHAgPSBnZW5fZWhfbGFuZGluZ19wYWQgKHIpKSAh PSBOVUxMCi0JCSAgICAgICYmIChsYW5kaW5nX2xhYmVsID0gbHAtPmxhbmRpbmdfcGFkKSAhPSBO VUxMCi0JCSAgICAgICYmIChsYW5kaW5nX2JiID0gQkxPQ0tfRk9SX0lOU04gKGxhbmRpbmdfbGFi ZWwpKSAhPSBOVUxMCi0JCSAgICAgICYmIChyLT50eXBlICE9IEVSVF9DTEVBTlVQCi0JCQkgIHx8 IGJpdG1hcF9iaXRfcCAoZGZfZ2V0X2xpdmVfaW4gKGxhbmRpbmdfYmIpLAotCQkJCQkgICBBTExP Q05PX1JFR05PIChhKSkpKQotCQkgICAgewotCQkgICAgICBIQVJEX1JFR19TRVQgbmV3X2NvbmZs aWN0X3JlZ3MKLQkJCT0gY2FsbGVlX2FiaS5tb2RlX2Nsb2JiZXJzIChBTExPQ05PX01PREUgKGEp KTsKLQkJICAgICAgT0JKRUNUX0NPTkZMSUNUX0hBUkRfUkVHUyAob2JqKSB8PSBuZXdfY29uZmxp Y3RfcmVnczsKLQkJICAgICAgT0JKRUNUX1RPVEFMX0NPTkZMSUNUX0hBUkRfUkVHUyAob2JqKSB8 PSBuZXdfY29uZmxpY3RfcmVnczsKLQkJICAgIH0KKwkJICAgICAgJiYgKHIgPSBnZXRfZWhfcmVn aW9uX2Zyb21fcnR4IChpbnNuKSkgIT0gTlVMTCkKKwkJICAgIGFkZF9jb25mbGljdF9mcm9tX3Jl Z2lvbl9sYW5kaW5nX3BhZHMgKHIsIG9iaiwgY2FsbGVlX2FiaSk7CiAJCSAgaWYgKHNwYXJzZXNl dF9iaXRfcCAoYWxsb2Nub3NfcHJvY2Vzc2VkLCBudW0pKQogCQkgICAgY29udGludWU7CiAJCSAg c3BhcnNlc2V0X3NldF9iaXQgKGFsbG9jbm9zX3Byb2Nlc3NlZCwgbnVtKTsK --------------oXKnnmgzJnCNmMDIprN26r0I--