227888 2021-07-12 14:36:22 -0700 Revert r277027: breaks GC. 2021-07-12 18:48:44 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 225376 1 mark.lam mark.lam annulen ews-watchlist gyuyoung.kim keith_miller msaboff ryuan.choi saam sergio tzagallo webkit-bug-importer oldest_to_newest 1776456 0 mark.lam 2021-07-12 14:36:22 -0700 The patch in r277027 to make deletion of GCAwareJITStubRoutines incremental has a bug:the routine may not be deleted yet by the incremental sweeper before the next GC cycle, and the GC will not be happy visiting dead cell pointers in that routine. There are also other bugs with the triggering of sweeping. For now, we're reverting the patch, and will revisit this at a later time. 1776458 1 mark.lam 2021-07-12 14:36:55 -0700 rdar://79907561 1776461 2 433362 mark.lam 2021-07-12 14:40:49 -0700 Created attachment 433362 proposed patch. 1776525 3 mark.lam 2021-07-12 18:44:39 -0700 The fast/canvas/canvas-overloads-strokeText.html crash on the mac-AS-debug-wk2 run appears to be a pre-existing issue. https://results.webkit.org/?suite=layout-tests&test=fast%2Fcanvas%2Fcanvas-overloads-strokeText.html shows that it crashes in a flaky manner. 1776526 4 mark.lam 2021-07-12 18:48:44 -0700 Thanks for the review. Landed in r279861: <http://trac.webkit.org/r279861>. 433362 2021-07-12 14:40:49 -0700 2021-07-12 18:04:47 -0700 proposed patch. bug-227888.patch text/plain 12193 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc5ODUyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBA CisyMDIxLTA3LTEyICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZXZlcnQgcjI3NzAyNzogYnJlYWtzIEdDLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI3ODg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhlIHBhdGNoIGluIHIyNzcwMjcgdG8gbWFrZSBkZWxldGlvbiBv ZiBHQ0F3YXJlSklUU3R1YlJvdXRpbmVzIGluY3JlbWVudGFsIGhhcyBhCisgICAgICAgIGJ1Zzog dGhlIHJvdXRpbmUgbWF5IG5vdCBiZSBkZWxldGVkIHlldCBieSB0aGUgaW5jcmVtZW50YWwgc3dl ZXBlciBiZWZvcmUgdGhlIG5leHQKKyAgICAgICAgR0MgY3ljbGUsIGFuZCB0aGUgR0Mgd2lsbCBu b3QgYmUgaGFwcHkgdmlzaXRpbmcgZGVhZCBjZWxsIHBvaW50ZXJzIGluIHRoYXQgcm91dGluZS4K KyAgICAgICAgVGhlcmUgaXMgYWxzbyBhbm90aGVyIGJ1ZyB3aXRoIHRoZSB0cmlnZ2VyaW5nIG9m IHN3ZWVwaW5nLgorCisgICAgICAgIEZvciBub3csIHdlJ3JlIHJldmVydGluZyB0aGUgcGF0Y2gs IGFuZCB3aWxsIHJldmlzaXQgdGhpcyBhdCBhIGxhdGVyIHRpbWUuCisKKyAgICAgICAgKiBDTWFr ZUxpc3RzLnR4dDoKKyAgICAgICAgKiBoZWFwL0hlYXAuY3BwOgorICAgICAgICAoSlNDOjpIZWFw OjpkZWxldGVVbm1hcmtlZENvbXBpbGVkQ29kZSk6CisgICAgICAgIChKU0M6OkhlYXA6OnN3ZWVw U3luY2hyb25vdXNseSk6CisgICAgICAgICogaGVhcC9IZWFwLmg6CisgICAgICAgICogaGVhcC9I ZWFwSW5saW5lcy5oOgorICAgICAgICAoSlNDOjpIZWFwOjptYXlIYXZlSklUU3R1YlJvdXRpbmVz VG9EZWxldGUpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpIZWFwOjpkZWxldGVEZWFkSklUU3R1 YlJvdXRpbmVzKTogRGVsZXRlZC4KKyAgICAgICAgKiBoZWFwL0luY3JlbWVudGFsU3dlZXBlci5j cHA6CisgICAgICAgIChKU0M6OkluY3JlbWVudGFsU3dlZXBlcjo6ZG9Td2VlcCk6CisgICAgICAg ICogaGVhcC9KSVRTdHViUm91dGluZVNldC5jcHA6CisgICAgICAgIChKU0M6OkpJVFN0dWJSb3V0 aW5lU2V0OjpkZWxldGVVbm1hcmtlZEpldHRpc29uZWRTdHViUm91dGluZXMpOgorICAgICAgICAq IGhlYXAvSklUU3R1YlJvdXRpbmVTZXQuaDoKKyAgICAgICAgKEpTQzo6SklUU3R1YlJvdXRpbmVT ZXQ6OmRlbGV0ZVVubWFya2VkSmV0dGlzb25lZFN0dWJSb3V0aW5lcyk6CisgICAgICAgIChKU0M6 OkpJVFN0dWJSb3V0aW5lU2V0Ojp0cmFjZU1hcmtlZFN0dWJSb3V0aW5lcyk6CisgICAgICAgIChK U0M6OkpJVFN0dWJSb3V0aW5lU2V0OjptYXlIYXZlUm91dGluZXNUb0RlbGV0ZSk6IERlbGV0ZWQu CisgICAgICAgIChKU0M6OkpJVFN0dWJSb3V0aW5lU2V0Ojpub3RpZnlIYXZlUm91dGluZXNUb0Rl bGV0ZSk6IERlbGV0ZWQuCisgICAgICAgICogaml0L0dDQXdhcmVKSVRTdHViUm91dGluZS5jcHA6 CisgICAgICAgIChKU0M6OkdDQXdhcmVKSVRTdHViUm91dGluZTo6b2JzZXJ2ZVplcm9SZWZDb3Vu dCk6CisgICAgICAgICogaml0L0pJVFN0dWJSb3V0aW5lLmg6CisgICAgICAgIChKU0M6OkpJVFN0 dWJSb3V0aW5lOjpjcmVhdGVTZWxmTWFuYWdlZFJvdXRpbmUpOgorCiAyMDIxLTA3LTEyICBZaWpp YSBIdWFuZyAgPHlpamlhX2h1YW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgU01ORUdMLCBV TU5FR0wsIFVNQURETCwgYW5kIFVNU1VCTCBmb3IgQVJNNjQgYW5kIHNlbGVjdCB0aGlzIGluc3Ry dWN0aW9uIGluIEFpcgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0NNYWtlTGlzdHMudHh0 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DTWFrZUxpc3RzLnR4dAkocmV2 aXNpb24gMjc5NzU0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0NNYWtlTGlzdHMudHh0CSh3 b3JraW5nIGNvcHkpCkBAIC02NzAsNyArNjcwLDYgQEAgc2V0KEphdmFTY3JpcHRDb3JlX1BSSVZB VEVfRlJBTUVXT1JLX0hFQQogICAgIGhlYXAvSXNvU3Vic3BhY2UuaAogICAgIGhlYXAvSXNvU3Vi c3BhY2VJbmxpbmVzLmgKICAgICBoZWFwL0lzb1N1YnNwYWNlUGVyVk0uaAotICAgIGhlYXAvSklU U3R1YlJvdXRpbmVTZXQuaAogICAgIGhlYXAvTG9jYWxBbGxvY2F0b3IuaAogICAgIGhlYXAvTG9j YWxBbGxvY2F0b3JJbmxpbmVzLmgKICAgICBoZWFwL01hY2hpbmVTdGFja01hcmtlci5oCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAkocmV2aXNpb24gMjc5NzU0KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk3NCw4 ICs5NzQsNyBAQCB2b2lkIEhlYXA6OmRlbGV0ZVVubWFya2VkQ29tcGlsZWRDb2RlKCkKICAgICAv LyBTd2VlcGluZyBtdXN0IG9jY3VyIGJlZm9yZSBkZWxldGluZyBzdHVicywgb3RoZXJ3aXNlIHRo ZSBzdHVicyBtaWdodCBzdGlsbCB0aGluayB0aGV5J3JlIGFsaXZlIGFzIHRoZXkgZ2V0IGRlbGV0 ZWQuCiAgICAgLy8gQW5kIENvZGVCbG9jayBkZXN0cnVjdG9yIGlzIGFzc3VtaW5nIHRoYXQgQ29k ZUJsb2NrIGdldHMgZGVzdHJveWVkIGJlZm9yZSBVbmxpbmtlZENvZGVCbG9jayBnZXRzIGRlc3Ry b3llZC4KICAgICB2bSgpLmZvckVhY2hDb2RlQmxvY2tTcGFjZShbXSAoYXV0byYgc3BhY2UpIHsg c3BhY2Uuc3BhY2Uuc3dlZXAoKTsgfSk7Ci0gICAgaWYgKG1heUhhdmVKSVRTdHViUm91dGluZXNU b0RlbGV0ZSgpKQotICAgICAgICBkZWxldGVEZWFkSklUU3R1YlJvdXRpbmVzKDVfbXMpOworICAg IG1faml0U3R1YlJvdXRpbmVzLT5kZWxldGVVbm1hcmtlZEpldHRpc29uZWRTdHViUm91dGluZXMo KTsKIH0KIAogdm9pZCBIZWFwOjphZGRUb1JlbWVtYmVyZWRTZXQoY29uc3QgSlNDZWxsKiBjb25z dENlbGwpCkBAIC0xMDQyLDE0ICsxMDQxLDYgQEAgdm9pZCBIZWFwOjpzd2VlcFN5bmNocm9ub3Vz bHkoKQogICAgIH0KICAgICBtX29iamVjdFNwYWNlLnN3ZWVwQmxvY2tzKCk7CiAgICAgbV9vYmpl Y3RTcGFjZS5zaHJpbmsoKTsKLQotICAgIHVuc2lnbmVkIHBhc3NlcyA9IDA7Ci0gICAgd2hpbGUg KG1heUhhdmVKSVRTdHViUm91dGluZXNUb0RlbGV0ZSgpKSB7Ci0gICAgICAgIGNvbnN0ZXhwciBT ZWNvbmRzIHVubGltaXRlZFRpbWUgPSA2MDBfczsKLSAgICAgICAgZGVsZXRlRGVhZEpJVFN0dWJS b3V0aW5lcyh1bmxpbWl0ZWRUaW1lKTsKLSAgICAgICAgUkVMRUFTRV9BU1NFUlQocGFzc2VzKysg PCAxMDApOwotICAgIH0KLQogICAgIGlmIChVTkxJS0VMWShPcHRpb25zOjpsb2dHQygpKSkgewog ICAgICAgICBNb25vdG9uaWNUaW1lIGFmdGVyID0gTW9ub3RvbmljVGltZTo6bm93KCk7CiAgICAg ICAgIGRhdGFMb2coIj0+ICIsIGNhcGFjaXR5KCkgLyAxMDI0LCAia2IsICIsIChhZnRlciAtIGJl Zm9yZSkubWlsbGlzZWNvbmRzKCksICJtcyIpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2hlYXAvSGVhcC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hl YXAuaAkocmV2aXNpb24gMjc5NzU0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVh cC5oCSh3b3JraW5nIGNvcHkpCkBAIC00MDYsOSArNDA2LDYgQEAgcHVibGljOgogCiAgICAgYm9v bCBpc01hcmtpbmdGb3JHQ1ZlcmlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9pc01hcmtpbmdGb3JH Q1ZlcmlmaWVyOyB9CiAKLSAgICBzdGF0aWMgYm9vbCBtYXlIYXZlSklUU3R1YlJvdXRpbmVzVG9E ZWxldGUoKTsKLSAgICB2b2lkIGRlbGV0ZURlYWRKSVRTdHViUm91dGluZXMoU2Vjb25kcyB0aW1l U2xpY2UpOwotCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBBbGxvY2F0aW5nU2NvcGU7CiAg ICAgZnJpZW5kIGNsYXNzIENvZGVCbG9jazsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9o ZWFwL0hlYXBJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvSGVhcElubGluZXMuaAkocmV2aXNpb24gMjc5NzU0KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL2hlYXAvSGVhcElubGluZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMjksNyArMjksNiBAQAog I2luY2x1ZGUgIkhlYXAuaCIKICNpbmNsdWRlICJIZWFwQ2VsbElubGluZXMuaCIKICNpbmNsdWRl ICJJbmRleGluZ0hlYWRlci5oIgotI2luY2x1ZGUgIkpJVFN0dWJSb3V0aW5lU2V0LmgiCiAjaW5j bHVkZSAiSlNDYXN0LmgiCiAjaW5jbHVkZSAiU3RydWN0dXJlLmgiCiAjaW5jbHVkZSA8dHlwZV90 cmFpdHM+CkBAIC0yODAsMTQgKzI3OSw0IEBAIHZvaWQgSGVhcDo6Zm9yRWFjaFNsb3RWaXNpdG9y KGNvbnN0IEZ1bmMKICAgICAgICAgZnVuYygqdmlzaXRvcik7CiB9CiAKLWlubGluZSBib29sIEhl YXA6Om1heUhhdmVKSVRTdHViUm91dGluZXNUb0RlbGV0ZSgpCi17Ci0gICAgcmV0dXJuIEpJVFN0 dWJSb3V0aW5lU2V0OjptYXlIYXZlUm91dGluZXNUb0RlbGV0ZSgpOwotfQotCi1pbmxpbmUgdm9p ZCBIZWFwOjpkZWxldGVEZWFkSklUU3R1YlJvdXRpbmVzKFNlY29uZHMgdGltZVNsaWNlKQotewot ICAgIG1faml0U3R1YlJvdXRpbmVzLT5kZWxldGVVbm1hcmtlZEpldHRpc29uZWRTdHViUm91dGlu ZXModGltZVNsaWNlKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgSlNDCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaGVhcC9JbmNyZW1lbnRhbFN3ZWVwZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0luY3JlbWVudGFsU3dlZXBlci5jcHAJKHJldmlzaW9u IDI3OTc1NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0luY3JlbWVudGFsU3dlZXBl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDcgKzM2LDYgQEAgbmFtZXNwYWNlIEpTQyB7CiBz dGF0aWMgY29uc3RleHByIFNlY29uZHMgc3dlZXBUaW1lU2xpY2UgPSAxMF9tczsKIHN0YXRpYyBj b25zdGV4cHIgZG91YmxlIHN3ZWVwVGltZVRvdGFsID0gLjEwOwogc3RhdGljIGNvbnN0ZXhwciBk b3VibGUgc3dlZXBUaW1lTXVsdGlwbGllciA9IDEuMCAvIHN3ZWVwVGltZVRvdGFsOwotc3RhdGlj IGNvbnN0ZXhwciBTZWNvbmRzIGRlbGV0ZUpJVFN0dWJSb3V0aW5lc1RpbWVTbGljZSA9IHN0ZDo6 bWluKHN3ZWVwVGltZVNsaWNlIC8gMTAsIDFfbXMpOwogCiB2b2lkIEluY3JlbWVudGFsU3dlZXBl cjo6c2NoZWR1bGVUaW1lcigpCiB7CkBAIC01NiwxNyArNTUsNyBAQCB2b2lkIEluY3JlbWVudGFs U3dlZXBlcjo6ZG9Xb3JrKFZNJiB2bSkKIAogdm9pZCBJbmNyZW1lbnRhbFN3ZWVwZXI6OmRvU3dl ZXAoVk0mIHZtLCBNb25vdG9uaWNUaW1lIHN3ZWVwQmVnaW5UaW1lKQogewotICAgIGJvb2wgaGFz TW9yZUJsb2Nrc1RvU3dlZXAgPSB0cnVlOwotICAgIGJvb2wgaGFzTW9yZVdvcmsgPSB0cnVlOwot ICAgIHdoaWxlIChoYXNNb3JlV29yaykgewotICAgICAgICBpZiAoaGFzTW9yZUJsb2Nrc1RvU3dl ZXApCi0gICAgICAgICAgICBoYXNNb3JlQmxvY2tzVG9Td2VlcCA9IHN3ZWVwTmV4dEJsb2NrKHZt KTsKLQotICAgICAgICBpZiAoSGVhcDo6bWF5SGF2ZUpJVFN0dWJSb3V0aW5lc1RvRGVsZXRlKCkp Ci0gICAgICAgICAgICB2bS5oZWFwLmRlbGV0ZURlYWRKSVRTdHViUm91dGluZXMoZGVsZXRlSklU U3R1YlJvdXRpbmVzVGltZVNsaWNlKTsKLQotICAgICAgICBoYXNNb3JlV29yayA9IGhhc01vcmVC bG9ja3NUb1N3ZWVwIHx8IEhlYXA6Om1heUhhdmVKSVRTdHViUm91dGluZXNUb0RlbGV0ZSgpOwot CisgICAgd2hpbGUgKHN3ZWVwTmV4dEJsb2NrKHZtKSkgewogICAgICAgICBTZWNvbmRzIGVsYXBz ZWRUaW1lID0gTW9ub3RvbmljVGltZTo6bm93KCkgLSBzd2VlcEJlZ2luVGltZTsKICAgICAgICAg aWYgKGVsYXBzZWRUaW1lIDwgc3dlZXBUaW1lU2xpY2UpCiAgICAgICAgICAgICBjb250aW51ZTsK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0pJVFN0dWJSb3V0aW5lU2V0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9KSVRTdHViUm91dGluZVNl dC5jcHAJKHJldmlzaW9uIDI3OTc1NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0pJ VFN0dWJSb3V0aW5lU2V0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjksMTQgKzI5LDkgQEAKICNp ZiBFTkFCTEUoSklUKQogCiAjaW5jbHVkZSAiR0NBd2FyZUpJVFN0dWJSb3V0aW5lLmgiCi0jaW5j bHVkZSA8YWxnb3JpdGhtPgogCiBuYW1lc3BhY2UgSlNDIHsKIAotdXNpbmcgV1RGOjpSYW5nZTsK LQotYm9vbCBKSVRTdHViUm91dGluZVNldDo6c19tYXlIYXZlUm91dGluZXNUb0RlbGV0ZSA9IGZh bHNlOwotCiBKSVRTdHViUm91dGluZVNldDo6SklUU3R1YlJvdXRpbmVTZXQoKSB7IH0KIEpJVFN0 dWJSb3V0aW5lU2V0Ojp+SklUU3R1YlJvdXRpbmVTZXQoKQogewpAQCAtMTE5LDQ2ICsxMTQsMTkg QEAgdm9pZCBKSVRTdHViUm91dGluZVNldDo6bWFya1Nsb3codWludHB0cgogICAgIH0KIH0KIAot dm9pZCBKSVRTdHViUm91dGluZVNldDo6ZGVsZXRlVW5tYXJrZWRKZXR0aXNvbmVkU3R1YlJvdXRp bmVzKFNlY29uZHMgdGltZVNsaWNlKQordm9pZCBKSVRTdHViUm91dGluZVNldDo6ZGVsZXRlVW5t YXJrZWRKZXR0aXNvbmVkU3R1YlJvdXRpbmVzKCkKIHsKLSAgICBBU1NFUlQoc19tYXlIYXZlUm91 dGluZXNUb0RlbGV0ZSk7Ci0KLSAgICBNb25vdG9uaWNUaW1lIHN0YXJ0VGltZSA9IE1vbm90b25p Y1RpbWU6Om5vdygpOwotICAgIFNlY29uZHMgZWxhcHNlZFRpbWU7Ci0gICAgY29uc3RleHByIHVu c2lnbmVkIG1heEJhdGNoU2l6ZSA9IDEwMDsKLQotICAgIHVuc2lnbmVkIGVuZEluZGV4ID0gbV9y b3V0aW5lcy5zaXplKCk7Ci0KLSAgICAvLyBDbGVhciB0aGUgc19tYXlIYXZlUm91dGluZXNUb0Rl bGV0ZSBmbGFnIGJlZm9yZSB3ZSBzdGFydC4KLSAgICAvLyBEZXN0cnVjdGlvbiBvZiBhIE1hcmtp bmdHQ0F3YXJlSklUU3R1YlJvdXRpbmUgY2FuIHRyaWdnZXIgbW9yZSByb3V0aW5lcwotICAgIC8v IHRvIGJlIGRlbGV0ZWQsIGFuZCBzb21lIG9mIHRob3NlIG1heSBiZSB0aGUgb25lcyB3ZSBoYXZl IGFscmVhZHkgaXRlcmF0ZWQKLSAgICAvLyBwYXNzLgotICAgIHNfbWF5SGF2ZVJvdXRpbmVzVG9E ZWxldGUgPSBmYWxzZTsKLQogICAgIHVuc2lnbmVkIHNyY0luZGV4ID0gMDsKLSAgICB3aGlsZSAo c3JjSW5kZXggPCBlbmRJbmRleCkgewotICAgICAgICB1bnNpZ25lZCBiYXRjaFNpemUgPSBzdGQ6 Om1pbjx1bnNpZ25lZD4obWF4QmF0Y2hTaXplLCBlbmRJbmRleCAtIHNyY0luZGV4KTsKLSAgICAg ICAgd2hpbGUgKGJhdGNoU2l6ZS0tKSB7Ci0gICAgICAgICAgICBSb3V0aW5lIHJvdXRpbmUgPSBt X3JvdXRpbmVzW3NyY0luZGV4XTsKLSAgICAgICAgICAgIGlmICghcm91dGluZS5yb3V0aW5lLT5t X2lzSmV0dGlzb25lZCB8fCByb3V0aW5lLnJvdXRpbmUtPm1fbWF5QmVFeGVjdXRpbmcpIHsKLSAg ICAgICAgICAgICAgICBzcmNJbmRleCsrOwotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAg ICAgICAgICAgfQotICAgICAgICAgICAgbV9yb3V0aW5lc1tzcmNJbmRleF0gPSBtX3JvdXRpbmVz Wy0tZW5kSW5kZXhdOwotCi0gICAgICAgICAgICByb3V0aW5lLnJvdXRpbmUtPmRlbGV0ZUZyb21H QygpOwotICAgICAgICB9Ci0KLSAgICAgICAgZWxhcHNlZFRpbWUgPSBNb25vdG9uaWNUaW1lOjpu b3coKSAtIHN0YXJ0VGltZTsKLSAgICAgICAgaWYgKGVsYXBzZWRUaW1lID4gdGltZVNsaWNlKSB7 Ci0gICAgICAgICAgICAvLyBXZSB0aW1lZCBvdXQuIEFzc3VtZSB0aGVyZSdzIG1vcmUgdG8gZG8s IGFuZCB0aGF0IHdlIHNob3VsZCBjaGVjawotICAgICAgICAgICAgLy8gYWdhaW4gbmV4dCB0aW1l IHNsaWNlLgotICAgICAgICAgICAgc19tYXlIYXZlUm91dGluZXNUb0RlbGV0ZSA9IHRydWU7Ci0g ICAgICAgICAgICBicmVhazsKKyAgICB1bnNpZ25lZCBkc3RJbmRleCA9IHNyY0luZGV4OworICAg IHdoaWxlIChzcmNJbmRleCA8IG1fcm91dGluZXMuc2l6ZSgpKSB7CisgICAgICAgIFJvdXRpbmUg cm91dGluZSA9IG1fcm91dGluZXNbc3JjSW5kZXgrK107CisgICAgICAgIGlmICghcm91dGluZS5y b3V0aW5lLT5tX2lzSmV0dGlzb25lZCB8fCByb3V0aW5lLnJvdXRpbmUtPm1fbWF5QmVFeGVjdXRp bmcpIHsKKyAgICAgICAgICAgIG1fcm91dGluZXNbZHN0SW5kZXgrK10gPSByb3V0aW5lOworICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KKyAgICAgICAgcm91dGluZS5yb3V0aW5lLT5k ZWxldGVGcm9tR0MoKTsKICAgICB9Ci0KLSAgICBtX3JvdXRpbmVzLnNocmlua0NhcGFjaXR5KGVu ZEluZGV4KTsKKyAgICBtX3JvdXRpbmVzLnNocmlua0NhcGFjaXR5KGRzdEluZGV4KTsKIH0KIAog dGVtcGxhdGU8dHlwZW5hbWUgVmlzaXRvcj4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9o ZWFwL0pJVFN0dWJSb3V0aW5lU2V0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2hlYXAvSklUU3R1YlJvdXRpbmVTZXQuaAkocmV2aXNpb24gMjc5NzU0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2hlYXAvSklUU3R1YlJvdXRpbmVTZXQuaAkod29ya2luZyBjb3B5KQpA QCAtMzEsNiArMzEsOCBAQAogI2luY2x1ZGUgPHd0Zi9SYW5nZS5oPgogI2luY2x1ZGUgPHd0Zi9W ZWN0b3IuaD4KIAordXNpbmcgV1RGOjpSYW5nZTsKKwogbmFtZXNwYWNlIEpTQyB7CiAKIGNsYXNz IEdDQXdhcmVKSVRTdHViUm91dGluZTsKQEAgLTU5LDEzICs2MSwxMCBAQCBwdWJsaWM6CiAKICAg ICB2b2lkIHByZXBhcmVGb3JDb25zZXJ2YXRpdmVTY2FuKCk7CiAgICAgCi0gICAgdm9pZCBkZWxl dGVVbm1hcmtlZEpldHRpc29uZWRTdHViUm91dGluZXMoU2Vjb25kcyB0aW1lU2xpY2UpOworICAg IHZvaWQgZGVsZXRlVW5tYXJrZWRKZXR0aXNvbmVkU3R1YlJvdXRpbmVzKCk7CiAKICAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBWaXNpdG9yPiB2b2lkIHRyYWNlTWFya2VkU3R1YlJvdXRpbmVzKFZpc2l0 b3ImKTsKLQotICAgIHN0YXRpYyBib29sIG1heUhhdmVSb3V0aW5lc1RvRGVsZXRlKCkgeyByZXR1 cm4gc19tYXlIYXZlUm91dGluZXNUb0RlbGV0ZTsgfQotICAgIHN0YXRpYyB2b2lkIG5vdGlmeUhh dmVSb3V0aW5lc1RvRGVsZXRlKCkgeyBzX21heUhhdmVSb3V0aW5lc1RvRGVsZXRlID0gdHJ1ZTsg fQotCisgICAgCiBwcml2YXRlOgogICAgIHZvaWQgbWFya1Nsb3codWludHB0cl90IGFkZHJlc3Mp OwogICAgIApAQCAtNzQsOSArNzMsNyBAQCBwcml2YXRlOgogICAgICAgICBHQ0F3YXJlSklUU3R1 YlJvdXRpbmUqIHJvdXRpbmU7CiAgICAgfTsKICAgICBWZWN0b3I8Um91dGluZT4gbV9yb3V0aW5l czsKLSAgICBXVEY6OlJhbmdlPHVpbnRwdHJfdD4gbV9yYW5nZSB7IDAsIDAgfTsKLQotICAgIHN0 YXRpYyBib29sIHNfbWF5SGF2ZVJvdXRpbmVzVG9EZWxldGU7CisgICAgUmFuZ2U8dWludHB0cl90 PiBtX3JhbmdlIHsgMCwgMCB9OwogfTsKIAogI2Vsc2UgLy8gIUVOQUJMRShKSVQpCkBAIC05Mywx MSArOTAsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBjbGVhck1hcmtzKCkgeyB9CiAgICAgdm9pZCBt YXJrKHZvaWQqKSB7IH0KICAgICB2b2lkIHByZXBhcmVGb3JDb25zZXJ2YXRpdmVTY2FuKCkgeyB9 Ci0gICAgdm9pZCBkZWxldGVVbm1hcmtlZEpldHRpc29uZWRTdHViUm91dGluZXMoU2Vjb25kcykg eyB9CisgICAgdm9pZCBkZWxldGVVbm1hcmtlZEpldHRpc29uZWRTdHViUm91dGluZXMoKSB7IH0K ICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBWaXNpdG9yPiB2b2lkIHRyYWNlTWFya2VkU3R1YlJvdXRp bmVzKFZpc2l0b3ImKSB7IH0KLQotICAgIHN0YXRpYyBib29sIG1heUhhdmVSb3V0aW5lc1RvRGVs ZXRlKCkgeyByZXR1cm4gZmFsc2U7IH0KLSAgICBzdGF0aWMgdm9pZCBub3RpZnlIYXZlUm91dGlu ZXNUb0RlbGV0ZSgpIHsgfQogfTsKIAogI2VuZGlmIC8vICFFTkFCTEUoSklUKQpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9HQ0F3YXJlSklUU3R1YlJvdXRpbmUuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvR0NBd2FyZUpJVFN0dWJSb3V0aW5lLmNw cAkocmV2aXNpb24gMjc5NzU0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9HQ0F3YXJl SklUU3R1YlJvdXRpbmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Nyw3ICs2Nyw2IEBAIHZvaWQg R0NBd2FyZUpJVFN0dWJSb3V0aW5lOjpvYnNlcnZlWmVyb1IKICAgICBSRUxFQVNFX0FTU0VSVCgh bV9yZWZDb3VudCk7CiAKICAgICBtX2lzSmV0dGlzb25lZCA9IHRydWU7Ci0gICAgSklUU3R1YlJv dXRpbmVTZXQ6Om5vdGlmeUhhdmVSb3V0aW5lc1RvRGVsZXRlKCk7CiB9CiAKIHZvaWQgR0NBd2Fy ZUpJVFN0dWJSb3V0aW5lOjpkZWxldGVGcm9tR0MoKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9KSVRTdHViUm91dGluZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvSklUU3R1YlJvdXRpbmUuaAkocmV2aXNpb24gMjc5NzU0KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2ppdC9KSVRTdHViUm91dGluZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUg KzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMi0yMDIxIEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMi0yMDE4IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNjMs NiArNjMsMTQgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAgICAgCisgICAgLy8gVXNlIHRoaXMg aWYgeW91IHdhbnQgdG8gcGFzcyBhIENvZGVQdHIgdG8gc29tZW9uZSB3aG8gaW5zaXN0cyBvbiB0 YWtpbmcKKyAgICAvLyBhIFJlZlB0cjxKSVRTdHViUm91dGluZT4uCisgICAgc3RhdGljIFJlZjxK SVRTdHViUm91dGluZT4gY3JlYXRlU2VsZk1hbmFnZWRSb3V0aW5lKAorICAgICAgICBNYWNyb0Fz c2VtYmxlckNvZGVQdHI8SklUU3R1YlJvdXRpbmVQdHJUYWc+IHJhd0NvZGVQb2ludGVyKQorICAg IHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgSklUU3R1YlJvdXRpbmUoTWFjcm9Bc3Nl bWJsZXJDb2RlUmVmPEpJVFN0dWJSb3V0aW5lUHRyVGFnPjo6Y3JlYXRlU2VsZk1hbmFnZWRDb2Rl UmVmKHJhd0NvZGVQb2ludGVyKSkpOworICAgIH0KKyAgICAKICAgICB2aXJ0dWFsIH5KSVRTdHVi Um91dGluZSgpOwogICAgIHZpcnR1YWwgdm9pZCBhYm91dFRvRGllKCkgeyB9CiAgICAgCg==