From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by sourceware.org (Postfix) with ESMTPS id E81BA385771F; Wed, 5 Jul 2023 20:37:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E81BA385771F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1688589419; x=1689194219; i=anlauf@gmx.de; bh=4N7Yow4byPXUFU96sqSxba9lIaAnHed0flChMsQsOhw=; h=X-UI-Sender-Class:Date:Subject:To:References:From:In-Reply-To; b=RpAgOzZhnZsx1vcpiy3Y0Bv+Z+D79qicgnzFkcph30TVocevVEQFeMa3XncPS6yC+brJbgH abvEzVL54qo7DZc9zluBQX9sPAMfEETcCsMoCNdHkFXFx8lYN0MqcTM3Cj1KEOCEgL7toryZb QOKMUCT4wfC6Yf3qgGmXQg2kT7PaoZP73ZgviMEhsPaU3xcxw7dtAiNTc1xanqh9VOCqOlUJx KYhuDhgM3+s6SayYt9iDzBMC+c2QcZzgFlcLIF0tZDdyv9k+5ZIKOa4BX48aHsnCyE5ZtbjN8 44rHyhCocY3GQvDUSfTmWgYnWymOTEeMngqcLaj2F0GWq2KP+/sQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [192.168.178.29] ([79.232.152.4]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MDQic-1q7pZV0RqY-00ASW9; Wed, 05 Jul 2023 22:36:59 +0200 Content-Type: multipart/mixed; boundary="------------KjS10ShNaSXnM0gusSLPcqEc" Message-ID: Date: Wed, 5 Jul 2023 22:36:57 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH] Fortran: fixes for procedures with ALLOCATABLE,INTENT(OUT) arguments [PR92178] To: Mikael Morin , fortran , gcc-patches Newsgroups: gmane.comp.gcc.patches,gmane.comp.gcc.fortran References: <5a5306ae-0db1-c7e2-e744-a3beced17636@orange.fr> <3adc2904-9876-74d6-2b5d-3cc1896866c3@gmx.de> <3e31cc66-b7ae-adb0-f1a8-18b8bcc11c46@orange.fr> Content-Language: en-US From: Harald Anlauf In-Reply-To: X-Provags-ID: V03:K1:G76GtlbTBevs9u88SgvYnhuluMRRlyqncwdn3f+GfuZCBsdnLjC KHpVHfmm5XoRl+CF6Mwx2RKODxjViCZ9OM5LG3HCNhosDsf5Ge1nCecqct8KgbLlLQ9Lpa+ 7NdOzjeDX+sliyIJ83yLpofJS8JZ90JepDBqSGf67BXkCOjSkaYu05AqFjL4k1hrFEZaBlp ZzOvTTGZPj+48ouFlvHqw== UI-OutboundReport: notjunk:1;M01:P0:/iY+PU0KjOw=;luVUGlJ6+UUm5Renvh1JySdyOIh KyxFbTCjI6C0aqJ6UczzeZTYdioBfqNQKXG10XFcyG6FA7S/ZKiForjCH8ytpMFID6vzJEDb7 E+fCEOz+h+30OWXfZIHlg+3BiAdT+jvAkHnpF0DHdJS02dmtNaWv3cVC2lNkcVVBiAdU2EvIw ov/CvEG8cifTFsAWOeU2Lj38s0cPRyTOS5RQV5ewLv/kWjxO7Ef+wHJw4dtyT3u4mIH6NnhML QXqMu10in92EdcDQILlyI/K4yMUln2PW+ohRXGqQbgSjAQt4uE6qXH8jg6/+0J5TNZJM6deYN OxGLd4HumehHLyy7KPpY72PobxwJlMS/kgXrvhXMOnZAxYyMnPu8x2FseCefM5NEqLBUv5j+p c1NW3zPSPiMHpTJVXZSOfyIy7zUV7j6PthuzUu03vhK2hWbpKnbHox8lONsUECsSV2cbJeq9R 5KcOtK8zn94gEvkeTPYkguDLs77WacpywNMtKMFDUDCMbSHK0CxdcEDiBmAFtMtxHIICsP/z2 oLIDdXU4LMS0gJuGJEk4QlBuAolcdLWP/oGk35S92MORiRE3PBwjICJYwQuxfsaYSdsb572Ow zlaJwKMKgdUZGVy3Yo83ZDGaH70wKwiPcYnBT90h1kjRJBfSsVs/j4UxHG1uWWQmjmtvfda7N B/3vAETxO1M3SfIhxPDFEDPoyjdlCS2Qo94dCnBihpRk17nT7q/IzAyKUiXuWSU6z8Jt02RcY JXityfyPh9Xsb5W542xg9U47sDx+hCIuQdmkrvyo8/H/AgvErNQTMSAMvf/4zVleTf+xGoyqp 95Q2xGTO+jY+DVYsXIDgFpDSehdr7eysTlDaT+oCYxXncqGkIXqkHb99itSe00lpk1Tq690bb 0q/qU3zptMYtIkHc8qUYMS5wVPNoYhXpGArLa3EduvDacvLnCdqQahIUehEMZbGAFIB5aIv3D H9oh3XtDFtx9KS2stSkPFXmJJCM= X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,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. --------------KjS10ShNaSXnM0gusSLPcqEc Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Mikael, Am 05.07.23 um 16:54 schrieb Mikael Morin: > Here is an example, admittedly artificial.=C2=A0 Fails with the above ch= ange, > but fails with master as well. > > program p > =C2=A0 implicit none > =C2=A0 type t > =C2=A0=C2=A0=C2=A0 integer :: i > =C2=A0 end type t > =C2=A0 type u > =C2=A0=C2=A0=C2=A0 class(t), allocatable :: ta(:) > =C2=A0 end type u > =C2=A0 type(u), allocatable, target :: c(:) > =C2=A0 c =3D [u([t(1), t(3)]), u([t(4), t(9)])] > =C2=A0 call bar (allocated (c(c(1)%ta(1)%i)%ta), c(c(1)%ta(1)%i)%ta, > allocated (c(c(1)%ta(1)%i)%ta)) > =C2=A0 if (allocated(c(1)%ta)) stop 11 > =C2=A0 if (.not. allocated(c(2)%ta)) stop 12 > contains > =C2=A0 subroutine bar (alloc, x, alloc2) > =C2=A0=C2=A0=C2=A0 logical :: alloc, alloc2 > =C2=A0=C2=A0=C2=A0 class(t), allocatable, intent(out) :: x(:) > =C2=A0=C2=A0=C2=A0 if (allocated (x)) stop 1 > =C2=A0=C2=A0=C2=A0 if (.not. alloc)=C2=A0=C2=A0 stop 2 > =C2=A0=C2=A0=C2=A0 if (.not. alloc2)=C2=A0 stop 3 > =C2=A0 end subroutine bar > end while it looks artificial, it is valid, and IMHO it is a beast... I've played around and added another argument gfc_se *convse to gfc_conv_class_to_class in an attempt to implement what I thought you suggested (to get the .pre/.post separately), but in the end this did not lead to working code. And the tree-dump for your example above is beyond what I can grasp. I've noticed that my attempt does not properly handle the parmse.post; at least this is what the above example shows: there is a small part after the call to bar that should have been executed before that call, which I attribute to .post. But my attempts in moving that part regresses on a couple of testcases with class and intent(out). I am at a loss now. I am attaching the latest version of my patch to give you or Paul or others the opportunity to see what is wrong or add the missing pieces. Thanks for your help so far. Harald --------------KjS10ShNaSXnM0gusSLPcqEc Content-Type: text/x-patch; charset=UTF-8; name="pr92178-v2.diff" Content-Disposition: attachment; filename="pr92178-v2.diff" Content-Transfer-Encoding: base64 RnJvbSA5ODkwMzBmYzA0ZWFjZjk3YTAzNGFiMWY3ZWQ4NWI5MzI2NjlmODJkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBIYXJhbGQgQW5sYXVmIDxhbmxhdWZAZ214LmRlPgpE YXRlOiBXZWQsIDUgSnVsIDIwMjMgMjI6MjE6MDkgKzAyMDAKU3ViamVjdDogW1BBVENIXSBG b3J0cmFuOiBmaXhlcyBmb3IgcHJvY2VkdXJlcyB3aXRoIEFMTE9DQVRBQkxFLElOVEVOVChP VVQpCiBhcmd1bWVudHMgW1BSOTIxNzhdCgpnY2MvZm9ydHJhbi9DaGFuZ2VMb2c6CgoJUFIg Zm9ydHJhbi85MjE3OAoJKiB0cmFucy1leHByLmNjIChnZmNfY29udl9wcm9jZWR1cmVfY2Fs bCk6IENoZWNrIHByb2NlZHVyZXMgZm9yCglhbGxvY2F0YWJsZSBkdW1teSBhcmd1bWVudHMg d2l0aCBJTlRFTlQoT1VUKSBhbmQgbW92ZSBkZWFsbG9jYXRpb24KCW9mIGFjdHVhbCBhcmd1 bWVudHMgYWZ0ZXIgZXZhbHVhdGlvbiBvZiBhcmd1bWVudCBleHByZXNzaW9ucyBiZWZvcmUK CXRoZSBwcm9jZWR1cmUgaXMgZXhlY3V0ZWQuCgpnY2MvdGVzdHN1aXRlL0NoYW5nZUxvZzoK CglQUiBmb3J0cmFuLzkyMTc4CgkqIGdmb3J0cmFuLmRnL2ludGVudF9vdXRfMTYuZjkwOiBO ZXcgdGVzdC4KCSogZ2ZvcnRyYW4uZGcvaW50ZW50X291dF8xNy5mOTA6IE5ldyB0ZXN0LgoJ KiBnZm9ydHJhbi5kZy9pbnRlbnRfb3V0XzE4LmY5MDogTmV3IHRlc3QuCgpDby1hdXRob3Jl ZC1ieTogU3RldmVuIEcuIEthcmdsIDxrYXJnbEBnY2MuZ251Lm9yZz4KLS0tCiBnY2MvZm9y dHJhbi90cmFucy1leHByLmNjICAgICAgICAgICAgICAgICAgIHwgNTQgKysrKysrKysrKyst LQogZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9pbnRlbnRfb3V0XzE2LmY5MCB8IDg5ICsr KysrKysrKysrKysrKysrKysrKwogZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9pbnRlbnRf b3V0XzE3LmY5MCB8IDQ2ICsrKysrKysrKysrCiBnY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRn L2ludGVudF9vdXRfMTguZjkwIHwgMzEgKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAyMTUg aW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBnY2Mv dGVzdHN1aXRlL2dmb3J0cmFuLmRnL2ludGVudF9vdXRfMTYuZjkwCiBjcmVhdGUgbW9kZSAx MDA2NDQgZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9pbnRlbnRfb3V0XzE3LmY5MAogY3Jl YXRlIG1vZGUgMTAwNjQ0IGdjYy90ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcvaW50ZW50X291dF8x OC5mOTAKCmRpZmYgLS1naXQgYS9nY2MvZm9ydHJhbi90cmFucy1leHByLmNjIGIvZ2NjL2Zv cnRyYW4vdHJhbnMtZXhwci5jYwppbmRleCAzMDk0NmJhM2Y2My4uNzAxN2I2NTJkNmUgMTAw NjQ0Ci0tLSBhL2djYy9mb3J0cmFuL3RyYW5zLWV4cHIuY2MKKysrIGIvZ2NjL2ZvcnRyYW4v dHJhbnMtZXhwci5jYwpAQCAtNjA4NSw5ICs2MDg1LDEwIEBAIGdmY19jb252X3Byb2NlZHVy ZV9jYWxsIChnZmNfc2UgKiBzZSwgZ2ZjX3N5bWJvbCAqIHN5bSwKICAgZWxzZQogICAgIGlu Zm8gPSBOVUxMOwogCi0gIHN0bXRibG9ja190IHBvc3QsIGNsb2JiZXJzOworICBzdG10Ymxv Y2tfdCBwb3N0LCBjbG9iYmVycywgZGVhbGxvY19ibGs7CiAgIGdmY19pbml0X2Jsb2NrICgm cG9zdCk7CiAgIGdmY19pbml0X2Jsb2NrICgmY2xvYmJlcnMpOworICBnZmNfaW5pdF9ibG9j ayAoJmRlYWxsb2NfYmxrKTsKICAgZ2ZjX2luaXRfaW50ZXJmYWNlX21hcHBpbmcgKCZtYXBw aW5nKTsKICAgaWYgKCFjb21wKQogICAgIHsKQEAgLTYxMTcsNiArNjExOCwzMiBAQCBnZmNf Y29udl9wcm9jZWR1cmVfY2FsbCAoZ2ZjX3NlICogc2UsIGdmY19zeW1ib2wgKiBzeW0sCiAJ ICAgICAgICYmIFVOTElNSVRFRF9QT0xZIChzeW0pCiAJICAgICAgICYmIGNvbXAgJiYgKHN0 cmNtcCAoIl9jb3B5IiwgY29tcC0+bmFtZSkgPT0gMCk7CiAKKyAgLyogU2NhbiBmb3IgYWxs b2NhdGFibGUgYWN0dWFsIGFyZ3VtZW50cyBwYXNzZWQgdG8gYWxsb2NhdGFibGUgZHVtbXkK KyAgICAgYXJndW1lbnRzIHdpdGggSU5URU5UKE9VVCkuICBBcyB0aGUgY29ycmVzcG9uZGlu ZyBhY3R1YWwgYXJndW1lbnRzIGFyZQorICAgICBkZWFsbG9jYXRlZCBiZWZvcmUgZXhlY3V0 aW9uIG9mIHRoZSBwcm9jZWR1cmUsIHdlIGV2YWx1YXRlIGFjdHVhbAorICAgICBhcmd1bWVu dCBleHByZXNzaW9ucyB0byBhdm9pZCBwcm9ibGVtcyB3aXRoIHBvc3NpYmxlIGRlcGVuZGVu Y2llcy4gICovCisgIGJvb2wgZm9yY2VfZXZhbF9hcmdzID0gZmFsc2U7CisgIGdmY19mb3Jt YWxfYXJnbGlzdCAqdG1wX2Zvcm1hbDsKKyAgZm9yIChhcmcgPSBhcmdzLCB0bXBfZm9ybWFs ID0gZm9ybWFsOyBhcmcgIT0gTlVMTDsKKyAgICAgICBhcmcgPSBhcmctPm5leHQsIHRtcF9m b3JtYWwgPSB0bXBfZm9ybWFsID8gdG1wX2Zvcm1hbC0+bmV4dCA6IE5VTEwpCisgICAgewor ICAgICAgZSA9IGFyZy0+ZXhwcjsKKyAgICAgIGZzeW0gPSB0bXBfZm9ybWFsID8gdG1wX2Zv cm1hbC0+c3ltIDogTlVMTDsKKyAgICAgIGlmIChlICYmIGZzeW0KKwkgICYmIGUtPmV4cHJf dHlwZSA9PSBFWFBSX1ZBUklBQkxFCisJICAmJiBmc3ltLT5hdHRyLmludGVudCA9PSBJTlRF TlRfT1VUCisJICAmJiAoZnN5bS0+dHMudHlwZSA9PSBCVF9DTEFTUyAmJiBmc3ltLT5hdHRy LmNsYXNzX29rCisJICAgICAgPyBDTEFTU19EQVRBIChmc3ltKS0+YXR0ci5hbGxvY2F0YWJs ZQorCSAgICAgIDogZnN5bS0+YXR0ci5hbGxvY2F0YWJsZSkKKwkgICYmIGUtPnN5bXRyZWUK KwkgICYmIGUtPnN5bXRyZWUtPm4uc3ltCisJICAmJiBnZmNfdmFyaWFibGVfYXR0ciAoZSwg TlVMTCkuYWxsb2NhdGFibGUpCisJeworCSAgZm9yY2VfZXZhbF9hcmdzID0gdHJ1ZTsKKwkg IGJyZWFrOworCX0KKyAgICB9CisKICAgLyogRXZhbHVhdGUgdGhlIGFyZ3VtZW50cy4gICov CiAgIGZvciAoYXJnID0gYXJncywgYXJnYyA9IDA7IGFyZyAhPSBOVUxMOwogICAgICAgIGFy ZyA9IGFyZy0+bmV4dCwgZm9ybWFsID0gZm9ybWFsID8gZm9ybWFsLT5uZXh0IDogTlVMTCwg KythcmdjKQpAQCAtNjY4MCw3ICs2NzA3LDcgQEAgZ2ZjX2NvbnZfcHJvY2VkdXJlX2NhbGwg KGdmY19zZSAqIHNlLCBnZmNfc3ltYm9sICogc3ltLAogCQkgICAgICBlbHNlCiAJCQl0bXAg PSBnZmNfZmluaXNoX2Jsb2NrICgmYmxvY2spOwogCi0JCSAgICAgIGdmY19hZGRfZXhwcl90 b19ibG9jayAoJnNlLT5wcmUsIHRtcCk7CisJCSAgICAgIGdmY19hZGRfZXhwcl90b19ibG9j ayAoJmRlYWxsb2NfYmxrLCB0bXApOwogCQkgICAgfQogCiAJCSAgLyogQSBjbGFzcyBhcnJh eSBlbGVtZW50IG5lZWRzIGNvbnZlcnRpbmcgYmFjayB0byBiZSBhCkBAIC02Nzc2LDYgKzY4 MDMsNyBAQCBnZmNfY29udl9wcm9jZWR1cmVfY2FsbCAoZ2ZjX3NlICogc2UsIGdmY19zeW1i b2wgKiBzeW0sCiAJICAgICAgLyogUGFzcyBhIGNsYXNzIGFycmF5LiAgKi8KIAkgICAgICBw YXJtc2UudXNlX29mZnNldCA9IDE7CiAJICAgICAgZ2ZjX2NvbnZfZXhwcl9kZXNjcmlwdG9y ICgmcGFybXNlLCBlKTsKKwkgICAgICBib29sIGRlZmVyX3RvX2RlYWxsb2NfYmxrID0gZmFs c2U7CiAKIAkgICAgICAvKiBJZiBhbiBBTExPQ0FUQUJMRSBkdW1teSBhcmd1bWVudCBoYXMg SU5URU5UKE9VVCkgYW5kIGlzCiAJCSBhbGxvY2F0ZWQgb24gZW50cnksIGl0IG11c3QgYmUg ZGVhbGxvY2F0ZWQuICAqLwpAQCAtNjgxNiw3ICs2ODQ0LDggQEAgZ2ZjX2NvbnZfcHJvY2Vk dXJlX2NhbGwgKGdmY19zZSAqIHNlLCBnZmNfc3ltYm9sICogc3ltLAogCQkgIGVsc2UKIAkJ ICAgIHRtcCA9IGdmY19maW5pc2hfYmxvY2sgKCZibG9jayk7CiAKLQkJICBnZmNfYWRkX2V4 cHJfdG9fYmxvY2sgKCZzZS0+cHJlLCB0bXApOworCQkgIGdmY19hZGRfZXhwcl90b19ibG9j ayAoJmRlYWxsb2NfYmxrLCB0bXApOworCQkgIGRlZmVyX3RvX2RlYWxsb2NfYmxrID0gdHJ1 ZTsKIAkJfQogCiAJICAgICAgLyogVGhlIGNvbnZlcnNpb24gZG9lcyBub3QgcmVwYWNrYWdl IHRoZSByZWZlcmVuY2UgdG8gYSBjbGFzcwpAQCAtNjgzMCw2ICs2ODU5LDEwIEBAIGdmY19j b252X3Byb2NlZHVyZV9jYWxsIChnZmNfc2UgKiBzZSwgZ2ZjX3N5bWJvbCAqIHN5bSwKIAkJ CQkgICAgICYmIGUtPnN5bXRyZWUtPm4uc3ltLT5hdHRyLm9wdGlvbmFsLAogCQkJCSAgICAg Q0xBU1NfREFUQSAoZnN5bSktPmF0dHIuY2xhc3NfcG9pbnRlcgogCQkJCSAgICAgfHwgQ0xB U1NfREFUQSAoZnN5bSktPmF0dHIuYWxsb2NhdGFibGUpOworCisJICAgICAgLyogRGVmZXIg cmVwYWNrYWdpbmcgYWZ0ZXIgZGVhbGxvY2F0aW9uLiAgKi8KKwkgICAgICBpZiAoZGVmZXJf dG9fZGVhbGxvY19ibGspCisJCWdmY19hZGRfYmxvY2tfdG9fYmxvY2sgKCZkZWFsbG9jX2Js aywgJnBhcm1zZS5wcmUpOwogCSAgICB9CiAJICBlbHNlCiAJICAgIHsKQEAgLTY5ODAsNyAr NzAxMyw3IEBAIGdmY19jb252X3Byb2NlZHVyZV9jYWxsIChnZmNfc2UgKiBzZSwgZ2ZjX3N5 bWJvbCAqIHN5bSwKIAkJCQkJYnVpbGRfZW1wdHlfc3RtdCAoaW5wdXRfbG9jYXRpb24pKTsK IAkJICAgICAgfQogCQkgICAgaWYgKHRtcCAhPSBOVUxMX1RSRUUpCi0JCSAgICAgIGdmY19h ZGRfZXhwcl90b19ibG9jayAoJnNlLT5wcmUsIHRtcCk7CisJCSAgICAgIGdmY19hZGRfZXhw cl90b19ibG9jayAoJmRlYWxsb2NfYmxrLCB0bXApOwogCQkgIH0KIAogCQkgIHRtcCA9IHBh cm1zZS5leHByOwpAQCAtNzAwNCw3ICs3MDM3LDcgQEAgZ2ZjX2NvbnZfcHJvY2VkdXJlX2Nh bGwgKGdmY19zZSAqIHNlLCBnZmNfc3ltYm9sICogc3ltLAogCQkJCSAgICAgdm9pZF90eXBl X25vZGUsCiAJCQkJICAgICBnZmNfY29udl9leHByX3ByZXNlbnQgKGUtPnN5bXRyZWUtPm4u c3ltKSwKIAkJCQkgICAgICAgdG1wLCBidWlsZF9lbXB0eV9zdG10IChpbnB1dF9sb2NhdGlv bikpOwotCQkgIGdmY19hZGRfZXhwcl90b19ibG9jayAoJnNlLT5wcmUsIHRtcCk7CisJCSAg Z2ZjX2FkZF9leHByX3RvX2Jsb2NrICgmZGVhbGxvY19ibGssIHRtcCk7CiAJCX0KIAkgICAg fQogCX0KQEAgLTcxMDEsNiArNzEzNCwxNiBAQCBnZmNfY29udl9wcm9jZWR1cmVfY2FsbCAo Z2ZjX3NlICogc2UsIGdmY19zeW1ib2wgKiBzeW0sCiAJICAgIH0KIAl9CiAKKyAgICAgIC8q IElmIGFueSBhY3R1YWwgYXJndW1lbnQgb2YgdGhlIHByb2NlZHVyZSBpcyBhbGxvY2F0YWJs ZSBhbmQgcGFzc2VkCisJIHRvIGFuIGFsbG9jYXRhYmxlIGR1bW15IHdpdGggSU5URU5UKE9V VCksIHdlIGNvbnNlcnZhdGl2ZWx5CisJIGV2YWx1YXRlIGFjdHVhbCBhcmd1bWVudCBleHBy ZXNzaW9ucyBiZWZvcmUgZGVhbGxvY2F0aW9ucyBhcmUKKwkgcGVyZm9ybWVkIGFuZCB0aGUg cHJvY2VkdXJlIGlzIGV4ZWN1dGVkLiAgTWF5IGNyZWF0ZSB0ZW1wb3Jhcmllcy4KKwkgVGhp cyBlbnN1cmVzIHdlIGNvbmZvcm0gdG8gRjIwMjM6MTUuNS4zLCAxNS41LjQuICAqLworICAg ICAgaWYgKGUgJiYgZnN5bSAmJiBmb3JjZV9ldmFsX2FyZ3MKKwkgICYmIGZzeW0tPmF0dHIu aW50ZW50ICE9IElOVEVOVF9PVVQKKwkgICYmICFnZmNfaXNfY29uc3RhbnRfZXhwciAoZSkp CisJcGFybXNlLmV4cHIgPSBnZmNfZXZhbHVhdGVfbm93IChwYXJtc2UuZXhwciwgJnBhcm1z ZS5wcmUpOworCiAgICAgICBpZiAoZnN5bSAmJiBuZWVkX2ludGVyZmFjZV9tYXBwaW5nICYm IGUpCiAJZ2ZjX2FkZF9pbnRlcmZhY2VfbWFwcGluZyAoJm1hcHBpbmcsIGZzeW0sICZwYXJt c2UsIGUpOwogCkBAIC03NDk5LDYgKzc1NDIsNyBAQCBnZmNfY29udl9wcm9jZWR1cmVfY2Fs bCAoZ2ZjX3NlICogc2UsIGdmY19zeW1ib2wgKiBzeW0sCiAgICAgICB2ZWNfc2FmZV9wdXNo IChhcmdsaXN0LCBwYXJtc2UuZXhwcik7CiAgICAgfQogCisgIGdmY19hZGRfYmxvY2tfdG9f YmxvY2sgKCZzZS0+cHJlLCAmZGVhbGxvY19ibGspOwogICBnZmNfYWRkX2Jsb2NrX3RvX2Js b2NrICgmc2UtPnByZSwgJmNsb2JiZXJzKTsKICAgZ2ZjX2ZpbmlzaF9pbnRlcmZhY2VfbWFw cGluZyAoJm1hcHBpbmcsICZzZS0+cHJlLCAmc2UtPnBvc3QpOwogCmRpZmYgLS1naXQgYS9n Y2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2ludGVudF9vdXRfMTYuZjkwIGIvZ2NjL3Rlc3Rz dWl0ZS9nZm9ydHJhbi5kZy9pbnRlbnRfb3V0XzE2LmY5MApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMC4uZThkNjM1ZmVkNTcKLS0tIC9kZXYvbnVsbAorKysgYi9n Y2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2ludGVudF9vdXRfMTYuZjkwCkBAIC0wLDAgKzEs ODkgQEAKKyEgeyBkZy1kbyBydW4gfQorIQorISBQUiBmb3J0cmFuLzkyMTc4CishIFJlLW9y ZGVyIGFyZ3VtZW50IGRlYWxsb2NhdGlvbgorCitwcm9ncmFtIHAKKyAgaW1wbGljaXQgbm9u ZQorICBpbnRlZ2VyLCAgIGFsbG9jYXRhYmxlIDo6IGEoOikKKyAgY2xhc3MoKiksICBhbGxv Y2F0YWJsZSA6OiBjKDopCisgIHR5cGUgdAorICAgIGludGVnZXIsIGFsbG9jYXRhYmxlIDo6 IGEoOikKKyAgZW5kIHR5cGUgdAorICB0eXBlKHQpIDo6IGIKKyAgaW50ZWdlciA6OiBrID0g LTk5OQorCisgICEgVGVzdCBiYXNlZCBvbiBvcmlnaW5hbCBQUgorICBhID0gWzFdCisgIGNh bGwgYXNzaWduIChhLCAobWF4KGEoMSksMCkpKQorICBpZiAoYWxsb2NhdGVkIChhKSkgc3Rv cCA5CisgIGlmIChrIC89IDEpICAgICAgICBzdG9wIDEwCisKKyAgISBBZGRpdGlvbmFsIHZh cmlhdGlvbnMgYmFzZWQgb24gc3VnZ2VzdGlvbnMgYnkgVG9iaWFzIEJ1cm51cworICAhIHRv IGNoZWNrIHRoYXQgYXJndW1lbnQgZXhwcmVzc2lvbnMgYXJlIGV2YWx1YXRlZCBlYXJseSBl bm91Z2gKKyAgYSA9IFsxLCAyXQorICBjYWxsIGZvbyAoYWxsb2NhdGVkIChhKSwgc2l6ZSAo YSksIHRlc3QgKGEpLCBhLCBhbGxvY2F0ZWQgKGEpKQorICBpZiAoYWxsb2NhdGVkIChhKSkg c3RvcCAxMQorCisgIGEgPSBbMSwgMl0KKyAgayA9IDEKKyAgY2FsbCBmb28gKGFsbG9jYXRl ZCAoYSksIHNpemUgKGEpLCB0ZXN0IChrKmEpLCBhLCBhbGxvY2F0ZWQgKGEpKQorICBpZiAo YWxsb2NhdGVkIChhKSkgc3RvcCAxMgorCisgIGIlIGEgPSBbMSwgMl0KKyAgY2FsbCBmb28g KGFsbG9jYXRlZCAoYiUgYSksIHNpemUgKGIlIGEpLCB0ZXN0IChiJSBhKSwgYiUgYSwgYWxs b2NhdGVkIChiJSBhKSkKKyAgaWYgKGFsbG9jYXRlZCAoYiUgYSkpIHN0b3AgMTMKKworICBj ID0gWzMsIDRdCisgIGNhbGwgYmFyIChhbGxvY2F0ZWQgKGMpLCBzaXplIChjKSwgdGVzdDIg KGMpLCBjLCAmCisgICAgICAgICAgICBhbGxvY2F0ZWQgKGMpLCBzaXplIChjKSwgdGVzdDIg KGMpICAgICApCisgIGlmIChhbGxvY2F0ZWQgKGMpKSBzdG9wIDE0CisKK2NvbnRhaW5zCisK KyAgc3Vicm91dGluZSBhc3NpZ24gKGEsIGkpCisgICAgaW50ZWdlciwgYWxsb2NhdGFibGUs IGludGVudChvdXQpIDo6IGEoOikgCisgICAgaW50ZWdlciwgICAgICAgICAgICAgIHZhbHVl ICA6OiBpCisgICAgayA9IGkKKyAgZW5kIHN1YnJvdXRpbmUKKworICBzdWJyb3V0aW5lIGZv byAoYWxsb2MsIHN6LCB0c3QsIHgsIGFsbG9jMikKKyAgICBsb2dpY2FsLCB2YWx1ZSA6OiBh bGxvYywgdHN0CisgICAgaW50ZWdlciwgdmFsdWUgOjogc3oKKyAgICBsb2dpY2FsICAgICAg ICA6OiBhbGxvYzIKKyAgICBpbnRlZ2VyLCBhbGxvY2F0YWJsZSwgaW50ZW50KG91dCkgOjog eCg6KQorICAgIGlmIChhbGxvY2F0ZWQgKHgpKSBzdG9wIDEKKyAgICBpZiAoLm5vdC4gYWxs b2MpICAgc3RvcCAyCisgICAgaWYgKHN6IC89IDIpICAgICAgIHN0b3AgMworICAgIGlmICgu bm90LiB0c3QpICAgICBzdG9wIDQKKyAgICBpZiAoLm5vdC4gYWxsb2MyKSAgc3RvcCAxNQor ICBlbmQgc3Vicm91dGluZSBmb28KKyAgIQorICBsb2dpY2FsIGZ1bmN0aW9uIHRlc3QgKHp6 KQorICAgIGludGVnZXIgOjogenooMikKKyAgICB0ZXN0ID0genooMikgPT0gMgorICBlbmQg ZnVuY3Rpb24gdGVzdAorICAhCisgIHN1YnJvdXRpbmUgYmFyIChhbGxvYywgc3osIHRzdCwg eCwgYWxsb2MyLCBzejIsIHRzdDIpCisgICAgbG9naWNhbCwgdmFsdWUgOjogYWxsb2MsIHRz dCwgYWxsb2MyLCB0c3QyCisgICAgaW50ZWdlciwgdmFsdWUgOjogc3osIHN6MgorICAgIGNs YXNzKCopLCBhbGxvY2F0YWJsZSwgaW50ZW50KG91dCkgOjogeCg6KQorICAgIGlmIChhbGxv Y2F0ZWQgKHgpKSBzdG9wIDUKKyAgICBpZiAoLm5vdC4gYWxsb2MpICAgc3RvcCA2CisgICAg aWYgKHN6IC89IDIpICAgICAgIHN0b3AgNworICAgIGlmICgubm90LiB0c3QpICAgICBzdG9w IDgKKyAgICBpZiAoLm5vdC4gYWxsb2MyKSAgc3RvcCAxNgorICAgIGlmIChzejIgLz0gMikg ICAgICBzdG9wIDE3CisgICAgaWYgKC5ub3QuIHRzdDIpICAgIHN0b3AgMTgKKyAgZW5kIHN1 YnJvdXRpbmUgYmFyCisgICEKKyAgbG9naWNhbCBmdW5jdGlvbiB0ZXN0MiAoenopCisgICAg Y2xhc3MoKiksIGludGVudChpbikgOjogenooOikKKyAgICBzZWxlY3QgdHlwZSAoenopCisg ICAgdHlwZSBpcyAoaW50ZWdlcikKKyAgICAgICB0ZXN0MiA9IHp6KDIpID09IDQKKyAgICBj bGFzcyBkZWZhdWx0CisgICAgICAgc3RvcCA5OQorICAgIGVuZCBzZWxlY3QKKyAgZW5kIGZ1 bmN0aW9uIHRlc3QyCitlbmQKZGlmZiAtLWdpdCBhL2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4u ZGcvaW50ZW50X291dF8xNy5mOTAgYi9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2ludGVu dF9vdXRfMTcuZjkwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi5i YzkyMDhkY2Y2ZAotLS0gL2Rldi9udWxsCisrKyBiL2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4u ZGcvaW50ZW50X291dF8xNy5mOTAKQEAgLTAsMCArMSw0NiBAQAorISB7IGRnLWRvIHJ1biB9 CishCishIFBSIGZvcnRyYW4vOTIxNzgKKyEgQ29udHJpYnV0ZWQgYnkgVG9iaWFzIEJ1cm51 cworCitwcm9ncmFtIGZvbworICBpbXBsaWNpdCBub25lICh0eXBlLCBleHRlcm5hbCkKKwor ICB0eXBlIHQKKyAgZW5kIHR5cGUgdAorCisgIHR5cGUsIGV4dGVuZHModCkgOjogdDIKKyAg ZW5kIHR5cGUgdDIKKworICB0eXBlKHQyKSA6OiB4MgorICBjbGFzcyh0KSwgYWxsb2NhdGFi bGUgOjogYWEKKworICBjYWxsIGNoZWNrX2ludGVudG91dF9mYWxzZShhbGxvY2F0ZWQoYWEp LCBhYSwgJgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbGxvY2F0ZWQoYWEpKQor ICBpZiAoYWxsb2NhdGVkKGFhKSkgc3RvcCAxCisKKyAgYWxsb2NhdGUodDIgOjogYWEpCisg IGlmICgubm90LmFsbG9jYXRlZChhYSkpIHN0b3AgMgorICBpZiAoLm5vdC5zYW1lX3R5cGVf YXMoYWEsIHgyKSkgc3RvcCAzCisgIGNhbGwgY2hlY2tfaW50ZW50b3V0X3RydWUoYWxsb2Nh dGVkKGFhKSwgKHNhbWVfdHlwZV9hcyhhYSwgeDIpKSwgYWEsICYKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICBhbGxvY2F0ZWQoYWEpLCAoc2FtZV90eXBlX2FzKGFhLCB4MikpKQor ICBpZiAoYWxsb2NhdGVkKGFhKSkgc3RvcCA0CisKK2NvbnRhaW5zCisgIHN1YnJvdXRpbmUg Y2hlY2tfaW50ZW50b3V0X2ZhbHNlKGFsbG9jMSwgeXksIGFsbG9jMikKKyAgICBsb2dpY2Fs LCB2YWx1ZSA6OiBhbGxvYzEsIGFsbG9jMgorICAgIGNsYXNzKHQpLCBhbGxvY2F0YWJsZSwg aW50ZW50KG91dCkgOjogeXkKKyAgICBpZiAoYWxsb2NhdGVkKHl5KSkgc3RvcCAxMQorICAg IGlmIChhbGxvYzEpIHN0b3AgMTIKKyAgICBpZiAoYWxsb2MyKSBzdG9wIDEzCisgIGVuZCBz dWJyb3V0aW5lIGNoZWNrX2ludGVudG91dF9mYWxzZQorICBzdWJyb3V0aW5lIGNoZWNrX2lu dGVudG91dF90cnVlKGFsbG9jMSwgc2FtZTEsIHp6LCBhbGxvYzIsIHNhbWUyKQorICAgIGxv Z2ljYWwsIHZhbHVlIDo6IGFsbG9jMSwgYWxsb2MyLCBzYW1lMSwgc2FtZTIKKyAgICBjbGFz cyh0KSwgYWxsb2NhdGFibGUsIGludGVudChvdXQpIDo6IHp6CisgICAgaWYgKGFsbG9jYXRl ZCh6eikpIHN0b3AgMjEKKyAgICBpZiAoLm5vdC5hbGxvYzEpIHN0b3AgMjIKKyAgICBpZiAo Lm5vdC5hbGxvYzIpIHN0b3AgMjMKKyAgICBpZiAoLm5vdC5zYW1lMSkgc3RvcCAyNAorICAg IGlmICgubm90LnNhbWUyKSBzdG9wIDI1CisgIGVuZCBzdWJyb3V0aW5lIGNoZWNrX2ludGVu dG91dF90cnVlCitlbmQgcHJvZ3JhbQpkaWZmIC0tZ2l0IGEvZ2NjL3Rlc3RzdWl0ZS9nZm9y dHJhbi5kZy9pbnRlbnRfb3V0XzE4LmY5MCBiL2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcv aW50ZW50X291dF8xOC5mOTAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAuLjUwZjk5NDhiZjExCi0tLSAvZGV2L251bGwKKysrIGIvZ2NjL3Rlc3RzdWl0ZS9nZm9y dHJhbi5kZy9pbnRlbnRfb3V0XzE4LmY5MApAQCAtMCwwICsxLDMxIEBACishIHsgZGctZG8g cnVuIH0KKyEKKyEgUFIgZm9ydHJhbi85MjE3OAorISBDb250cmlidXRlZCBieSBNaWthZWwg TW9yaW4KKworcHJvZ3JhbSBwCisgIGltcGxpY2l0IG5vbmUKKyAgdHlwZSB0CisgICAgaW50 ZWdlciA6OiBpCisgICAgaW50ZWdlciwgcG9pbnRlciA6OiBwaQorICBlbmQgdHlwZSB0Cisg IGludGVnZXIsIHRhcmdldCA6OiBqCisgIHR5cGUodCksIGFsbG9jYXRhYmxlIDo6IHRhCisg IGogPSAxCisgIHRhID0gdCgyLCBqKQorICBjYWxsIGFzc2lnbih0YSwgaWQodGElcGkpKQor ICBpZiAodGElaSAvPSAxKSBzdG9wIDEKKyAgaWYgKGFzc29jaWF0ZWQodGElcGkpKSBzdG9w IDIKK2NvbnRhaW5zCisgIHN1YnJvdXRpbmUgYXNzaWduKGEsIGIpCisgICAgdHlwZSh0KSwg aW50ZW50KG91dCksIGFsbG9jYXRhYmxlIDo6IGEKKyAgICBpbnRlZ2VyLCBpbnRlbnQoaW4p ICwgdmFsdWUgICAgICAgOjogYgorICAgIGFsbG9jYXRlKGEpCisgICAgYSVpID0gYgorICAg IGElcGkgPT4gbnVsbCgpCisgIGVuZCBzdWJyb3V0aW5lIGFzc2lnbgorICBmdW5jdGlvbiBp ZChhKQorICAgIGludGVnZXIsIHBvaW50ZXIgOjogaWQsIGEKKyAgICBpZCA9PiBhCisgIGVu ZCBmdW5jdGlvbiBpZAorZW5kIHByb2dyYW0gcAotLSAKMi4zNS4zCgo= --------------KjS10ShNaSXnM0gusSLPcqEc-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ciao.gmane.io (ciao.gmane.io [116.202.254.214]) by sourceware.org (Postfix) with ESMTPS id 00A22385696F for ; Wed, 5 Jul 2023 20:37:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 00A22385696F Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=m.gmane-mx.org Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1qH9FI-00054z-V6 for gcc-patches@gcc.gnu.org; Wed, 05 Jul 2023 22:37:04 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: gcc-patches@gcc.gnu.org From: Harald Anlauf Subject: Re: [PATCH] Fortran: fixes for procedures with ALLOCATABLE,INTENT(OUT) arguments [PR92178] Date: Wed, 5 Jul 2023 22:36:57 +0200 Message-ID: References: <5a5306ae-0db1-c7e2-e744-a3beced17636@orange.fr> <3adc2904-9876-74d6-2b5d-3cc1896866c3@gmx.de> <3e31cc66-b7ae-adb0-f1a8-18b8bcc11c46@orange.fr> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------KjS10ShNaSXnM0gusSLPcqEc" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US In-Reply-To: Cc: fortran@gcc.gnu.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,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: Message-ID: <20230705203657.v5hy7z8HSjgpqce47Xw4GaAZ-td6ibXjTVbjS7iLdaA@z> This is a multi-part message in MIME format. --------------KjS10ShNaSXnM0gusSLPcqEc Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi Mikael, Am 05.07.23 um 16:54 schrieb Mikael Morin: > Here is an example, admittedly artificial.  Fails with the above change, > but fails with master as well. > > program p >   implicit none >   type t >     integer :: i >   end type t >   type u >     class(t), allocatable :: ta(:) >   end type u >   type(u), allocatable, target :: c(:) >   c = [u([t(1), t(3)]), u([t(4), t(9)])] >   call bar (allocated (c(c(1)%ta(1)%i)%ta), c(c(1)%ta(1)%i)%ta, > allocated (c(c(1)%ta(1)%i)%ta)) >   if (allocated(c(1)%ta)) stop 11 >   if (.not. allocated(c(2)%ta)) stop 12 > contains >   subroutine bar (alloc, x, alloc2) >     logical :: alloc, alloc2 >     class(t), allocatable, intent(out) :: x(:) >     if (allocated (x)) stop 1 >     if (.not. alloc)   stop 2 >     if (.not. alloc2)  stop 3 >   end subroutine bar > end while it looks artificial, it is valid, and IMHO it is a beast... I've played around and added another argument gfc_se *convse to gfc_conv_class_to_class in an attempt to implement what I thought you suggested (to get the .pre/.post separately), but in the end this did not lead to working code. And the tree-dump for your example above is beyond what I can grasp. I've noticed that my attempt does not properly handle the parmse.post; at least this is what the above example shows: there is a small part after the call to bar that should have been executed before that call, which I attribute to .post. But my attempts in moving that part regresses on a couple of testcases with class and intent(out). I am at a loss now. I am attaching the latest version of my patch to give you or Paul or others the opportunity to see what is wrong or add the missing pieces. Thanks for your help so far. Harald --------------KjS10ShNaSXnM0gusSLPcqEc Content-Type: text/x-patch; charset=UTF-8; name="pr92178-v2.diff" Content-Disposition: attachment; filename="pr92178-v2.diff" Content-Transfer-Encoding: base64 RnJvbSA5ODkwMzBmYzA0ZWFjZjk3YTAzNGFiMWY3ZWQ4NWI5MzI2NjlmODJkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBIYXJhbGQgQW5sYXVmIDxhbmxhdWZAZ214LmRlPgpE YXRlOiBXZWQsIDUgSnVsIDIwMjMgMjI6MjE6MDkgKzAyMDAKU3ViamVjdDogW1BBVENIXSBG b3J0cmFuOiBmaXhlcyBmb3IgcHJvY2VkdXJlcyB3aXRoIEFMTE9DQVRBQkxFLElOVEVOVChP VVQpCiBhcmd1bWVudHMgW1BSOTIxNzhdCgpnY2MvZm9ydHJhbi9DaGFuZ2VMb2c6CgoJUFIg Zm9ydHJhbi85MjE3OAoJKiB0cmFucy1leHByLmNjIChnZmNfY29udl9wcm9jZWR1cmVfY2Fs bCk6IENoZWNrIHByb2NlZHVyZXMgZm9yCglhbGxvY2F0YWJsZSBkdW1teSBhcmd1bWVudHMg d2l0aCBJTlRFTlQoT1VUKSBhbmQgbW92ZSBkZWFsbG9jYXRpb24KCW9mIGFjdHVhbCBhcmd1 bWVudHMgYWZ0ZXIgZXZhbHVhdGlvbiBvZiBhcmd1bWVudCBleHByZXNzaW9ucyBiZWZvcmUK CXRoZSBwcm9jZWR1cmUgaXMgZXhlY3V0ZWQuCgpnY2MvdGVzdHN1aXRlL0NoYW5nZUxvZzoK CglQUiBmb3J0cmFuLzkyMTc4CgkqIGdmb3J0cmFuLmRnL2ludGVudF9vdXRfMTYuZjkwOiBO ZXcgdGVzdC4KCSogZ2ZvcnRyYW4uZGcvaW50ZW50X291dF8xNy5mOTA6IE5ldyB0ZXN0LgoJ KiBnZm9ydHJhbi5kZy9pbnRlbnRfb3V0XzE4LmY5MDogTmV3IHRlc3QuCgpDby1hdXRob3Jl ZC1ieTogU3RldmVuIEcuIEthcmdsIDxrYXJnbEBnY2MuZ251Lm9yZz4KLS0tCiBnY2MvZm9y dHJhbi90cmFucy1leHByLmNjICAgICAgICAgICAgICAgICAgIHwgNTQgKysrKysrKysrKyst LQogZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9pbnRlbnRfb3V0XzE2LmY5MCB8IDg5ICsr KysrKysrKysrKysrKysrKysrKwogZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9pbnRlbnRf b3V0XzE3LmY5MCB8IDQ2ICsrKysrKysrKysrCiBnY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRn L2ludGVudF9vdXRfMTguZjkwIHwgMzEgKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAyMTUg aW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBnY2Mv dGVzdHN1aXRlL2dmb3J0cmFuLmRnL2ludGVudF9vdXRfMTYuZjkwCiBjcmVhdGUgbW9kZSAx MDA2NDQgZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9pbnRlbnRfb3V0XzE3LmY5MAogY3Jl YXRlIG1vZGUgMTAwNjQ0IGdjYy90ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcvaW50ZW50X291dF8x OC5mOTAKCmRpZmYgLS1naXQgYS9nY2MvZm9ydHJhbi90cmFucy1leHByLmNjIGIvZ2NjL2Zv cnRyYW4vdHJhbnMtZXhwci5jYwppbmRleCAzMDk0NmJhM2Y2My4uNzAxN2I2NTJkNmUgMTAw NjQ0Ci0tLSBhL2djYy9mb3J0cmFuL3RyYW5zLWV4cHIuY2MKKysrIGIvZ2NjL2ZvcnRyYW4v dHJhbnMtZXhwci5jYwpAQCAtNjA4NSw5ICs2MDg1LDEwIEBAIGdmY19jb252X3Byb2NlZHVy ZV9jYWxsIChnZmNfc2UgKiBzZSwgZ2ZjX3N5bWJvbCAqIHN5bSwKICAgZWxzZQogICAgIGlu Zm8gPSBOVUxMOwogCi0gIHN0bXRibG9ja190IHBvc3QsIGNsb2JiZXJzOworICBzdG10Ymxv Y2tfdCBwb3N0LCBjbG9iYmVycywgZGVhbGxvY19ibGs7CiAgIGdmY19pbml0X2Jsb2NrICgm cG9zdCk7CiAgIGdmY19pbml0X2Jsb2NrICgmY2xvYmJlcnMpOworICBnZmNfaW5pdF9ibG9j ayAoJmRlYWxsb2NfYmxrKTsKICAgZ2ZjX2luaXRfaW50ZXJmYWNlX21hcHBpbmcgKCZtYXBw aW5nKTsKICAgaWYgKCFjb21wKQogICAgIHsKQEAgLTYxMTcsNiArNjExOCwzMiBAQCBnZmNf Y29udl9wcm9jZWR1cmVfY2FsbCAoZ2ZjX3NlICogc2UsIGdmY19zeW1ib2wgKiBzeW0sCiAJ ICAgICAgICYmIFVOTElNSVRFRF9QT0xZIChzeW0pCiAJICAgICAgICYmIGNvbXAgJiYgKHN0 cmNtcCAoIl9jb3B5IiwgY29tcC0+bmFtZSkgPT0gMCk7CiAKKyAgLyogU2NhbiBmb3IgYWxs b2NhdGFibGUgYWN0dWFsIGFyZ3VtZW50cyBwYXNzZWQgdG8gYWxsb2NhdGFibGUgZHVtbXkK KyAgICAgYXJndW1lbnRzIHdpdGggSU5URU5UKE9VVCkuICBBcyB0aGUgY29ycmVzcG9uZGlu ZyBhY3R1YWwgYXJndW1lbnRzIGFyZQorICAgICBkZWFsbG9jYXRlZCBiZWZvcmUgZXhlY3V0 aW9uIG9mIHRoZSBwcm9jZWR1cmUsIHdlIGV2YWx1YXRlIGFjdHVhbAorICAgICBhcmd1bWVu dCBleHByZXNzaW9ucyB0byBhdm9pZCBwcm9ibGVtcyB3aXRoIHBvc3NpYmxlIGRlcGVuZGVu Y2llcy4gICovCisgIGJvb2wgZm9yY2VfZXZhbF9hcmdzID0gZmFsc2U7CisgIGdmY19mb3Jt YWxfYXJnbGlzdCAqdG1wX2Zvcm1hbDsKKyAgZm9yIChhcmcgPSBhcmdzLCB0bXBfZm9ybWFs ID0gZm9ybWFsOyBhcmcgIT0gTlVMTDsKKyAgICAgICBhcmcgPSBhcmctPm5leHQsIHRtcF9m b3JtYWwgPSB0bXBfZm9ybWFsID8gdG1wX2Zvcm1hbC0+bmV4dCA6IE5VTEwpCisgICAgewor ICAgICAgZSA9IGFyZy0+ZXhwcjsKKyAgICAgIGZzeW0gPSB0bXBfZm9ybWFsID8gdG1wX2Zv cm1hbC0+c3ltIDogTlVMTDsKKyAgICAgIGlmIChlICYmIGZzeW0KKwkgICYmIGUtPmV4cHJf dHlwZSA9PSBFWFBSX1ZBUklBQkxFCisJICAmJiBmc3ltLT5hdHRyLmludGVudCA9PSBJTlRF TlRfT1VUCisJICAmJiAoZnN5bS0+dHMudHlwZSA9PSBCVF9DTEFTUyAmJiBmc3ltLT5hdHRy LmNsYXNzX29rCisJICAgICAgPyBDTEFTU19EQVRBIChmc3ltKS0+YXR0ci5hbGxvY2F0YWJs ZQorCSAgICAgIDogZnN5bS0+YXR0ci5hbGxvY2F0YWJsZSkKKwkgICYmIGUtPnN5bXRyZWUK KwkgICYmIGUtPnN5bXRyZWUtPm4uc3ltCisJICAmJiBnZmNfdmFyaWFibGVfYXR0ciAoZSwg TlVMTCkuYWxsb2NhdGFibGUpCisJeworCSAgZm9yY2VfZXZhbF9hcmdzID0gdHJ1ZTsKKwkg IGJyZWFrOworCX0KKyAgICB9CisKICAgLyogRXZhbHVhdGUgdGhlIGFyZ3VtZW50cy4gICov CiAgIGZvciAoYXJnID0gYXJncywgYXJnYyA9IDA7IGFyZyAhPSBOVUxMOwogICAgICAgIGFy ZyA9IGFyZy0+bmV4dCwgZm9ybWFsID0gZm9ybWFsID8gZm9ybWFsLT5uZXh0IDogTlVMTCwg KythcmdjKQpAQCAtNjY4MCw3ICs2NzA3LDcgQEAgZ2ZjX2NvbnZfcHJvY2VkdXJlX2NhbGwg KGdmY19zZSAqIHNlLCBnZmNfc3ltYm9sICogc3ltLAogCQkgICAgICBlbHNlCiAJCQl0bXAg PSBnZmNfZmluaXNoX2Jsb2NrICgmYmxvY2spOwogCi0JCSAgICAgIGdmY19hZGRfZXhwcl90 b19ibG9jayAoJnNlLT5wcmUsIHRtcCk7CisJCSAgICAgIGdmY19hZGRfZXhwcl90b19ibG9j ayAoJmRlYWxsb2NfYmxrLCB0bXApOwogCQkgICAgfQogCiAJCSAgLyogQSBjbGFzcyBhcnJh eSBlbGVtZW50IG5lZWRzIGNvbnZlcnRpbmcgYmFjayB0byBiZSBhCkBAIC02Nzc2LDYgKzY4 MDMsNyBAQCBnZmNfY29udl9wcm9jZWR1cmVfY2FsbCAoZ2ZjX3NlICogc2UsIGdmY19zeW1i b2wgKiBzeW0sCiAJICAgICAgLyogUGFzcyBhIGNsYXNzIGFycmF5LiAgKi8KIAkgICAgICBw YXJtc2UudXNlX29mZnNldCA9IDE7CiAJICAgICAgZ2ZjX2NvbnZfZXhwcl9kZXNjcmlwdG9y ICgmcGFybXNlLCBlKTsKKwkgICAgICBib29sIGRlZmVyX3RvX2RlYWxsb2NfYmxrID0gZmFs c2U7CiAKIAkgICAgICAvKiBJZiBhbiBBTExPQ0FUQUJMRSBkdW1teSBhcmd1bWVudCBoYXMg SU5URU5UKE9VVCkgYW5kIGlzCiAJCSBhbGxvY2F0ZWQgb24gZW50cnksIGl0IG11c3QgYmUg ZGVhbGxvY2F0ZWQuICAqLwpAQCAtNjgxNiw3ICs2ODQ0LDggQEAgZ2ZjX2NvbnZfcHJvY2Vk dXJlX2NhbGwgKGdmY19zZSAqIHNlLCBnZmNfc3ltYm9sICogc3ltLAogCQkgIGVsc2UKIAkJ ICAgIHRtcCA9IGdmY19maW5pc2hfYmxvY2sgKCZibG9jayk7CiAKLQkJICBnZmNfYWRkX2V4 cHJfdG9fYmxvY2sgKCZzZS0+cHJlLCB0bXApOworCQkgIGdmY19hZGRfZXhwcl90b19ibG9j ayAoJmRlYWxsb2NfYmxrLCB0bXApOworCQkgIGRlZmVyX3RvX2RlYWxsb2NfYmxrID0gdHJ1 ZTsKIAkJfQogCiAJICAgICAgLyogVGhlIGNvbnZlcnNpb24gZG9lcyBub3QgcmVwYWNrYWdl IHRoZSByZWZlcmVuY2UgdG8gYSBjbGFzcwpAQCAtNjgzMCw2ICs2ODU5LDEwIEBAIGdmY19j b252X3Byb2NlZHVyZV9jYWxsIChnZmNfc2UgKiBzZSwgZ2ZjX3N5bWJvbCAqIHN5bSwKIAkJ CQkgICAgICYmIGUtPnN5bXRyZWUtPm4uc3ltLT5hdHRyLm9wdGlvbmFsLAogCQkJCSAgICAg Q0xBU1NfREFUQSAoZnN5bSktPmF0dHIuY2xhc3NfcG9pbnRlcgogCQkJCSAgICAgfHwgQ0xB U1NfREFUQSAoZnN5bSktPmF0dHIuYWxsb2NhdGFibGUpOworCisJICAgICAgLyogRGVmZXIg cmVwYWNrYWdpbmcgYWZ0ZXIgZGVhbGxvY2F0aW9uLiAgKi8KKwkgICAgICBpZiAoZGVmZXJf dG9fZGVhbGxvY19ibGspCisJCWdmY19hZGRfYmxvY2tfdG9fYmxvY2sgKCZkZWFsbG9jX2Js aywgJnBhcm1zZS5wcmUpOwogCSAgICB9CiAJICBlbHNlCiAJICAgIHsKQEAgLTY5ODAsNyAr NzAxMyw3IEBAIGdmY19jb252X3Byb2NlZHVyZV9jYWxsIChnZmNfc2UgKiBzZSwgZ2ZjX3N5 bWJvbCAqIHN5bSwKIAkJCQkJYnVpbGRfZW1wdHlfc3RtdCAoaW5wdXRfbG9jYXRpb24pKTsK IAkJICAgICAgfQogCQkgICAgaWYgKHRtcCAhPSBOVUxMX1RSRUUpCi0JCSAgICAgIGdmY19h ZGRfZXhwcl90b19ibG9jayAoJnNlLT5wcmUsIHRtcCk7CisJCSAgICAgIGdmY19hZGRfZXhw cl90b19ibG9jayAoJmRlYWxsb2NfYmxrLCB0bXApOwogCQkgIH0KIAogCQkgIHRtcCA9IHBh cm1zZS5leHByOwpAQCAtNzAwNCw3ICs3MDM3LDcgQEAgZ2ZjX2NvbnZfcHJvY2VkdXJlX2Nh bGwgKGdmY19zZSAqIHNlLCBnZmNfc3ltYm9sICogc3ltLAogCQkJCSAgICAgdm9pZF90eXBl X25vZGUsCiAJCQkJICAgICBnZmNfY29udl9leHByX3ByZXNlbnQgKGUtPnN5bXRyZWUtPm4u c3ltKSwKIAkJCQkgICAgICAgdG1wLCBidWlsZF9lbXB0eV9zdG10IChpbnB1dF9sb2NhdGlv bikpOwotCQkgIGdmY19hZGRfZXhwcl90b19ibG9jayAoJnNlLT5wcmUsIHRtcCk7CisJCSAg Z2ZjX2FkZF9leHByX3RvX2Jsb2NrICgmZGVhbGxvY19ibGssIHRtcCk7CiAJCX0KIAkgICAg fQogCX0KQEAgLTcxMDEsNiArNzEzNCwxNiBAQCBnZmNfY29udl9wcm9jZWR1cmVfY2FsbCAo Z2ZjX3NlICogc2UsIGdmY19zeW1ib2wgKiBzeW0sCiAJICAgIH0KIAl9CiAKKyAgICAgIC8q IElmIGFueSBhY3R1YWwgYXJndW1lbnQgb2YgdGhlIHByb2NlZHVyZSBpcyBhbGxvY2F0YWJs ZSBhbmQgcGFzc2VkCisJIHRvIGFuIGFsbG9jYXRhYmxlIGR1bW15IHdpdGggSU5URU5UKE9V VCksIHdlIGNvbnNlcnZhdGl2ZWx5CisJIGV2YWx1YXRlIGFjdHVhbCBhcmd1bWVudCBleHBy ZXNzaW9ucyBiZWZvcmUgZGVhbGxvY2F0aW9ucyBhcmUKKwkgcGVyZm9ybWVkIGFuZCB0aGUg cHJvY2VkdXJlIGlzIGV4ZWN1dGVkLiAgTWF5IGNyZWF0ZSB0ZW1wb3Jhcmllcy4KKwkgVGhp cyBlbnN1cmVzIHdlIGNvbmZvcm0gdG8gRjIwMjM6MTUuNS4zLCAxNS41LjQuICAqLworICAg ICAgaWYgKGUgJiYgZnN5bSAmJiBmb3JjZV9ldmFsX2FyZ3MKKwkgICYmIGZzeW0tPmF0dHIu aW50ZW50ICE9IElOVEVOVF9PVVQKKwkgICYmICFnZmNfaXNfY29uc3RhbnRfZXhwciAoZSkp CisJcGFybXNlLmV4cHIgPSBnZmNfZXZhbHVhdGVfbm93IChwYXJtc2UuZXhwciwgJnBhcm1z ZS5wcmUpOworCiAgICAgICBpZiAoZnN5bSAmJiBuZWVkX2ludGVyZmFjZV9tYXBwaW5nICYm IGUpCiAJZ2ZjX2FkZF9pbnRlcmZhY2VfbWFwcGluZyAoJm1hcHBpbmcsIGZzeW0sICZwYXJt c2UsIGUpOwogCkBAIC03NDk5LDYgKzc1NDIsNyBAQCBnZmNfY29udl9wcm9jZWR1cmVfY2Fs bCAoZ2ZjX3NlICogc2UsIGdmY19zeW1ib2wgKiBzeW0sCiAgICAgICB2ZWNfc2FmZV9wdXNo IChhcmdsaXN0LCBwYXJtc2UuZXhwcik7CiAgICAgfQogCisgIGdmY19hZGRfYmxvY2tfdG9f YmxvY2sgKCZzZS0+cHJlLCAmZGVhbGxvY19ibGspOwogICBnZmNfYWRkX2Jsb2NrX3RvX2Js b2NrICgmc2UtPnByZSwgJmNsb2JiZXJzKTsKICAgZ2ZjX2ZpbmlzaF9pbnRlcmZhY2VfbWFw cGluZyAoJm1hcHBpbmcsICZzZS0+cHJlLCAmc2UtPnBvc3QpOwogCmRpZmYgLS1naXQgYS9n Y2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2ludGVudF9vdXRfMTYuZjkwIGIvZ2NjL3Rlc3Rz dWl0ZS9nZm9ydHJhbi5kZy9pbnRlbnRfb3V0XzE2LmY5MApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMC4uZThkNjM1ZmVkNTcKLS0tIC9kZXYvbnVsbAorKysgYi9n Y2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2ludGVudF9vdXRfMTYuZjkwCkBAIC0wLDAgKzEs ODkgQEAKKyEgeyBkZy1kbyBydW4gfQorIQorISBQUiBmb3J0cmFuLzkyMTc4CishIFJlLW9y ZGVyIGFyZ3VtZW50IGRlYWxsb2NhdGlvbgorCitwcm9ncmFtIHAKKyAgaW1wbGljaXQgbm9u ZQorICBpbnRlZ2VyLCAgIGFsbG9jYXRhYmxlIDo6IGEoOikKKyAgY2xhc3MoKiksICBhbGxv Y2F0YWJsZSA6OiBjKDopCisgIHR5cGUgdAorICAgIGludGVnZXIsIGFsbG9jYXRhYmxlIDo6 IGEoOikKKyAgZW5kIHR5cGUgdAorICB0eXBlKHQpIDo6IGIKKyAgaW50ZWdlciA6OiBrID0g LTk5OQorCisgICEgVGVzdCBiYXNlZCBvbiBvcmlnaW5hbCBQUgorICBhID0gWzFdCisgIGNh bGwgYXNzaWduIChhLCAobWF4KGEoMSksMCkpKQorICBpZiAoYWxsb2NhdGVkIChhKSkgc3Rv cCA5CisgIGlmIChrIC89IDEpICAgICAgICBzdG9wIDEwCisKKyAgISBBZGRpdGlvbmFsIHZh cmlhdGlvbnMgYmFzZWQgb24gc3VnZ2VzdGlvbnMgYnkgVG9iaWFzIEJ1cm51cworICAhIHRv IGNoZWNrIHRoYXQgYXJndW1lbnQgZXhwcmVzc2lvbnMgYXJlIGV2YWx1YXRlZCBlYXJseSBl bm91Z2gKKyAgYSA9IFsxLCAyXQorICBjYWxsIGZvbyAoYWxsb2NhdGVkIChhKSwgc2l6ZSAo YSksIHRlc3QgKGEpLCBhLCBhbGxvY2F0ZWQgKGEpKQorICBpZiAoYWxsb2NhdGVkIChhKSkg c3RvcCAxMQorCisgIGEgPSBbMSwgMl0KKyAgayA9IDEKKyAgY2FsbCBmb28gKGFsbG9jYXRl ZCAoYSksIHNpemUgKGEpLCB0ZXN0IChrKmEpLCBhLCBhbGxvY2F0ZWQgKGEpKQorICBpZiAo YWxsb2NhdGVkIChhKSkgc3RvcCAxMgorCisgIGIlIGEgPSBbMSwgMl0KKyAgY2FsbCBmb28g KGFsbG9jYXRlZCAoYiUgYSksIHNpemUgKGIlIGEpLCB0ZXN0IChiJSBhKSwgYiUgYSwgYWxs b2NhdGVkIChiJSBhKSkKKyAgaWYgKGFsbG9jYXRlZCAoYiUgYSkpIHN0b3AgMTMKKworICBj ID0gWzMsIDRdCisgIGNhbGwgYmFyIChhbGxvY2F0ZWQgKGMpLCBzaXplIChjKSwgdGVzdDIg KGMpLCBjLCAmCisgICAgICAgICAgICBhbGxvY2F0ZWQgKGMpLCBzaXplIChjKSwgdGVzdDIg KGMpICAgICApCisgIGlmIChhbGxvY2F0ZWQgKGMpKSBzdG9wIDE0CisKK2NvbnRhaW5zCisK KyAgc3Vicm91dGluZSBhc3NpZ24gKGEsIGkpCisgICAgaW50ZWdlciwgYWxsb2NhdGFibGUs IGludGVudChvdXQpIDo6IGEoOikgCisgICAgaW50ZWdlciwgICAgICAgICAgICAgIHZhbHVl ICA6OiBpCisgICAgayA9IGkKKyAgZW5kIHN1YnJvdXRpbmUKKworICBzdWJyb3V0aW5lIGZv byAoYWxsb2MsIHN6LCB0c3QsIHgsIGFsbG9jMikKKyAgICBsb2dpY2FsLCB2YWx1ZSA6OiBh bGxvYywgdHN0CisgICAgaW50ZWdlciwgdmFsdWUgOjogc3oKKyAgICBsb2dpY2FsICAgICAg ICA6OiBhbGxvYzIKKyAgICBpbnRlZ2VyLCBhbGxvY2F0YWJsZSwgaW50ZW50KG91dCkgOjog eCg6KQorICAgIGlmIChhbGxvY2F0ZWQgKHgpKSBzdG9wIDEKKyAgICBpZiAoLm5vdC4gYWxs b2MpICAgc3RvcCAyCisgICAgaWYgKHN6IC89IDIpICAgICAgIHN0b3AgMworICAgIGlmICgu bm90LiB0c3QpICAgICBzdG9wIDQKKyAgICBpZiAoLm5vdC4gYWxsb2MyKSAgc3RvcCAxNQor ICBlbmQgc3Vicm91dGluZSBmb28KKyAgIQorICBsb2dpY2FsIGZ1bmN0aW9uIHRlc3QgKHp6 KQorICAgIGludGVnZXIgOjogenooMikKKyAgICB0ZXN0ID0genooMikgPT0gMgorICBlbmQg ZnVuY3Rpb24gdGVzdAorICAhCisgIHN1YnJvdXRpbmUgYmFyIChhbGxvYywgc3osIHRzdCwg eCwgYWxsb2MyLCBzejIsIHRzdDIpCisgICAgbG9naWNhbCwgdmFsdWUgOjogYWxsb2MsIHRz dCwgYWxsb2MyLCB0c3QyCisgICAgaW50ZWdlciwgdmFsdWUgOjogc3osIHN6MgorICAgIGNs YXNzKCopLCBhbGxvY2F0YWJsZSwgaW50ZW50KG91dCkgOjogeCg6KQorICAgIGlmIChhbGxv Y2F0ZWQgKHgpKSBzdG9wIDUKKyAgICBpZiAoLm5vdC4gYWxsb2MpICAgc3RvcCA2CisgICAg aWYgKHN6IC89IDIpICAgICAgIHN0b3AgNworICAgIGlmICgubm90LiB0c3QpICAgICBzdG9w IDgKKyAgICBpZiAoLm5vdC4gYWxsb2MyKSAgc3RvcCAxNgorICAgIGlmIChzejIgLz0gMikg ICAgICBzdG9wIDE3CisgICAgaWYgKC5ub3QuIHRzdDIpICAgIHN0b3AgMTgKKyAgZW5kIHN1 YnJvdXRpbmUgYmFyCisgICEKKyAgbG9naWNhbCBmdW5jdGlvbiB0ZXN0MiAoenopCisgICAg Y2xhc3MoKiksIGludGVudChpbikgOjogenooOikKKyAgICBzZWxlY3QgdHlwZSAoenopCisg ICAgdHlwZSBpcyAoaW50ZWdlcikKKyAgICAgICB0ZXN0MiA9IHp6KDIpID09IDQKKyAgICBj bGFzcyBkZWZhdWx0CisgICAgICAgc3RvcCA5OQorICAgIGVuZCBzZWxlY3QKKyAgZW5kIGZ1 bmN0aW9uIHRlc3QyCitlbmQKZGlmZiAtLWdpdCBhL2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4u ZGcvaW50ZW50X291dF8xNy5mOTAgYi9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2ludGVu dF9vdXRfMTcuZjkwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi5i YzkyMDhkY2Y2ZAotLS0gL2Rldi9udWxsCisrKyBiL2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4u ZGcvaW50ZW50X291dF8xNy5mOTAKQEAgLTAsMCArMSw0NiBAQAorISB7IGRnLWRvIHJ1biB9 CishCishIFBSIGZvcnRyYW4vOTIxNzgKKyEgQ29udHJpYnV0ZWQgYnkgVG9iaWFzIEJ1cm51 cworCitwcm9ncmFtIGZvbworICBpbXBsaWNpdCBub25lICh0eXBlLCBleHRlcm5hbCkKKwor ICB0eXBlIHQKKyAgZW5kIHR5cGUgdAorCisgIHR5cGUsIGV4dGVuZHModCkgOjogdDIKKyAg ZW5kIHR5cGUgdDIKKworICB0eXBlKHQyKSA6OiB4MgorICBjbGFzcyh0KSwgYWxsb2NhdGFi bGUgOjogYWEKKworICBjYWxsIGNoZWNrX2ludGVudG91dF9mYWxzZShhbGxvY2F0ZWQoYWEp LCBhYSwgJgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbGxvY2F0ZWQoYWEpKQor ICBpZiAoYWxsb2NhdGVkKGFhKSkgc3RvcCAxCisKKyAgYWxsb2NhdGUodDIgOjogYWEpCisg IGlmICgubm90LmFsbG9jYXRlZChhYSkpIHN0b3AgMgorICBpZiAoLm5vdC5zYW1lX3R5cGVf YXMoYWEsIHgyKSkgc3RvcCAzCisgIGNhbGwgY2hlY2tfaW50ZW50b3V0X3RydWUoYWxsb2Nh dGVkKGFhKSwgKHNhbWVfdHlwZV9hcyhhYSwgeDIpKSwgYWEsICYKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICBhbGxvY2F0ZWQoYWEpLCAoc2FtZV90eXBlX2FzKGFhLCB4MikpKQor ICBpZiAoYWxsb2NhdGVkKGFhKSkgc3RvcCA0CisKK2NvbnRhaW5zCisgIHN1YnJvdXRpbmUg Y2hlY2tfaW50ZW50b3V0X2ZhbHNlKGFsbG9jMSwgeXksIGFsbG9jMikKKyAgICBsb2dpY2Fs LCB2YWx1ZSA6OiBhbGxvYzEsIGFsbG9jMgorICAgIGNsYXNzKHQpLCBhbGxvY2F0YWJsZSwg aW50ZW50KG91dCkgOjogeXkKKyAgICBpZiAoYWxsb2NhdGVkKHl5KSkgc3RvcCAxMQorICAg IGlmIChhbGxvYzEpIHN0b3AgMTIKKyAgICBpZiAoYWxsb2MyKSBzdG9wIDEzCisgIGVuZCBz dWJyb3V0aW5lIGNoZWNrX2ludGVudG91dF9mYWxzZQorICBzdWJyb3V0aW5lIGNoZWNrX2lu dGVudG91dF90cnVlKGFsbG9jMSwgc2FtZTEsIHp6LCBhbGxvYzIsIHNhbWUyKQorICAgIGxv Z2ljYWwsIHZhbHVlIDo6IGFsbG9jMSwgYWxsb2MyLCBzYW1lMSwgc2FtZTIKKyAgICBjbGFz cyh0KSwgYWxsb2NhdGFibGUsIGludGVudChvdXQpIDo6IHp6CisgICAgaWYgKGFsbG9jYXRl ZCh6eikpIHN0b3AgMjEKKyAgICBpZiAoLm5vdC5hbGxvYzEpIHN0b3AgMjIKKyAgICBpZiAo Lm5vdC5hbGxvYzIpIHN0b3AgMjMKKyAgICBpZiAoLm5vdC5zYW1lMSkgc3RvcCAyNAorICAg IGlmICgubm90LnNhbWUyKSBzdG9wIDI1CisgIGVuZCBzdWJyb3V0aW5lIGNoZWNrX2ludGVu dG91dF90cnVlCitlbmQgcHJvZ3JhbQpkaWZmIC0tZ2l0IGEvZ2NjL3Rlc3RzdWl0ZS9nZm9y dHJhbi5kZy9pbnRlbnRfb3V0XzE4LmY5MCBiL2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcv aW50ZW50X291dF8xOC5mOTAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAuLjUwZjk5NDhiZjExCi0tLSAvZGV2L251bGwKKysrIGIvZ2NjL3Rlc3RzdWl0ZS9nZm9y dHJhbi5kZy9pbnRlbnRfb3V0XzE4LmY5MApAQCAtMCwwICsxLDMxIEBACishIHsgZGctZG8g cnVuIH0KKyEKKyEgUFIgZm9ydHJhbi85MjE3OAorISBDb250cmlidXRlZCBieSBNaWthZWwg TW9yaW4KKworcHJvZ3JhbSBwCisgIGltcGxpY2l0IG5vbmUKKyAgdHlwZSB0CisgICAgaW50 ZWdlciA6OiBpCisgICAgaW50ZWdlciwgcG9pbnRlciA6OiBwaQorICBlbmQgdHlwZSB0Cisg IGludGVnZXIsIHRhcmdldCA6OiBqCisgIHR5cGUodCksIGFsbG9jYXRhYmxlIDo6IHRhCisg IGogPSAxCisgIHRhID0gdCgyLCBqKQorICBjYWxsIGFzc2lnbih0YSwgaWQodGElcGkpKQor ICBpZiAodGElaSAvPSAxKSBzdG9wIDEKKyAgaWYgKGFzc29jaWF0ZWQodGElcGkpKSBzdG9w IDIKK2NvbnRhaW5zCisgIHN1YnJvdXRpbmUgYXNzaWduKGEsIGIpCisgICAgdHlwZSh0KSwg aW50ZW50KG91dCksIGFsbG9jYXRhYmxlIDo6IGEKKyAgICBpbnRlZ2VyLCBpbnRlbnQoaW4p ICwgdmFsdWUgICAgICAgOjogYgorICAgIGFsbG9jYXRlKGEpCisgICAgYSVpID0gYgorICAg IGElcGkgPT4gbnVsbCgpCisgIGVuZCBzdWJyb3V0aW5lIGFzc2lnbgorICBmdW5jdGlvbiBp ZChhKQorICAgIGludGVnZXIsIHBvaW50ZXIgOjogaWQsIGEKKyAgICBpZCA9PiBhCisgIGVu ZCBmdW5jdGlvbiBpZAorZW5kIHByb2dyYW0gcAotLSAKMi4zNS4zCgo= --------------KjS10ShNaSXnM0gusSLPcqEc--