234474 2021-12-18 05:32:15 -0800 [RISCV64] Add basic MacroAssemblerRISCV64 branching methods 2022-03-11 05:33:46 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 237775 234475 1 zan zan ews-watchlist keith_miller mark.lam msaboff pmatos saam tzagallo webkit-bug-importer xan.lopez ysuzuki oldest_to_newest 1825334 0 zan 2021-12-18 05:32:15 -0800 [RISCV64] Add basic MacroAssemblerRISCV64 branching methods 1825335 1 447517 zan 2021-12-18 05:32:56 -0800 Created attachment 447517 Patch 1825894 2 447517 ysuzuki 2021-12-21 00:19:54 -0800 Comment on attachment 447517 Patch r=me 1825900 3 ews-feeder 2021-12-21 00:36:26 -0800 Committed r287302 (245454@main): <https://commits.webkit.org/245454@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447517. 1825901 4 webkit-bug-importer 2021-12-21 00:37:20 -0800 <rdar://problem/86757948> 447517 2021-12-18 05:32:56 -0800 2021-12-21 00:36:28 -0800 Patch bug-234474-20211218143255.patch text/plain 14274 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 MDlhMWM2YzM5N2YyY2Q0ZWFiYTdiNjg1OGRiMjYyODJmYTljNWQzLi5mMjEyMzFhMDQwZTI2MWMz M2VhODJmZDcwMzIzN2JhMDhiN2FmYmNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMyBAQAorMjAyMS0xMi0xOCAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5j b20+CisKKyAgICAgICAgW1JJU0NWNjRdIEFkZCBiYXNpYyBNYWNyb0Fzc2VtYmxlclJJU0NWNjQg YnJhbmNoaW5nIG1ldGhvZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzNDQ3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCBNYWNyb0Fzc2VtYmxlclJJU0NWNjQgaW1wbGVtZW50YXRpb25zIGZvciB0 aGUgYmFzaWMgYnJhbmNoaW5nCisgICAgICAgIG1ldGhvZHMuIFJlbGF0aW9uYWxDb25kaXRpb24g ZW51bSB2YWx1ZXMgYXJlIGFsaWFzZWQgdG8gdGhlIGJyYW5jaGluZworICAgICAgICBjb25kaXRp b24gdmFsdWVzIGluIFJJU0NWNjRBc3NlbWJsZXIuIFRoZSBtYWtlQnJhbmNoKCkgaGVscGVyIG1l dGhvZAorICAgICAgICBpcyBhZGRlZCB0aGF0IGdlbmVyYXRlcyB0aGUgZmluYWwgYnJhbmNoaW5n IGluc3RydWN0aW9uIGZvciB0aGUgZ2l2ZW4KKyAgICAgICAgY29uZGl0aW9uIGFuZCB0aGUgdHdv IHJlZ2lzdGVycyBob2xkaW5nIHZhbHVlcyBmb3IgdGhlIGNvbXBhcmlzb24gYW5kCisgICAgICAg IHJldHVybnMgdGhlIEp1bXAgb2JqZWN0IGJhc2VkIG9uIHRoZSBsYWJlbCBjb25zdHJ1Y3RlZCBh dCB0aGUgbG9jYXRpb24KKyAgICAgICAgb2YgdGhlIGJyYW5jaGluZyBwbGFjZWhvbGRlci4KKwor ICAgICAgICBCcmFuY2hpbmcgbWV0aG9kcyBlc3NlbnRpYWxseSBjb25zaXN0IG9mIHByZXBhcmlu ZyB0aGUgdHdvIHJlZ2lzdGVycworICAgICAgICBhbmQgY2FsbGluZyB0aGUgbWFrZUJyYW5jaCgp IG1ldGhvZC4gRm9yIDgtYml0IGFuZCAzMi1iaXQgY29tcGFyaXNvbnMKKyAgICAgICAgdGhlIGNv bXBhcmVkIHZhbHVlcyBoYXZlIHRvIGJlIHNpZ24tZXh0ZW5kZWQgaW50byB0aGUgc2NyYXRjaCBy ZWdpc3RlcnMKKyAgICAgICAgYmVjYXVzZSB0aGUgYnJhbmNoaW5nIGluc3RydWN0aW9ucyBkb24n dCBvcGVyYXRlIG9uIHBhcnRpYWwgdmFsdWVzLiBUaGlzCisgICAgICAgIG1pZ2h0IGNhdXNlIGZy aWN0aW9uIGluIGhpZ2hlciBKSVQgbGV2ZWxzIHdoZXJlIHRoZSB1c2Ugb2Ygc2NyYXRjaAorICAg ICAgICByZWdpc3RlcnMgaXMgZGlzYWxsb3dlZC4KKworICAgICAgICAqIGFzc2VtYmxlci9NYWNy b0Fzc2VtYmxlclJJU0NWNjQuaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJSSVNDVjY0 OjppbnZlcnQpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlclJJU0NWNjQ6OmJyYW5jaDgp OgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlclJJU0NWNjQ6OmJyYW5jaDMyKToKKyAgICAg ICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJSSVNDVjY0OjpicmFuY2g2NCk6CisgICAgICAgIChKU0M6 Ok1hY3JvQXNzZW1ibGVyUklTQ1Y2NDo6YnJhbmNoMzJXaXRoVW5hbGlnbmVkSGFsZldvcmRzKToK KyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJSSVNDVjY0OjptYWtlQnJhbmNoKToKKwogMjAy MS0xMi0xNyAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAg W1JJU0NWNjRdIEltcGxlbWVudCBsaW5raW5nIGFuZCBwYXRjaGluZyBzdXBwb3J0IGluIFJJU0NW NjRBc3NlbWJsZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIv TWFjcm9Bc3NlbWJsZXJSSVNDVjY0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVy L01hY3JvQXNzZW1ibGVyUklTQ1Y2NC5oCmluZGV4IDhkMmYwZTMyNzYzMDNhNGUwNDVjMmJhM2Y5 Y2RjZjI3ODkyODY5YTkuLjEzYjZlMDE0MDg1OTdkYjM1ZmQ0Y2VmYjk2ZjU0NWI1NWZjZDNkMzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJs ZXJSSVNDVjY0LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fz c2VtYmxlclJJU0NWNjQuaApAQCAtMTE4LDE4ICsxMTgsMjMgQEAgcHVibGljOgogICAgIHN0YXRp YyBib29sIHN1cHBvcnRzRmxvYXRpbmdQb2ludFJvdW5kaW5nKCkgeyByZXR1cm4gdHJ1ZTsgfQog CiAgICAgZW51bSBSZWxhdGlvbmFsQ29uZGl0aW9uIHsKLSAgICAgICAgRXF1YWwsCi0gICAgICAg IE5vdEVxdWFsLAotICAgICAgICBBYm92ZSwKLSAgICAgICAgQWJvdmVPckVxdWFsLAotICAgICAg ICBCZWxvdywKLSAgICAgICAgQmVsb3dPckVxdWFsLAotICAgICAgICBHcmVhdGVyVGhhbiwKLSAg ICAgICAgR3JlYXRlclRoYW5PckVxdWFsLAotICAgICAgICBMZXNzVGhhbiwKLSAgICAgICAgTGVz c1RoYW5PckVxdWFsLAorICAgICAgICBFcXVhbCA9IEFzc2VtYmxlcjo6Q29uZGl0aW9uRVEsCisg ICAgICAgIE5vdEVxdWFsID0gQXNzZW1ibGVyOjpDb25kaXRpb25ORSwKKyAgICAgICAgQWJvdmUg PSBBc3NlbWJsZXI6OkNvbmRpdGlvbkdUVSwKKyAgICAgICAgQWJvdmVPckVxdWFsID0gQXNzZW1i bGVyOjpDb25kaXRpb25HRVUsCisgICAgICAgIEJlbG93ID0gQXNzZW1ibGVyOjpDb25kaXRpb25M VFUsCisgICAgICAgIEJlbG93T3JFcXVhbCA9IEFzc2VtYmxlcjo6Q29uZGl0aW9uTEVVLAorICAg ICAgICBHcmVhdGVyVGhhbiA9IEFzc2VtYmxlcjo6Q29uZGl0aW9uR1QsCisgICAgICAgIEdyZWF0 ZXJUaGFuT3JFcXVhbCA9IEFzc2VtYmxlcjo6Q29uZGl0aW9uR0UsCisgICAgICAgIExlc3NUaGFu ID0gQXNzZW1ibGVyOjpDb25kaXRpb25MVCwKKyAgICAgICAgTGVzc1RoYW5PckVxdWFsID0gQXNz ZW1ibGVyOjpDb25kaXRpb25MRSwKICAgICB9OwogCisgICAgc3RhdGljIGNvbnN0ZXhwciBSZWxh dGlvbmFsQ29uZGl0aW9uIGludmVydChSZWxhdGlvbmFsQ29uZGl0aW9uIGNvbmQpCisgICAgewor ICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UmVsYXRpb25hbENvbmRpdGlvbj4oQXNzZW1ibGVy OjppbnZlcnQoc3RhdGljX2Nhc3Q8QXNzZW1ibGVyOjpDb25kaXRpb24+KGNvbmQpKSk7CisgICAg fQorCiAgICAgZW51bSBSZXN1bHRDb25kaXRpb24gewogICAgICAgICBPdmVyZmxvdywKICAgICAg ICAgU2lnbmVkLApAQCAtMTU0NywxMSArMTU1Miw2IEBAIHB1YmxpYzoKICAgICBNQUNST19BU1NF TUJMRVJfUklTQ1Y2NF9URU1QTEFURURfTk9PUF9NRVRIT0QoY29tcGFyZTMyKTsKICAgICBNQUNS T19BU1NFTUJMRVJfUklTQ1Y2NF9URU1QTEFURURfTk9PUF9NRVRIT0QoY29tcGFyZTY0KTsKIAot ICAgIHN0YXRpYyBSZWxhdGlvbmFsQ29uZGl0aW9uIGludmVydChSZWxhdGlvbmFsQ29uZGl0aW9u IGNvbmQpCi0gICAgewotICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UmVsYXRpb25hbENvbmRp dGlvbj4oQXNzZW1ibGVyOjppbnZlcnQoc3RhdGljX2Nhc3Q8QXNzZW1ibGVyOjpDb25kaXRpb24+ KGNvbmQpKSk7Ci0gICAgfQotCiAgICAgdGVtcGxhdGU8UHRyVGFnIHJlc3VsdFRhZywgUHRyVGFn IGxvY2F0aW9uVGFnPgogICAgIHN0YXRpYyBGdW5jdGlvblB0cjxyZXN1bHRUYWc+IHJlYWRDYWxs VGFyZ2V0KENvZGVMb2NhdGlvbkNhbGw8bG9jYXRpb25UYWc+IGNhbGwpCiAgICAgewpAQCAtMTcx OSwxMiArMTcxOSwxODkgQEAgcHVibGljOgogICAgIE1BQ1JPX0FTU0VNQkxFUl9SSVNDVjY0X1RF TVBMQVRFRF9OT09QX01FVEhPRCh0ZXN0MzIpOwogICAgIE1BQ1JPX0FTU0VNQkxFUl9SSVNDVjY0 X1RFTVBMQVRFRF9OT09QX01FVEhPRCh0ZXN0NjQpOwogCi0gICAgTUFDUk9fQVNTRU1CTEVSX1JJ U0NWNjRfVEVNUExBVEVEX05PT1BfTUVUSE9EX1dJVEhfUkVUVVJOKGJyYW5jaDgsIEp1bXApOwot ICAgIE1BQ1JPX0FTU0VNQkxFUl9SSVNDVjY0X1RFTVBMQVRFRF9OT09QX01FVEhPRF9XSVRIX1JF VFVSTihicmFuY2gzMiwgSnVtcCk7Ci0gICAgTUFDUk9fQVNTRU1CTEVSX1JJU0NWNjRfVEVNUExB VEVEX05PT1BfTUVUSE9EX1dJVEhfUkVUVVJOKGJyYW5jaDY0LCBKdW1wKTsKKyAgICBKdW1wIGJy YW5jaDgoUmVsYXRpb25hbENvbmRpdGlvbiBjb25kLCBBZGRyZXNzIGFkZHJlc3MsIFRydXN0ZWRJ bW0zMiBpbW0pCisgICAgeworICAgICAgICBhdXRvIHRlbXAgPSB0ZW1wczxEYXRhLCBNZW1vcnk+ KCk7CisgICAgICAgIGF1dG8gcmVzb2x1dGlvbiA9IHJlc29sdmVBZGRyZXNzKGFkZHJlc3MsIHRl bXAubWVtb3J5KCkpOworICAgICAgICBtX2Fzc2VtYmxlci5sYkluc24odGVtcC5tZW1vcnkoKSwg cmVzb2x1dGlvbi5iYXNlLCBJbW06OkkocmVzb2x1dGlvbi5vZmZzZXQpKTsKKyAgICAgICAgbG9h ZEltbWVkaWF0ZShpbW0sIHRlbXAuZGF0YSgpKTsKKyAgICAgICAgcmV0dXJuIG1ha2VCcmFuY2go Y29uZCwgdGVtcC5tZW1vcnkoKSwgdGVtcC5kYXRhKCkpOworICAgIH0KIAotICAgIE1BQ1JPX0FT U0VNQkxFUl9SSVNDVjY0X1RFTVBMQVRFRF9OT09QX01FVEhPRF9XSVRIX1JFVFVSTihicmFuY2gz MldpdGhQYXRjaCwgSnVtcCk7Ci0gICAgTUFDUk9fQVNTRU1CTEVSX1JJU0NWNjRfVEVNUExBVEVE X05PT1BfTUVUSE9EX1dJVEhfUkVUVVJOKGJyYW5jaDMyV2l0aFVuYWxpZ25lZEhhbGZXb3Jkcywg SnVtcCk7CisgICAgSnVtcCBicmFuY2g4KFJlbGF0aW9uYWxDb25kaXRpb24gY29uZCwgQWJzb2x1 dGVBZGRyZXNzIGFkZHJlc3MsIFRydXN0ZWRJbW0zMiBpbW0pCisgICAgeworICAgICAgICBhdXRv IHRlbXAgPSB0ZW1wczxEYXRhLCBNZW1vcnk+KCk7CisgICAgICAgIGxvYWRJbW1lZGlhdGUoVHJ1 c3RlZEltbVB0cihhZGRyZXNzLm1fcHRyKSwgdGVtcC5tZW1vcnkoKSk7CisgICAgICAgIG1fYXNz ZW1ibGVyLmxiSW5zbih0ZW1wLm1lbW9yeSgpLCB0ZW1wLm1lbW9yeSgpLCBJbW06Okk8MD4oKSk7 CisgICAgICAgIGxvYWRJbW1lZGlhdGUoaW1tLCB0ZW1wLmRhdGEoKSk7CisgICAgICAgIHJldHVy biBtYWtlQnJhbmNoKGNvbmQsIHRlbXAubWVtb3J5KCksIHRlbXAuZGF0YSgpKTsKKyAgICB9CisK KyAgICBKdW1wIGJyYW5jaDMyKFJlbGF0aW9uYWxDb25kaXRpb24gY29uZCwgUmVnaXN0ZXJJRCBs aHMsIFJlZ2lzdGVySUQgcmhzKQorICAgIHsKKyAgICAgICAgYXV0byB0ZW1wID0gdGVtcHM8RGF0 YSwgTWVtb3J5PigpOworICAgICAgICBtX2Fzc2VtYmxlci5zaWduRXh0ZW5kPDMyPih0ZW1wLmRh dGEoKSwgbGhzKTsKKyAgICAgICAgbV9hc3NlbWJsZXIuc2lnbkV4dGVuZDwzMj4odGVtcC5tZW1v cnkoKSwgcmhzKTsKKyAgICAgICAgcmV0dXJuIG1ha2VCcmFuY2goY29uZCwgdGVtcC5kYXRhKCks IHRlbXAubWVtb3J5KCkpOworICAgIH0KKworICAgIEp1bXAgYnJhbmNoMzIoUmVsYXRpb25hbENv bmRpdGlvbiBjb25kLCBSZWdpc3RlcklEIGxocywgVHJ1c3RlZEltbTMyIGltbSkKKyAgICB7Cisg ICAgICAgIGF1dG8gdGVtcCA9IHRlbXBzPERhdGEsIE1lbW9yeT4oKTsKKyAgICAgICAgbV9hc3Nl bWJsZXIuc2lnbkV4dGVuZDwzMj4odGVtcC5kYXRhKCksIGxocyk7CisgICAgICAgIGxvYWRJbW1l ZGlhdGUoaW1tLCB0ZW1wLm1lbW9yeSgpKTsKKyAgICAgICAgcmV0dXJuIG1ha2VCcmFuY2goY29u ZCwgdGVtcC5kYXRhKCksIHRlbXAubWVtb3J5KCkpOworICAgIH0KKworICAgIEp1bXAgYnJhbmNo MzIoUmVsYXRpb25hbENvbmRpdGlvbiBjb25kLCBSZWdpc3RlcklEIGxocywgQWRkcmVzcyBhZGRy ZXNzKQorICAgIHsKKyAgICAgICAgYXV0byB0ZW1wID0gdGVtcHM8RGF0YSwgTWVtb3J5PigpOwor ICAgICAgICBhdXRvIHJlc29sdXRpb24gPSByZXNvbHZlQWRkcmVzcyhhZGRyZXNzLCB0ZW1wLm1l bW9yeSgpKTsKKyAgICAgICAgbV9hc3NlbWJsZXIubHdJbnNuKHRlbXAubWVtb3J5KCksIHJlc29s dXRpb24uYmFzZSwgSW1tOjpJKHJlc29sdXRpb24ub2Zmc2V0KSk7CisgICAgICAgIG1fYXNzZW1i bGVyLnNpZ25FeHRlbmQ8MzI+KHRlbXAuZGF0YSgpLCBsaHMpOworICAgICAgICByZXR1cm4gbWFr ZUJyYW5jaChjb25kLCB0ZW1wLmRhdGEoKSwgdGVtcC5tZW1vcnkoKSk7CisgICAgfQorCisgICAg SnVtcCBicmFuY2gzMihSZWxhdGlvbmFsQ29uZGl0aW9uIGNvbmQsIEFkZHJlc3MgYWRkcmVzcywg UmVnaXN0ZXJJRCByaHMpCisgICAgeworICAgICAgICBhdXRvIHRlbXAgPSB0ZW1wczxEYXRhLCBN ZW1vcnk+KCk7CisgICAgICAgIGF1dG8gcmVzb2x1dGlvbiA9IHJlc29sdmVBZGRyZXNzKGFkZHJl c3MsIHRlbXAubWVtb3J5KCkpOworICAgICAgICBtX2Fzc2VtYmxlci5sd0luc24odGVtcC5tZW1v cnkoKSwgcmVzb2x1dGlvbi5iYXNlLCBJbW06OkkocmVzb2x1dGlvbi5vZmZzZXQpKTsKKyAgICAg ICAgbV9hc3NlbWJsZXIuc2lnbkV4dGVuZDwzMj4odGVtcC5kYXRhKCksIHJocyk7CisgICAgICAg IHJldHVybiBtYWtlQnJhbmNoKGNvbmQsIHRlbXAubWVtb3J5KCksIHRlbXAuZGF0YSgpKTsKKyAg ICB9CisKKyAgICBKdW1wIGJyYW5jaDMyKFJlbGF0aW9uYWxDb25kaXRpb24gY29uZCwgQWRkcmVz cyBhZGRyZXNzLCBUcnVzdGVkSW1tMzIgaW1tKQorICAgIHsKKyAgICAgICAgYXV0byB0ZW1wID0g dGVtcHM8RGF0YSwgTWVtb3J5PigpOworICAgICAgICBhdXRvIHJlc29sdXRpb24gPSByZXNvbHZl QWRkcmVzcyhhZGRyZXNzLCB0ZW1wLm1lbW9yeSgpKTsKKyAgICAgICAgbV9hc3NlbWJsZXIubHdJ bnNuKHRlbXAubWVtb3J5KCksIHJlc29sdXRpb24uYmFzZSwgSW1tOjpJKHJlc29sdXRpb24ub2Zm c2V0KSk7CisgICAgICAgIGxvYWRJbW1lZGlhdGUoaW1tLCB0ZW1wLmRhdGEoKSk7CisgICAgICAg IHJldHVybiBtYWtlQnJhbmNoKGNvbmQsIHRlbXAubWVtb3J5KCksIHRlbXAuZGF0YSgpKTsKKyAg ICB9CisKKyAgICBKdW1wIGJyYW5jaDMyKFJlbGF0aW9uYWxDb25kaXRpb24gY29uZCwgQWJzb2x1 dGVBZGRyZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgcmhzKQorICAgIHsKKyAgICAgICAgYXV0byB0 ZW1wID0gdGVtcHM8RGF0YSwgTWVtb3J5PigpOworICAgICAgICBsb2FkSW1tZWRpYXRlKFRydXN0 ZWRJbW1QdHIoYWRkcmVzcy5tX3B0ciksIHRlbXAubWVtb3J5KCkpOworICAgICAgICBtX2Fzc2Vt Ymxlci5sd0luc24odGVtcC5tZW1vcnkoKSwgdGVtcC5tZW1vcnkoKSwgSW1tOjpJPDA+KCkpOwor ICAgICAgICBtX2Fzc2VtYmxlci5zaWduRXh0ZW5kPDMyPih0ZW1wLmRhdGEoKSwgcmhzKTsKKyAg ICAgICAgcmV0dXJuIG1ha2VCcmFuY2goY29uZCwgdGVtcC5tZW1vcnkoKSwgdGVtcC5kYXRhKCkp OworICAgIH0KKworICAgIEp1bXAgYnJhbmNoMzIoUmVsYXRpb25hbENvbmRpdGlvbiBjb25kLCBC YXNlSW5kZXggYWRkcmVzcywgVHJ1c3RlZEltbTMyIGltbSkKKyAgICB7CisgICAgICAgIGF1dG8g dGVtcCA9IHRlbXBzPERhdGEsIE1lbW9yeT4oKTsKKyAgICAgICAgYXV0byByZXNvbHV0aW9uID0g cmVzb2x2ZUFkZHJlc3MoYWRkcmVzcywgdGVtcC5tZW1vcnkoKSk7CisgICAgICAgIG1fYXNzZW1i bGVyLmx3SW5zbih0ZW1wLm1lbW9yeSgpLCByZXNvbHV0aW9uLmJhc2UsIEltbTo6SShyZXNvbHV0 aW9uLm9mZnNldCkpOworICAgICAgICBsb2FkSW1tZWRpYXRlKGltbSwgdGVtcC5kYXRhKCkpOwor ICAgICAgICByZXR1cm4gbWFrZUJyYW5jaChjb25kLCB0ZW1wLm1lbW9yeSgpLCB0ZW1wLmRhdGEo KSk7CisgICAgfQorCisgICAgSnVtcCBicmFuY2g2NChSZWxhdGlvbmFsQ29uZGl0aW9uIGNvbmQs IFJlZ2lzdGVySUQgbGhzLCBSZWdpc3RlcklEIHJocykKKyAgICB7CisgICAgICAgIHJldHVybiBt YWtlQnJhbmNoKGNvbmQsIGxocywgcmhzKTsKKyAgICB9CisKKyAgICBKdW1wIGJyYW5jaDY0KFJl bGF0aW9uYWxDb25kaXRpb24gY29uZCwgUmVnaXN0ZXJJRCBsaHMsIFRydXN0ZWRJbW0zMiBpbW0p CisgICAgeworICAgICAgICBhdXRvIHRlbXAgPSB0ZW1wczxEYXRhPigpOworICAgICAgICBsb2Fk SW1tZWRpYXRlKGltbSwgdGVtcC5kYXRhKCkpOworICAgICAgICByZXR1cm4gbWFrZUJyYW5jaChj b25kLCBsaHMsIHRlbXAuZGF0YSgpKTsKKyAgICB9CisKKyAgICBKdW1wIGJyYW5jaDY0KFJlbGF0 aW9uYWxDb25kaXRpb24gY29uZCwgUmVnaXN0ZXJJRCBsaHMsIFRydXN0ZWRJbW02NCBpbW0pCisg ICAgeworICAgICAgICBhdXRvIHRlbXAgPSB0ZW1wczxEYXRhPigpOworICAgICAgICBsb2FkSW1t ZWRpYXRlKGltbSwgdGVtcC5kYXRhKCkpOworICAgICAgICByZXR1cm4gbWFrZUJyYW5jaChjb25k LCBsaHMsIHRlbXAuZGF0YSgpKTsKKyAgICB9CisKKyAgICBKdW1wIGJyYW5jaDY0KFJlbGF0aW9u YWxDb25kaXRpb24gY29uZCwgUmVnaXN0ZXJJRCBsZWZ0LCBJbW02NCByaWdodCkKKyAgICB7Cisg ICAgICAgIHJldHVybiBicmFuY2g2NChjb25kLCBsZWZ0LCByaWdodC5hc1RydXN0ZWRJbW02NCgp KTsKKyAgICB9CisKKyAgICBKdW1wIGJyYW5jaDY0KFJlbGF0aW9uYWxDb25kaXRpb24gY29uZCwg UmVnaXN0ZXJJRCBsaHMsIEFkZHJlc3MgYWRkcmVzcykKKyAgICB7CisgICAgICAgIGF1dG8gdGVt cCA9IHRlbXBzPERhdGEsIE1lbW9yeT4oKTsKKyAgICAgICAgYXV0byByZXNvbHV0aW9uID0gcmVz b2x2ZUFkZHJlc3MoYWRkcmVzcywgdGVtcC5tZW1vcnkoKSk7CisgICAgICAgIG1fYXNzZW1ibGVy LmxkSW5zbih0ZW1wLmRhdGEoKSwgcmVzb2x1dGlvbi5iYXNlLCBJbW06OkkocmVzb2x1dGlvbi5v ZmZzZXQpKTsKKyAgICAgICAgcmV0dXJuIG1ha2VCcmFuY2goY29uZCwgbGhzLCB0ZW1wLmRhdGEo KSk7CisgICAgfQorCisgICAgSnVtcCBicmFuY2g2NChSZWxhdGlvbmFsQ29uZGl0aW9uIGNvbmQs IFJlZ2lzdGVySUQgbGhzLCBBYnNvbHV0ZUFkZHJlc3MgYWRkcmVzcykKKyAgICB7CisgICAgICAg IGF1dG8gdGVtcCA9IHRlbXBzPERhdGEsIE1lbW9yeT4oKTsKKyAgICAgICAgbG9hZEltbWVkaWF0 ZShUcnVzdGVkSW1tUHRyKGFkZHJlc3MubV9wdHIpLCB0ZW1wLm1lbW9yeSgpKTsKKyAgICAgICAg bV9hc3NlbWJsZXIubGRJbnNuKHRlbXAuZGF0YSgpLCB0ZW1wLm1lbW9yeSgpLCBJbW06Okk8MD4o KSk7CisgICAgICAgIHJldHVybiBtYWtlQnJhbmNoKGNvbmQsIGxocywgdGVtcC5kYXRhKCkpOwor ICAgIH0KKworICAgIEp1bXAgYnJhbmNoNjQoUmVsYXRpb25hbENvbmRpdGlvbiBjb25kLCBBZGRy ZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgcmhzKQorICAgIHsKKyAgICAgICAgYXV0byB0ZW1wID0g dGVtcHM8RGF0YSwgTWVtb3J5PigpOworICAgICAgICBhdXRvIHJlc29sdXRpb24gPSByZXNvbHZl QWRkcmVzcyhhZGRyZXNzLCB0ZW1wLm1lbW9yeSgpKTsKKyAgICAgICAgbV9hc3NlbWJsZXIubGRJ bnNuKHRlbXAuZGF0YSgpLCByZXNvbHV0aW9uLmJhc2UsIEltbTo6SShyZXNvbHV0aW9uLm9mZnNl dCkpOworICAgICAgICByZXR1cm4gbWFrZUJyYW5jaChjb25kLCB0ZW1wLmRhdGEoKSwgcmhzKTsK KyAgICB9CisKKyAgICBKdW1wIGJyYW5jaDY0KFJlbGF0aW9uYWxDb25kaXRpb24gY29uZCwgQWRk cmVzcyBhZGRyZXNzLCBUcnVzdGVkSW1tMzIgaW1tKQorICAgIHsKKyAgICAgICAgYXV0byB0ZW1w ID0gdGVtcHM8RGF0YSwgTWVtb3J5PigpOworICAgICAgICBhdXRvIHJlc29sdXRpb24gPSByZXNv bHZlQWRkcmVzcyhhZGRyZXNzLCB0ZW1wLm1lbW9yeSgpKTsKKyAgICAgICAgbV9hc3NlbWJsZXIu bGRJbnNuKHRlbXAubWVtb3J5KCksIHJlc29sdXRpb24uYmFzZSwgSW1tOjpJKHJlc29sdXRpb24u b2Zmc2V0KSk7CisgICAgICAgIGxvYWRJbW1lZGlhdGUoaW1tLCB0ZW1wLmRhdGEoKSk7CisgICAg ICAgIHJldHVybiBtYWtlQnJhbmNoKGNvbmQsIHRlbXAubWVtb3J5KCksIHRlbXAuZGF0YSgpKTsK KyAgICB9CisKKyAgICBKdW1wIGJyYW5jaDY0KFJlbGF0aW9uYWxDb25kaXRpb24gY29uZCwgQWRk cmVzcyBhZGRyZXNzLCBUcnVzdGVkSW1tNjQgaW1tKQorICAgIHsKKyAgICAgICAgYXV0byB0ZW1w ID0gdGVtcHM8RGF0YSwgTWVtb3J5PigpOworICAgICAgICBhdXRvIHJlc29sdXRpb24gPSByZXNv bHZlQWRkcmVzcyhhZGRyZXNzLCB0ZW1wLm1lbW9yeSgpKTsKKyAgICAgICAgbV9hc3NlbWJsZXIu bGRJbnNuKHRlbXAubWVtb3J5KCksIHJlc29sdXRpb24uYmFzZSwgSW1tOjpJKHJlc29sdXRpb24u b2Zmc2V0KSk7CisgICAgICAgIGxvYWRJbW1lZGlhdGUoaW1tLCB0ZW1wLmRhdGEoKSk7CisgICAg ICAgIHJldHVybiBtYWtlQnJhbmNoKGNvbmQsIHRlbXAubWVtb3J5KCksIHRlbXAuZGF0YSgpKTsK KyAgICB9CisKKyAgICBKdW1wIGJyYW5jaDY0KFJlbGF0aW9uYWxDb25kaXRpb24gY29uZCwgQWJz b2x1dGVBZGRyZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgcmhzKQorICAgIHsKKyAgICAgICAgYXV0 byB0ZW1wID0gdGVtcHM8RGF0YSwgTWVtb3J5PigpOworICAgICAgICBsb2FkSW1tZWRpYXRlKFRy dXN0ZWRJbW1QdHIoYWRkcmVzcy5tX3B0ciksIHRlbXAubWVtb3J5KCkpOworICAgICAgICBtX2Fz c2VtYmxlci5sZEluc24odGVtcC5kYXRhKCksIHRlbXAubWVtb3J5KCksIEltbTo6STwwPigpKTsK KyAgICAgICAgcmV0dXJuIG1ha2VCcmFuY2goY29uZCwgdGVtcC5kYXRhKCksIHJocyk7CisgICAg fQorCisgICAgSnVtcCBicmFuY2g2NChSZWxhdGlvbmFsQ29uZGl0aW9uIGNvbmQsIEFic29sdXRl QWRkcmVzcyBhZGRyZXNzLCBUcnVzdGVkSW1tMzIgaW1tKQorICAgIHsKKyAgICAgICAgYXV0byB0 ZW1wID0gdGVtcHM8RGF0YSwgTWVtb3J5PigpOworICAgICAgICBsb2FkSW1tZWRpYXRlKFRydXN0 ZWRJbW1QdHIoYWRkcmVzcy5tX3B0ciksIHRlbXAubWVtb3J5KCkpOworICAgICAgICBtX2Fzc2Vt Ymxlci5sZEluc24odGVtcC5tZW1vcnkoKSwgdGVtcC5tZW1vcnkoKSwgSW1tOjpJPDA+KCkpOwor ICAgICAgICBsb2FkSW1tZWRpYXRlKGltbSwgdGVtcC5kYXRhKCkpOworICAgICAgICByZXR1cm4g bWFrZUJyYW5jaChjb25kLCB0ZW1wLm1lbW9yeSgpLCB0ZW1wLmRhdGEoKSk7CisgICAgfQorCisg ICAgSnVtcCBicmFuY2g2NChSZWxhdGlvbmFsQ29uZGl0aW9uIGNvbmQsIEFic29sdXRlQWRkcmVz cyBhZGRyZXNzLCBUcnVzdGVkSW1tNjQgaW1tKQorICAgIHsKKyAgICAgICAgYXV0byB0ZW1wID0g dGVtcHM8RGF0YSwgTWVtb3J5PigpOworICAgICAgICBsb2FkSW1tZWRpYXRlKFRydXN0ZWRJbW1Q dHIoYWRkcmVzcy5tX3B0ciksIHRlbXAubWVtb3J5KCkpOworICAgICAgICBtX2Fzc2VtYmxlci5s ZEluc24odGVtcC5tZW1vcnkoKSwgdGVtcC5tZW1vcnkoKSwgSW1tOjpJPDA+KCkpOworICAgICAg ICBsb2FkSW1tZWRpYXRlKGltbSwgdGVtcC5kYXRhKCkpOworICAgICAgICByZXR1cm4gbWFrZUJy YW5jaChjb25kLCB0ZW1wLm1lbW9yeSgpLCB0ZW1wLmRhdGEoKSk7CisgICAgfQorCisgICAgSnVt cCBicmFuY2g2NChSZWxhdGlvbmFsQ29uZGl0aW9uIGNvbmQsIEJhc2VJbmRleCBhZGRyZXNzLCBS ZWdpc3RlcklEIHJocykKKyAgICB7CisgICAgICAgIGF1dG8gdGVtcCA9IHRlbXBzPERhdGEsIE1l bW9yeT4oKTsKKyAgICAgICAgYXV0byByZXNvbHV0aW9uID0gcmVzb2x2ZUFkZHJlc3MoYWRkcmVz cywgdGVtcC5tZW1vcnkoKSk7CisgICAgICAgIG1fYXNzZW1ibGVyLmxkSW5zbih0ZW1wLmRhdGEo KSwgcmVzb2x1dGlvbi5iYXNlLCBJbW06OkkocmVzb2x1dGlvbi5vZmZzZXQpKTsKKyAgICAgICAg cmV0dXJuIG1ha2VCcmFuY2goY29uZCwgdGVtcC5kYXRhKCksIHJocyk7CisgICAgfQorCisgICAg SnVtcCBicmFuY2gzMldpdGhVbmFsaWduZWRIYWxmV29yZHMoUmVsYXRpb25hbENvbmRpdGlvbiBj b25kLCBCYXNlSW5kZXggYWRkcmVzcywgVHJ1c3RlZEltbTMyIGltbSkKKyAgICB7CisgICAgICAg IHJldHVybiBicmFuY2gzMihjb25kLCBhZGRyZXNzLCBpbW0pOworICAgIH0KIAogICAgIE1BQ1JP X0FTU0VNQkxFUl9SSVNDVjY0X1RFTVBMQVRFRF9OT09QX01FVEhPRF9XSVRIX1JFVFVSTihicmFu Y2hBZGQzMiwgSnVtcCk7CiAgICAgTUFDUk9fQVNTRU1CTEVSX1JJU0NWNjRfVEVNUExBVEVEX05P T1BfTUVUSE9EX1dJVEhfUkVUVVJOKGJyYW5jaEFkZDY0LCBKdW1wKTsKQEAgLTE3NDcsNiArMTky NCw3IEBAIHB1YmxpYzoKICAgICBNQUNST19BU1NFTUJMRVJfUklTQ1Y2NF9URU1QTEFURURfTk9P UF9NRVRIT0RfV0lUSF9SRVRVUk4obW92ZVdpdGhQYXRjaCwgRGF0YUxhYmVsMzIpOwogICAgIE1B Q1JPX0FTU0VNQkxFUl9SSVNDVjY0X1RFTVBMQVRFRF9OT09QX01FVEhPRF9XSVRIX1JFVFVSTiht b3ZlV2l0aFBhdGNoLCBEYXRhTGFiZWxQdHIpOwogCisgICAgTUFDUk9fQVNTRU1CTEVSX1JJU0NW NjRfVEVNUExBVEVEX05PT1BfTUVUSE9EX1dJVEhfUkVUVVJOKGJyYW5jaDMyV2l0aFBhdGNoLCBK dW1wKTsKICAgICBNQUNST19BU1NFTUJMRVJfUklTQ1Y2NF9URU1QTEFURURfTk9PUF9NRVRIT0Rf V0lUSF9SRVRVUk4oYnJhbmNoUHRyV2l0aFBhdGNoLCBKdW1wKTsKIAogICAgIE1BQ1JPX0FTU0VN QkxFUl9SSVNDVjY0X1RFTVBMQVRFRF9OT09QX01FVEhPRF9XSVRIX1JFVFVSTihwYXRjaGFibGVC cmFuY2g4LCBQYXRjaGFibGVKdW1wKTsKQEAgLTIzNDcsNiArMjUyNSwzNyBAQCBwcml2YXRlOgog ICAgICAgICBtX2Fzc2VtYmxlci5hZGRJbnNuKGRlc3RpbmF0aW9uLCBhZGRyZXNzLmJhc2UsIGRl c3RpbmF0aW9uKTsKICAgICAgICAgcmV0dXJuIHsgZGVzdGluYXRpb24sIDAgfTsKICAgICB9CisK KyAgICBKdW1wIG1ha2VCcmFuY2goUmVsYXRpb25hbENvbmRpdGlvbiBjb25kaXRpb24sIFJlZ2lz dGVySUQgbGhzLCBSZWdpc3RlcklEIHJocykKKyAgICB7CisgICAgICAgIGF1dG8gbGFiZWwgPSBt X2Fzc2VtYmxlci5sYWJlbCgpOworICAgICAgICBtX2Fzc2VtYmxlci5icmFuY2hQbGFjZWhvbGRl cigKKyAgICAgICAgICAgIFsmXSB7CisgICAgICAgICAgICAgICAgc3dpdGNoIChjb25kaXRpb24p IHsKKyAgICAgICAgICAgICAgICBjYXNlIEVxdWFsOgorICAgICAgICAgICAgICAgICAgICByZXR1 cm4gbV9hc3NlbWJsZXIuYmVxSW5zbihsaHMsIHJocywgSW1tOjpCPDA+KCkpOworICAgICAgICAg ICAgICAgIGNhc2UgTm90RXF1YWw6CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBtX2Fzc2Vt Ymxlci5ibmVJbnNuKGxocywgcmhzLCBJbW06OkI8MD4oKSk7CisgICAgICAgICAgICAgICAgY2Fz ZSBBYm92ZToKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG1fYXNzZW1ibGVyLmJsdHVJbnNu KHJocywgbGhzLCBJbW06OkI8MD4oKSk7CisgICAgICAgICAgICAgICAgY2FzZSBBYm92ZU9yRXF1 YWw6CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBtX2Fzc2VtYmxlci5iZ2V1SW5zbihsaHMs IHJocywgSW1tOjpCPDA+KCkpOworICAgICAgICAgICAgICAgIGNhc2UgQmVsb3c6CisgICAgICAg ICAgICAgICAgICAgIHJldHVybiBtX2Fzc2VtYmxlci5ibHR1SW5zbihsaHMsIHJocywgSW1tOjpC PDA+KCkpOworICAgICAgICAgICAgICAgIGNhc2UgQmVsb3dPckVxdWFsOgorICAgICAgICAgICAg ICAgICAgICByZXR1cm4gbV9hc3NlbWJsZXIuYmdldUluc24ocmhzLCBsaHMsIEltbTo6QjwwPigp KTsKKyAgICAgICAgICAgICAgICBjYXNlIEdyZWF0ZXJUaGFuOgorICAgICAgICAgICAgICAgICAg ICByZXR1cm4gbV9hc3NlbWJsZXIuYmx0SW5zbihyaHMsIGxocywgSW1tOjpCPDA+KCkpOworICAg ICAgICAgICAgICAgIGNhc2UgR3JlYXRlclRoYW5PckVxdWFsOgorICAgICAgICAgICAgICAgICAg ICByZXR1cm4gbV9hc3NlbWJsZXIuYmdlSW5zbihsaHMsIHJocywgSW1tOjpCPDA+KCkpOworICAg ICAgICAgICAgICAgIGNhc2UgTGVzc1RoYW46CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBt X2Fzc2VtYmxlci5ibHRJbnNuKGxocywgcmhzLCBJbW06OkI8MD4oKSk7CisgICAgICAgICAgICAg ICAgY2FzZSBMZXNzVGhhbk9yRXF1YWw6CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBtX2Fz c2VtYmxlci5iZ2VJbnNuKHJocywgbGhzLCBJbW06OkI8MD4oKSk7CisgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgfSk7CisgICAgICAgIHJldHVybiBKdW1wKGxhYmVsKTsKKyAgICB9CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBKU0MK