185189 2018-05-02 01:47:19 -0700 [DFG] Unify compare related code in 32bit and 64bit 2018-05-02 17:49:22 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1419599 0 ysuzuki 2018-05-02 01:47:19 -0700 [DFG] Unify compare related code in 32bit and 64bit 1419600 1 339291 ysuzuki 2018-05-02 01:47:58 -0700 Created attachment 339291 Patch 1419703 2 339291 mark.lam 2018-05-02 10:07:59 -0700 Comment on attachment 339291 Patch r=me 1419957 3 ysuzuki 2018-05-02 17:48:27 -0700 Committed r231286: <https://trac.webkit.org/changeset/231286> 1419958 4 webkit-bug-importer 2018-05-02 17:49:22 -0700 <rdar://problem/39927099> 339291 2018-05-02 01:47:58 -0700 2018-05-02 10:07:59 -0700 Patch bug-185189-20180502174757.patch text/plain 14118 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 YTExNjI3NDFhNGVhMDcyMTk5M2FjMmE0ZmNiMzAwYjk5MTBiNjNlLi5mNDA2NTliMTMyYmVhNWI5 NTg5MTNjZTA0YmY1NWI1MDBmYWExNWNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxOC0wNS0wMiAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbREZHXSBVbmlmeSBjb21wYXJlIHJlbGF0ZWQgY29kZSBpbiAzMmJp dCBhbmQgNjRiaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4NTE4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggdW5pZmllcyBzb21lIHBhcnQgb2YgY29tcGFyZSByZWxhdGVkIGNvZGUg aW4gMzJiaXQgYW5kIDY0Yml0CisgICAgICAgIHRvIHJlZHVjZSB0aGUgc2l6ZSBvZiAzMmJpdCBz cGVjaWZpYyBERkcgY29kZS4KKworICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6 CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVJbnQzMkNvbXBhcmUp OgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlRG91YmxlQ29tcGFy ZSk6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVPYmplY3RFcXVh bGl0eSk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwOgorICAgICAg ICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlT2JqZWN0RXF1YWxpdHkpOiBEZWxl dGVkLgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlSW50MzJDb21w YXJlKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGls ZURvdWJsZUNvbXBhcmUpOiBEZWxldGVkLgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJ VDY0LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZU9iamVj dEVxdWFsaXR5KTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6 Y29tcGlsZUludDMyQ29tcGFyZSk6IERlbGV0ZWQuCisgICAgICAgIChKU0M6OkRGRzo6U3BlY3Vs YXRpdmVKSVQ6OmNvbXBpbGVEb3VibGVDb21wYXJlKTogRGVsZXRlZC4KKwogMjAxOC0wNS0wMSAg WXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBbSlNDXSBB ZGQgU2FtZVZhbHVlIERGRyBub2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U3BlY3VsYXRpdmVKSVQuY3BwCmluZGV4IDgxY2JiZTY5MTFkNTg5OWNkN2U0NTE4ZDAxMTFkNzgx YzE4NTQ1NWMuLjczNWI2MjliMjY0ZGQ4NTJmNjFlYmJmZTQyNWFkYjc2MDZhNmEyZGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCkBAIC02 MDY5LDYgKzYwNjksODQgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZUJvb2xlYW5Db21w YXJlKE5vZGUqIG5vZGUsIE1hY3JvQXNzZW1ibGVyOjpSZWxhdGlvbmEKICAgICB1bmJsZXNzZWRC b29sZWFuUmVzdWx0KHJlc3VsdC5ncHIoKSwgbm9kZSk7CiB9CiAKK3ZvaWQgU3BlY3VsYXRpdmVK SVQ6OmNvbXBpbGVJbnQzMkNvbXBhcmUoTm9kZSogbm9kZSwgTWFjcm9Bc3NlbWJsZXI6OlJlbGF0 aW9uYWxDb25kaXRpb24gY29uZGl0aW9uKQoreworICAgIGlmIChub2RlLT5jaGlsZDEoKS0+aXNJ bnQzMkNvbnN0YW50KCkpIHsKKyAgICAgICAgU3BlY3VsYXRlSW50MzJPcGVyYW5kIG9wMih0aGlz LCBub2RlLT5jaGlsZDIoKSk7CisgICAgICAgIEdQUlRlbXBvcmFyeSByZXN1bHQodGhpcywgUmV1 c2UsIG9wMik7CisgICAgICAgIGludDMyX3QgaW1tID0gbm9kZS0+Y2hpbGQxKCktPmFzSW50MzIo KTsKKyAgICAgICAgbV9qaXQuY29tcGFyZTMyKGNvbmRpdGlvbiwgSklUQ29tcGlsZXI6OkltbTMy KGltbSksIG9wMi5ncHIoKSwgcmVzdWx0LmdwcigpKTsKKworICAgICAgICB1bmJsZXNzZWRCb29s ZWFuUmVzdWx0KHJlc3VsdC5ncHIoKSwgbm9kZSk7CisgICAgfSBlbHNlIGlmIChub2RlLT5jaGls ZDIoKS0+aXNJbnQzMkNvbnN0YW50KCkpIHsKKyAgICAgICAgU3BlY3VsYXRlSW50MzJPcGVyYW5k IG9wMSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7CisgICAgICAgIEdQUlRlbXBvcmFyeSByZXN1bHQo dGhpcywgUmV1c2UsIG9wMSk7CisgICAgICAgIGludDMyX3QgaW1tID0gbm9kZS0+Y2hpbGQyKCkt PmFzSW50MzIoKTsKKyAgICAgICAgbV9qaXQuY29tcGFyZTMyKGNvbmRpdGlvbiwgb3AxLmdwcigp LCBKSVRDb21waWxlcjo6SW1tMzIoaW1tKSwgcmVzdWx0LmdwcigpKTsKKworICAgICAgICB1bmJs ZXNzZWRCb29sZWFuUmVzdWx0KHJlc3VsdC5ncHIoKSwgbm9kZSk7CisgICAgfSBlbHNlIHsKKyAg ICAgICAgU3BlY3VsYXRlSW50MzJPcGVyYW5kIG9wMSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7Cisg ICAgICAgIFNwZWN1bGF0ZUludDMyT3BlcmFuZCBvcDIodGhpcywgbm9kZS0+Y2hpbGQyKCkpOwor ICAgICAgICBHUFJUZW1wb3JhcnkgcmVzdWx0KHRoaXMsIFJldXNlLCBvcDEsIG9wMik7CisgICAg ICAgIG1faml0LmNvbXBhcmUzMihjb25kaXRpb24sIG9wMS5ncHIoKSwgb3AyLmdwcigpLCByZXN1 bHQuZ3ByKCkpOworCisgICAgICAgIHVuYmxlc3NlZEJvb2xlYW5SZXN1bHQocmVzdWx0Lmdwcigp LCBub2RlKTsKKyAgICB9Cit9CisKK3ZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVEb3VibGVD b21wYXJlKE5vZGUqIG5vZGUsIE1hY3JvQXNzZW1ibGVyOjpEb3VibGVDb25kaXRpb24gY29uZGl0 aW9uKQoreworICAgIFNwZWN1bGF0ZURvdWJsZU9wZXJhbmQgb3AxKHRoaXMsIG5vZGUtPmNoaWxk MSgpKTsKKyAgICBTcGVjdWxhdGVEb3VibGVPcGVyYW5kIG9wMih0aGlzLCBub2RlLT5jaGlsZDIo KSk7CisgICAgR1BSVGVtcG9yYXJ5IHJlc3VsdCh0aGlzKTsKKworICAgIEZQUlJlZyBvcDFGUFIg PSBvcDEuZnByKCk7CisgICAgRlBSUmVnIG9wMkZQUiA9IG9wMi5mcHIoKTsKKyAgICBHUFJSZWcg cmVzdWx0R1BSID0gcmVzdWx0LmdwcigpOworCisgICAgbV9qaXQuY29tcGFyZURvdWJsZShjb25k aXRpb24sIG9wMUZQUiwgb3AyRlBSLCByZXN1bHRHUFIpOworCisgICAgdW5ibGVzc2VkQm9vbGVh blJlc3VsdChyZXN1bHRHUFIsIG5vZGUpOworfQorCit2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21w aWxlT2JqZWN0RXF1YWxpdHkoTm9kZSogbm9kZSkKK3sKKyAgICBTcGVjdWxhdGVDZWxsT3BlcmFu ZCBvcDEodGhpcywgbm9kZS0+Y2hpbGQxKCkpOworICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIG9w Mih0aGlzLCBub2RlLT5jaGlsZDIoKSk7CisgICAgR1BSVGVtcG9yYXJ5IHJlc3VsdCh0aGlzLCBS ZXVzZSwgb3AxKTsKKworICAgIEdQUlJlZyBvcDFHUFIgPSBvcDEuZ3ByKCk7CisgICAgR1BSUmVn IG9wMkdQUiA9IG9wMi5ncHIoKTsKKyAgICBHUFJSZWcgcmVzdWx0R1BSID0gcmVzdWx0Lmdwcigp OworCisgICAgaWYgKG1hc3F1ZXJhZGVzQXNVbmRlZmluZWRXYXRjaHBvaW50SXNTdGlsbFZhbGlk KCkpIHsKKyAgICAgICAgREZHX1RZUEVfQ0hFQ0soCisgICAgICAgICAgICBKU1ZhbHVlU291cmNl Ojp1bmJveGVkQ2VsbChvcDFHUFIpLCBub2RlLT5jaGlsZDEoKSwgU3BlY09iamVjdCwgbV9qaXQu YnJhbmNoSWZOb3RPYmplY3Qob3AxR1BSKSk7CisgICAgICAgIERGR19UWVBFX0NIRUNLKAorICAg ICAgICAgICAgSlNWYWx1ZVNvdXJjZTo6dW5ib3hlZENlbGwob3AyR1BSKSwgbm9kZS0+Y2hpbGQy KCksIFNwZWNPYmplY3QsIG1faml0LmJyYW5jaElmTm90T2JqZWN0KG9wMkdQUikpOworICAgIH0g ZWxzZSB7CisgICAgICAgIERGR19UWVBFX0NIRUNLKAorICAgICAgICAgICAgSlNWYWx1ZVNvdXJj ZTo6dW5ib3hlZENlbGwob3AxR1BSKSwgbm9kZS0+Y2hpbGQxKCksIFNwZWNPYmplY3QsIG1faml0 LmJyYW5jaElmTm90T2JqZWN0KG9wMUdQUikpOworICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKEJh ZFR5cGUsIEpTVmFsdWVTb3VyY2U6OnVuYm94ZWRDZWxsKG9wMUdQUiksIG5vZGUtPmNoaWxkMSgp LAorICAgICAgICAgICAgbV9qaXQuYnJhbmNoVGVzdDgoCisgICAgICAgICAgICAgICAgTWFjcm9B c3NlbWJsZXI6Ok5vblplcm8sCisgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkFkZHJl c3Mob3AxR1BSLCBKU0NlbGw6OnR5cGVJbmZvRmxhZ3NPZmZzZXQoKSksCisgICAgICAgICAgICAg ICAgTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW0zMihNYXNxdWVyYWRlc0FzVW5kZWZpbmVkKSkp OworCisgICAgICAgIERGR19UWVBFX0NIRUNLKAorICAgICAgICAgICAgSlNWYWx1ZVNvdXJjZTo6 dW5ib3hlZENlbGwob3AyR1BSKSwgbm9kZS0+Y2hpbGQyKCksIFNwZWNPYmplY3QsIG1faml0LmJy YW5jaElmTm90T2JqZWN0KG9wMkdQUikpOworICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKEJhZFR5 cGUsIEpTVmFsdWVTb3VyY2U6OnVuYm94ZWRDZWxsKG9wMkdQUiksIG5vZGUtPmNoaWxkMigpLAor ICAgICAgICAgICAgbV9qaXQuYnJhbmNoVGVzdDgoCisgICAgICAgICAgICAgICAgTWFjcm9Bc3Nl bWJsZXI6Ok5vblplcm8sCisgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Mo b3AyR1BSLCBKU0NlbGw6OnR5cGVJbmZvRmxhZ3NPZmZzZXQoKSksCisgICAgICAgICAgICAgICAg TWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW0zMihNYXNxdWVyYWRlc0FzVW5kZWZpbmVkKSkpOwor ICAgIH0KKworICAgIG1faml0LmNvbXBhcmVQdHIoTWFjcm9Bc3NlbWJsZXI6OkVxdWFsLCBvcDFH UFIsIG9wMkdQUiwgcmVzdWx0R1BSKTsKKyAgICB1bmJsZXNzZWRCb29sZWFuUmVzdWx0KHJlc3Vs dEdQUiwgbm9kZSk7Cit9CisKIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVTeW1ib2xFcXVh bGl0eShOb2RlKiBub2RlKQogewogICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIGxlZnQodGhpcywg bm9kZS0+Y2hpbGQxKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U3BlY3VsYXRpdmVKSVQzMl82NC5jcHAKaW5kZXggM2QzOTYyMTMzNWE3NTM1ZTE0NGM3MDVkMmY2 ODhhNDM5ZmI2YTVlOC4uOTYyYmQyMGVkODM5ZWE1NjIzZTFmZGEwY2IyMWIzODlhYjFmMjY3NCAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMy XzY0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklU MzJfNjQuY3BwCkBAIC0xMjIyLDQ5ICsxMjIyLDYgQEAgR1BSUmVnIFNwZWN1bGF0aXZlSklUOjpm aWxsU3BlY3VsYXRlQm9vbGVhbihFZGdlIGVkZ2UpCiAgICAgfQogfQogCi12b2lkIFNwZWN1bGF0 aXZlSklUOjpjb21waWxlT2JqZWN0RXF1YWxpdHkoTm9kZSogbm9kZSkKLXsKLSAgICBTcGVjdWxh dGVDZWxsT3BlcmFuZCBvcDEodGhpcywgbm9kZS0+Y2hpbGQxKCkpOwotICAgIFNwZWN1bGF0ZUNl bGxPcGVyYW5kIG9wMih0aGlzLCBub2RlLT5jaGlsZDIoKSk7Ci0gICAgR1BSUmVnIG9wMUdQUiA9 IG9wMS5ncHIoKTsKLSAgICBHUFJSZWcgb3AyR1BSID0gb3AyLmdwcigpOwotICAgIAotICAgIGlm IChtYXNxdWVyYWRlc0FzVW5kZWZpbmVkV2F0Y2hwb2ludElzU3RpbGxWYWxpZCgpKSB7Ci0gICAg ICAgIERGR19UWVBFX0NIRUNLKAotICAgICAgICAgICAgSlNWYWx1ZVNvdXJjZTo6dW5ib3hlZENl bGwob3AxR1BSKSwgbm9kZS0+Y2hpbGQxKCksIFNwZWNPYmplY3QsIG1faml0LmJyYW5jaElmTm90 T2JqZWN0KG9wMUdQUikpOwotICAgICAgICBERkdfVFlQRV9DSEVDSygKLSAgICAgICAgICAgIEpT VmFsdWVTb3VyY2U6OnVuYm94ZWRDZWxsKG9wMkdQUiksIG5vZGUtPmNoaWxkMigpLCBTcGVjT2Jq ZWN0LCBtX2ppdC5icmFuY2hJZk5vdE9iamVjdChvcDJHUFIpKTsKLSAgICB9IGVsc2UgewotICAg ICAgICBERkdfVFlQRV9DSEVDSygKLSAgICAgICAgICAgIEpTVmFsdWVTb3VyY2U6OnVuYm94ZWRD ZWxsKG9wMUdQUiksIG5vZGUtPmNoaWxkMSgpLCBTcGVjT2JqZWN0LCBtX2ppdC5icmFuY2hJZk5v dE9iamVjdChvcDFHUFIpKTsKLSAgICAgICAgc3BlY3VsYXRpb25DaGVjayhCYWRUeXBlLCBKU1Zh bHVlU291cmNlOjp1bmJveGVkQ2VsbChvcDFHUFIpLCBub2RlLT5jaGlsZDEoKSwKLSAgICAgICAg ICAgIG1faml0LmJyYW5jaFRlc3Q4KAotICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpO b25aZXJvLCAKLSAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhvcDFHUFIs IEpTQ2VsbDo6dHlwZUluZm9GbGFnc09mZnNldCgpKSwKLSAgICAgICAgICAgICAgICBNYWNyb0Fz c2VtYmxlcjo6VHJ1c3RlZEltbTMyKE1hc3F1ZXJhZGVzQXNVbmRlZmluZWQpKSk7Ci0KLSAgICAg ICAgREZHX1RZUEVfQ0hFQ0soCi0gICAgICAgICAgICBKU1ZhbHVlU291cmNlOjp1bmJveGVkQ2Vs bChvcDJHUFIpLCBub2RlLT5jaGlsZDIoKSwgU3BlY09iamVjdCwgbV9qaXQuYnJhbmNoSWZOb3RP YmplY3Qob3AyR1BSKSk7Ci0gICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soQmFkVHlwZSwgSlNWYWx1 ZVNvdXJjZTo6dW5ib3hlZENlbGwob3AyR1BSKSwgbm9kZS0+Y2hpbGQyKCksCi0gICAgICAgICAg ICBtX2ppdC5icmFuY2hUZXN0OCgKLSAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6Tm9u WmVybywKLSAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhvcDJHUFIsIEpT Q2VsbDo6dHlwZUluZm9GbGFnc09mZnNldCgpKSwKLSAgICAgICAgICAgICAgICBNYWNyb0Fzc2Vt Ymxlcjo6VHJ1c3RlZEltbTMyKE1hc3F1ZXJhZGVzQXNVbmRlZmluZWQpKSk7Ci0gICAgfQotICAg IAotICAgIEdQUlRlbXBvcmFyeSByZXN1bHRQYXlsb2FkKHRoaXMsIFJldXNlLCBvcDIpOwotICAg IEdQUlJlZyByZXN1bHRQYXlsb2FkR1BSID0gcmVzdWx0UGF5bG9hZC5ncHIoKTsKLSAgICAKLSAg ICBNYWNyb0Fzc2VtYmxlcjo6SnVtcCBmYWxzZUNhc2UgPSBtX2ppdC5icmFuY2hQdHIoTWFjcm9B c3NlbWJsZXI6Ok5vdEVxdWFsLCBvcDFHUFIsIG9wMkdQUik7Ci0gICAgbV9qaXQubW92ZShUcnVz dGVkSW1tMzIoMSksIHJlc3VsdFBheWxvYWRHUFIpOwotICAgIE1hY3JvQXNzZW1ibGVyOjpKdW1w IGRvbmUgPSBtX2ppdC5qdW1wKCk7Ci0gICAgZmFsc2VDYXNlLmxpbmsoJm1faml0KTsKLSAgICBt X2ppdC5tb3ZlKFRydXN0ZWRJbW0zMigwKSwgcmVzdWx0UGF5bG9hZEdQUik7Ci0gICAgZG9uZS5s aW5rKCZtX2ppdCk7Ci0KLSAgICBib29sZWFuUmVzdWx0KHJlc3VsdFBheWxvYWRHUFIsIG5vZGUp OwotfQotCiB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlT2JqZWN0U3RyaWN0RXF1YWxpdHko RWRnZSBvYmplY3RDaGlsZCwgRWRnZSBvdGhlckNoaWxkKQogewogICAgIFNwZWN1bGF0ZUNlbGxP cGVyYW5kIG9wMSh0aGlzLCBvYmplY3RDaGlsZCk7CkBAIC0xNDk0LDMyICsxNDUxLDYgQEAgdm9p ZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZVN5bWJvbFVudHlwZWRFcXVhbGl0eShOb2RlKiBub2Rl LCBFZGdlIHN5bWJvbEVkZ2UsIEUKICAgICBib29sZWFuUmVzdWx0KHJlc3VsdFBheWxvYWRHUFIs IG5vZGUpOwogfQogCi12b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlSW50MzJDb21wYXJlKE5v ZGUqIG5vZGUsIE1hY3JvQXNzZW1ibGVyOjpSZWxhdGlvbmFsQ29uZGl0aW9uIGNvbmRpdGlvbikK LXsKLSAgICBTcGVjdWxhdGVJbnQzMk9wZXJhbmQgb3AxKHRoaXMsIG5vZGUtPmNoaWxkMSgpKTsK LSAgICBTcGVjdWxhdGVJbnQzMk9wZXJhbmQgb3AyKHRoaXMsIG5vZGUtPmNoaWxkMigpKTsKLSAg ICBHUFJUZW1wb3JhcnkgcmVzdWx0UGF5bG9hZCh0aGlzKTsKLSAgICAKLSAgICBtX2ppdC5jb21w YXJlMzIoY29uZGl0aW9uLCBvcDEuZ3ByKCksIG9wMi5ncHIoKSwgcmVzdWx0UGF5bG9hZC5ncHIo KSk7Ci0gICAgCi0gICAgLy8gSWYgd2UgYWRkIGEgRGF0YUZvcm1hdEJvb2wsIHdlIHNob3VsZCB1 c2UgaXQgaGVyZS4KLSAgICBib29sZWFuUmVzdWx0KHJlc3VsdFBheWxvYWQuZ3ByKCksIG5vZGUp OwotfQotCi12b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlRG91YmxlQ29tcGFyZShOb2RlKiBu b2RlLCBNYWNyb0Fzc2VtYmxlcjo6RG91YmxlQ29uZGl0aW9uIGNvbmRpdGlvbikKLXsKLSAgICBT cGVjdWxhdGVEb3VibGVPcGVyYW5kIG9wMSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7Ci0gICAgU3Bl Y3VsYXRlRG91YmxlT3BlcmFuZCBvcDIodGhpcywgbm9kZS0+Y2hpbGQyKCkpOwotICAgIEdQUlRl bXBvcmFyeSByZXN1bHRQYXlsb2FkKHRoaXMpOwotICAgIAotICAgIG1faml0Lm1vdmUoVHJ1c3Rl ZEltbTMyKDEpLCByZXN1bHRQYXlsb2FkLmdwcigpKTsKLSAgICBNYWNyb0Fzc2VtYmxlcjo6SnVt cCB0cnVlQ2FzZSA9IG1faml0LmJyYW5jaERvdWJsZShjb25kaXRpb24sIG9wMS5mcHIoKSwgb3Ay LmZwcigpKTsKLSAgICBtX2ppdC5tb3ZlKFRydXN0ZWRJbW0zMigwKSwgcmVzdWx0UGF5bG9hZC5n cHIoKSk7Ci0gICAgdHJ1ZUNhc2UubGluaygmbV9qaXQpOwotICAgIAotICAgIGJvb2xlYW5SZXN1 bHQocmVzdWx0UGF5bG9hZC5ncHIoKSwgbm9kZSk7Ci19Ci0KIHZvaWQgU3BlY3VsYXRpdmVKSVQ6 OmNvbXBpbGVPYmplY3RPck90aGVyTG9naWNhbE5vdChFZGdlIG5vZGVVc2UpCiB7CiAgICAgSlNW YWx1ZU9wZXJhbmQgdmFsdWUodGhpcywgbm9kZVVzZSwgTWFudWFsT3BlcmFuZFNwZWN1bGF0aW9u KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVK SVQ2NC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQu Y3BwCmluZGV4IGNjYzNjYWRhMDFlMzIxOGQ1YTRlYWM5Y2ZkYjRhNjlkMjYwYWEzZjMuLjMyYzZj MjIyMDhiMmYwNjU3ZmVhMTRmOWY4YzUwYzQxNWZhYjg2MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcApAQCAtMTMyNCw0NCArMTMy NCw2IEBAIEdQUlJlZyBTcGVjdWxhdGl2ZUpJVDo6ZmlsbFNwZWN1bGF0ZUJvb2xlYW4oRWRnZSBl ZGdlKQogICAgIH0KIH0KIAotdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZU9iamVjdEVxdWFs aXR5KE5vZGUqIG5vZGUpCi17Ci0gICAgU3BlY3VsYXRlQ2VsbE9wZXJhbmQgb3AxKHRoaXMsIG5v ZGUtPmNoaWxkMSgpKTsKLSAgICBTcGVjdWxhdGVDZWxsT3BlcmFuZCBvcDIodGhpcywgbm9kZS0+ Y2hpbGQyKCkpOwotICAgIEdQUlRlbXBvcmFyeSByZXN1bHQodGhpcywgUmV1c2UsIG9wMSk7Ci0g ICAgCi0gICAgR1BSUmVnIG9wMUdQUiA9IG9wMS5ncHIoKTsKLSAgICBHUFJSZWcgb3AyR1BSID0g b3AyLmdwcigpOwotICAgIEdQUlJlZyByZXN1bHRHUFIgPSByZXN1bHQuZ3ByKCk7Ci0gICAKLSAg ICBpZiAobWFzcXVlcmFkZXNBc1VuZGVmaW5lZFdhdGNocG9pbnRJc1N0aWxsVmFsaWQoKSkgewot ICAgICAgICBERkdfVFlQRV9DSEVDSygKLSAgICAgICAgICAgIEpTVmFsdWVTb3VyY2U6OnVuYm94 ZWRDZWxsKG9wMUdQUiksIG5vZGUtPmNoaWxkMSgpLCBTcGVjT2JqZWN0LCBtX2ppdC5icmFuY2hJ Zk5vdE9iamVjdChvcDFHUFIpKTsKLSAgICAgICAgREZHX1RZUEVfQ0hFQ0soCi0gICAgICAgICAg ICBKU1ZhbHVlU291cmNlOjp1bmJveGVkQ2VsbChvcDJHUFIpLCBub2RlLT5jaGlsZDIoKSwgU3Bl Y09iamVjdCwgbV9qaXQuYnJhbmNoSWZOb3RPYmplY3Qob3AyR1BSKSk7Ci0gICAgfSBlbHNlIHsK LSAgICAgICAgREZHX1RZUEVfQ0hFQ0soCi0gICAgICAgICAgICBKU1ZhbHVlU291cmNlOjp1bmJv eGVkQ2VsbChvcDFHUFIpLCBub2RlLT5jaGlsZDEoKSwgU3BlY09iamVjdCwgbV9qaXQuYnJhbmNo SWZOb3RPYmplY3Qob3AxR1BSKSk7Ci0gICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soQmFkVHlwZSwg SlNWYWx1ZVNvdXJjZTo6dW5ib3hlZENlbGwob3AxR1BSKSwgbm9kZS0+Y2hpbGQxKCksCi0gICAg ICAgICAgICBtX2ppdC5icmFuY2hUZXN0OCgKLSAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxl cjo6Tm9uWmVybywgCi0gICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Mob3Ax R1BSLCBKU0NlbGw6OnR5cGVJbmZvRmxhZ3NPZmZzZXQoKSksIAotICAgICAgICAgICAgICAgIE1h Y3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tMzIoTWFzcXVlcmFkZXNBc1VuZGVmaW5lZCkpKTsKLQot ICAgICAgICBERkdfVFlQRV9DSEVDSygKLSAgICAgICAgICAgIEpTVmFsdWVTb3VyY2U6OnVuYm94 ZWRDZWxsKG9wMkdQUiksIG5vZGUtPmNoaWxkMigpLCBTcGVjT2JqZWN0LCBtX2ppdC5icmFuY2hJ Zk5vdE9iamVjdChvcDJHUFIpKTsKLSAgICAgICAgc3BlY3VsYXRpb25DaGVjayhCYWRUeXBlLCBK U1ZhbHVlU291cmNlOjp1bmJveGVkQ2VsbChvcDJHUFIpLCBub2RlLT5jaGlsZDIoKSwKLSAgICAg ICAgICAgIG1faml0LmJyYW5jaFRlc3Q4KAotICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVy OjpOb25aZXJvLCAKLSAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhvcDJH UFIsIEpTQ2VsbDo6dHlwZUluZm9GbGFnc09mZnNldCgpKSwgCi0gICAgICAgICAgICAgICAgTWFj cm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW0zMihNYXNxdWVyYWRlc0FzVW5kZWZpbmVkKSkpOwotICAg IH0KLQotICAgIG1faml0LmNvbXBhcmU2NChNYWNyb0Fzc2VtYmxlcjo6RXF1YWwsIG9wMUdQUiwg b3AyR1BSLCByZXN1bHRHUFIpOwotICAgIG1faml0Lm9yMzIoVHJ1c3RlZEltbTMyKFZhbHVlRmFs c2UpLCByZXN1bHRHUFIpOwotICAgIGpzVmFsdWVSZXN1bHQocmVzdWx0R1BSLCBtX2N1cnJlbnRO b2RlLCBEYXRhRm9ybWF0SlNCb29sZWFuKTsKLX0KLQogdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29t cGlsZU9iamVjdFN0cmljdEVxdWFsaXR5KEVkZ2Ugb2JqZWN0Q2hpbGQsIEVkZ2Ugb3RoZXJDaGls ZCkKIHsKICAgICBTcGVjdWxhdGVDZWxsT3BlcmFuZCBvcDEodGhpcywgb2JqZWN0Q2hpbGQpOwpA QCAtMTU2NCwzOCArMTUyNiw2IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVTeW1ib2xV bnR5cGVkRXF1YWxpdHkoTm9kZSogbm9kZSwgRWRnZSBzeW1ib2xFZGdlLCBFCiAgICAgdW5ibGVz c2VkQm9vbGVhblJlc3VsdChyZXN1bHRHUFIsIG5vZGUpOwogfQogCi12b2lkIFNwZWN1bGF0aXZl SklUOjpjb21waWxlSW50MzJDb21wYXJlKE5vZGUqIG5vZGUsIE1hY3JvQXNzZW1ibGVyOjpSZWxh dGlvbmFsQ29uZGl0aW9uIGNvbmRpdGlvbikKLXsKLSAgICBpZiAobm9kZS0+Y2hpbGQxKCktPmlz SW50MzJDb25zdGFudCgpKSB7Ci0gICAgICAgIFNwZWN1bGF0ZUludDMyT3BlcmFuZCBvcDIodGhp cywgbm9kZS0+Y2hpbGQyKCkpOwotICAgICAgICBHUFJUZW1wb3JhcnkgcmVzdWx0KHRoaXMsIFJl dXNlLCBvcDIpOwotICAgICAgICBpbnQzMl90IGltbSA9IG5vZGUtPmNoaWxkMSgpLT5hc0ludDMy KCk7Ci0gICAgICAgIG1faml0LmNvbXBhcmUzMihjb25kaXRpb24sIEpJVENvbXBpbGVyOjpJbW0z MihpbW0pLCBvcDIuZ3ByKCksIHJlc3VsdC5ncHIoKSk7Ci0KLSAgICAgICAgLy8gSWYgd2UgYWRk IGEgRGF0YUZvcm1hdEJvb2wsIHdlIHNob3VsZCB1c2UgaXQgaGVyZS4KLSAgICAgICAgbV9qaXQu b3IzMihUcnVzdGVkSW1tMzIoVmFsdWVGYWxzZSksIHJlc3VsdC5ncHIoKSk7Ci0gICAgICAgIGpz VmFsdWVSZXN1bHQocmVzdWx0LmdwcigpLCBtX2N1cnJlbnROb2RlLCBEYXRhRm9ybWF0SlNCb29s ZWFuKTsKLSAgICB9IGVsc2UgaWYgKG5vZGUtPmNoaWxkMigpLT5pc0ludDMyQ29uc3RhbnQoKSkg ewotICAgICAgICBTcGVjdWxhdGVJbnQzMk9wZXJhbmQgb3AxKHRoaXMsIG5vZGUtPmNoaWxkMSgp KTsKLSAgICAgICAgR1BSVGVtcG9yYXJ5IHJlc3VsdCh0aGlzLCBSZXVzZSwgb3AxKTsKLSAgICAg ICAgaW50MzJfdCBpbW0gPSBub2RlLT5jaGlsZDIoKS0+YXNJbnQzMigpOwotICAgICAgICBtX2pp dC5jb21wYXJlMzIoY29uZGl0aW9uLCBvcDEuZ3ByKCksIEpJVENvbXBpbGVyOjpJbW0zMihpbW0p LCByZXN1bHQuZ3ByKCkpOwotCi0gICAgICAgIC8vIElmIHdlIGFkZCBhIERhdGFGb3JtYXRCb29s LCB3ZSBzaG91bGQgdXNlIGl0IGhlcmUuCi0gICAgICAgIG1faml0Lm9yMzIoVHJ1c3RlZEltbTMy KFZhbHVlRmFsc2UpLCByZXN1bHQuZ3ByKCkpOwotICAgICAgICBqc1ZhbHVlUmVzdWx0KHJlc3Vs dC5ncHIoKSwgbV9jdXJyZW50Tm9kZSwgRGF0YUZvcm1hdEpTQm9vbGVhbik7Ci0gICAgfSBlbHNl IHsKLSAgICAgICAgU3BlY3VsYXRlSW50MzJPcGVyYW5kIG9wMSh0aGlzLCBub2RlLT5jaGlsZDEo KSk7Ci0gICAgICAgIFNwZWN1bGF0ZUludDMyT3BlcmFuZCBvcDIodGhpcywgbm9kZS0+Y2hpbGQy KCkpOwotICAgICAgICBHUFJUZW1wb3JhcnkgcmVzdWx0KHRoaXMsIFJldXNlLCBvcDEsIG9wMik7 Ci0gICAgICAgIG1faml0LmNvbXBhcmUzMihjb25kaXRpb24sIG9wMS5ncHIoKSwgb3AyLmdwcigp LCByZXN1bHQuZ3ByKCkpOwotCi0gICAgICAgIC8vIElmIHdlIGFkZCBhIERhdGFGb3JtYXRCb29s LCB3ZSBzaG91bGQgdXNlIGl0IGhlcmUuCi0gICAgICAgIG1faml0Lm9yMzIoVHJ1c3RlZEltbTMy KFZhbHVlRmFsc2UpLCByZXN1bHQuZ3ByKCkpOwotICAgICAgICBqc1ZhbHVlUmVzdWx0KHJlc3Vs dC5ncHIoKSwgbV9jdXJyZW50Tm9kZSwgRGF0YUZvcm1hdEpTQm9vbGVhbik7Ci0gICAgfQotfQot CiB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlSW50NTJDb21wYXJlKE5vZGUqIG5vZGUsIE1h Y3JvQXNzZW1ibGVyOjpSZWxhdGlvbmFsQ29uZGl0aW9uIGNvbmRpdGlvbikKIHsKICAgICBTcGVj dWxhdGVXaGljaGV2ZXJJbnQ1Mk9wZXJhbmQgb3AxKHRoaXMsIG5vZGUtPmNoaWxkMSgpKTsKQEAg LTE2MzAsMjAgKzE1NjAsNiBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlUGVlcEhvbGVJ bnQ1MkJyYW5jaChOb2RlKiBub2RlLCBOb2RlKiBicmFuY2hOb2RlLCBKSQogICAgIGp1bXAobm90 VGFrZW4pOwogfQogCi12b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlRG91YmxlQ29tcGFyZShO b2RlKiBub2RlLCBNYWNyb0Fzc2VtYmxlcjo6RG91YmxlQ29uZGl0aW9uIGNvbmRpdGlvbikKLXsK LSAgICBTcGVjdWxhdGVEb3VibGVPcGVyYW5kIG9wMSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7Ci0g ICAgU3BlY3VsYXRlRG91YmxlT3BlcmFuZCBvcDIodGhpcywgbm9kZS0+Y2hpbGQyKCkpOwotICAg IEdQUlRlbXBvcmFyeSByZXN1bHQodGhpcyk7Ci0gICAgCi0gICAgbV9qaXQubW92ZShUcnVzdGVk SW1tMzIoVmFsdWVUcnVlKSwgcmVzdWx0LmdwcigpKTsKLSAgICBNYWNyb0Fzc2VtYmxlcjo6SnVt cCB0cnVlQ2FzZSA9IG1faml0LmJyYW5jaERvdWJsZShjb25kaXRpb24sIG9wMS5mcHIoKSwgb3Ay LmZwcigpKTsKLSAgICBtX2ppdC54b3I2NChUcnVzdGVkSW1tMzIodHJ1ZSksIHJlc3VsdC5ncHIo KSk7Ci0gICAgdHJ1ZUNhc2UubGluaygmbV9qaXQpOwotICAgIAotICAgIGpzVmFsdWVSZXN1bHQo cmVzdWx0LmdwcigpLCBub2RlLCBEYXRhRm9ybWF0SlNCb29sZWFuKTsKLX0KLQogdm9pZCBTcGVj dWxhdGl2ZUpJVDo6Y29tcGlsZUNvbXBhcmVFcVB0cihOb2RlKiBub2RlKQogewogICAgIEpTVmFs dWVPcGVyYW5kIHZhbHVlKHRoaXMsIG5vZGUtPmNoaWxkMSgpKTsK