211452 2020-05-05 09:27:40 -0700 Remove now-unneeded USE(GRAMMAR_CHECKING) 2020-05-06 09:25:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 darin darin andersca benjamin cdumez cmarcelo ews-watchlist mifenton webkit-bug-importer oldest_to_newest 1649233 0 darin 2020-05-05 09:27:40 -0700 Remove now-unneeded USE(GRAMMAR_CHECKING) 1649234 1 398518 darin 2020-05-05 09:28:52 -0700 Created attachment 398518 Patch 1649653 2 ews-feeder 2020-05-06 09:24:08 -0700 Committed r261234: <https://trac.webkit.org/changeset/261234> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398518. 1649654 3 webkit-bug-importer 2020-05-06 09:25:18 -0700 <rdar://problem/62933377> 398518 2020-05-05 09:28:52 -0700 2020-05-06 09:24:08 -0700 Patch bug-211452-20200505092850.patch text/plain 11823 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDA0YzUyYzA0NzVlZjBmZjlmOTMzNjM4 MTM5NjNkODkyYmY3M2Y4ZjEuLjM3M2E3ODVlNTE5MmY2Nzg3MDA4NjVkNDczZTIxZmYzZWQwZGZm MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDUtMDUgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBub3ctdW5uZWVkZWQgVVNFKEdSQU1NQVJfQ0hF Q0tJTkcpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTE0NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHd0Zi9QbGF0Zm9ybVVzZS5oOiBEb24ndCBzZXQgVVNFX0dSQU1NQVJfQ0hFQ0tJTkcuCisKIDIw MjAtMDUtMDUgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92 ZSBub3ctdW5uZWVkZWQgVVNFKENPUkVNRURJQSkgYW5kIFVTRShWSURFT1RPT0xCT1gpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggMDgyODM2YTUzZjI3ZjhmNGI0NGMzNGIzNjJmZDJhZjY1NjJkNThhMS4uMDMwMGM1 YzU3MThmZDMwYmUyY2VjNzY2MDM0ZWU5ZjM0MWIyZjQ0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIxIEBACisyMDIwLTA1LTA1ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAg ICAgICBSZW1vdmUgbm93LXVubmVlZGVkIFVTRShHUkFNTUFSX0NIRUNLSU5HKQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExNDUyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OmFkdmFuY2VUb05leHRNaXNzcGVsbGluZyk6 IFJlbW92ZSBVU0UoR1JBTU1BUl9DSEVDS0lORykuCisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6 OmlzU2VsZWN0aW9uVW5ncmFtbWF0aWNhbCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RWRp dG9yOjptYXJrTWlzc3BlbGxpbmdzT3JCYWRHcmFtbWFyKTogRGl0dG8uCisgICAgICAgIChXZWJD b3JlOjpFZGl0b3I6Om1hcmtCYWRHcmFtbWFyKTogRGl0dG8uCisgICAgICAgICogZWRpdGluZy9U ZXh0Q2hlY2tpbmdIZWxwZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dENoZWNraW5nSGVs cGVyOjptYXJrQWxsQmFkR3JhbW1hcik6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6Y2hlY2tU ZXh0T2ZQYXJhZ3JhcGgpOiBEaXR0by4gQWxzbyBjb3JyZWN0IG1pc3NwZWxsaW5nIG9mIHRoZQor ICAgICAgICB3b3JkICJtaXNzcGVsbGluZyIuCisgICAgICAgICogZWRpdGluZy9UZXh0Q2hlY2tp bmdIZWxwZXIuaDogRGl0dG8uCisKIDIwMjAtMDUtMDUgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlh LmNvbT4KIAogICAgICAgICBBIFVSTCBjYW5ub3QgaGF2ZSBhIHVzZXJuYW1lL3Bhc3N3b3JkL3Bv cnQgaWYgaXRzIGhvc3QgaXMgbnVsbApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvUGxhdGZv cm1Vc2UuaCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtVXNlLmgKaW5kZXggMDJlYjI5ODZiZjQ4 YTg3MzkzM2EwZjM0ZDJjYzAzNDYxZDQ0ODU3MS4uZDYzZjJmYTY1MzBhNjIwNGVlNDc1YWZlMjc3 YTQ5NWZmOTExY2M1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZvcm1Vc2UuaAor KysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybVVzZS5oCkBAIC0xOTcsOCArMTk3LDYgQEAKICNk ZWZpbmUgVVNFX1pMSUIgMQogI2VuZGlmCiAKLSNkZWZpbmUgVVNFX0dSQU1NQVJfQ0hFQ0tJTkcg MQotCiAjaWYgUExBVEZPUk0oQ09DT0EpIHx8IFBMQVRGT1JNKEdUSykKICNkZWZpbmUgVVNFX1VO SUZJRURfVEVYVF9DSEVDS0lORyAxCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvRWRpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcApp bmRleCA4ODhkYTkyNWE1ZjhhM2NiODc1YWQ0MDkwNTE2OWE5MzE4NWEzMmNhLi5mNTI0YTc4MTA5 OGUzYzdjM2VlMzU0ZmZhNzY3MDJhOTMxZWYzZDM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL0VkaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3Iu Y3BwCkBAIC0yMjQxLDcgKzIyNDEsNiBAQCB2b2lkIEVkaXRvcjo6YWR2YW5jZVRvTmV4dE1pc3Nw ZWxsaW5nKGJvb2wgc3RhcnRCZWZvcmVTZWxlY3Rpb24pCiAgICAgfSBlbHNlIHsKICAgICAgICAg bWlzc3BlbGxlZFdvcmQgPSBUZXh0Q2hlY2tpbmdIZWxwZXIoKmNsaWVudCgpLCBzcGVsbGluZ1Nl YXJjaFJhbmdlKS5maW5kRmlyc3RNaXNzcGVsbGluZyhtaXNzcGVsbGluZ09mZnNldCwgZmFsc2Us IGZpcnN0TWlzc3BlbGxpbmdSYW5nZSk7CiAKLSNpZiBVU0UoR1JBTU1BUl9DSEVDS0lORykKICAg ICAgICAgZ3JhbW1hclNlYXJjaFJhbmdlID0gc3BlbGxpbmdTZWFyY2hSYW5nZS0+Y2xvbmVSYW5n ZSgpOwogICAgICAgICBpZiAoIW1pc3NwZWxsZWRXb3JkLmlzRW1wdHkoKSkgewogICAgICAgICAg ICAgLy8gU3RvcCBsb29raW5nIGF0IHN0YXJ0IG9mIG5leHQgbWlzc3BlbGxlZCB3b3JkCkBAIC0y MjUyLDcgKzIyNTEsNiBAQCB2b2lkIEVkaXRvcjo6YWR2YW5jZVRvTmV4dE1pc3NwZWxsaW5nKGJv b2wgc3RhcnRCZWZvcmVTZWxlY3Rpb24pCiAKICAgICAgICAgaWYgKGlzR3JhbW1hckNoZWNraW5n RW5hYmxlZCgpKQogICAgICAgICAgICAgYmFkR3JhbW1hclBocmFzZSA9IFRleHRDaGVja2luZ0hl bHBlcigqY2xpZW50KCksICpncmFtbWFyU2VhcmNoUmFuZ2UpLmZpbmRGaXJzdEJhZEdyYW1tYXIo Z3JhbW1hckRldGFpbCwgZ3JhbW1hclBocmFzZU9mZnNldCwgZmFsc2UpOwotI2VuZGlmCiAgICAg fQogCiAgICAgLy8gSWYgd2UgZm91bmQgbmVpdGhlciBiYWQgZ3JhbW1hciBub3IgYSBtaXNzcGVs bGVkIHdvcmQsIHdyYXAgYW5kIHRyeSBhZ2FpbiAoYnV0IGRvbid0IGJvdGhlciBpZiB3ZSBzdGFy dGVkIGF0IHRoZSBiZWdpbm5pbmcgb2YgdGhlCkBAIC0yMjc2LDcgKzIyNzQsNiBAQCB2b2lkIEVk aXRvcjo6YWR2YW5jZVRvTmV4dE1pc3NwZWxsaW5nKGJvb2wgc3RhcnRCZWZvcmVTZWxlY3Rpb24p CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBtaXNzcGVsbGVkV29yZCA9IFRleHRDaGVj a2luZ0hlbHBlcigqY2xpZW50KCksIHNwZWxsaW5nU2VhcmNoUmFuZ2UpLmZpbmRGaXJzdE1pc3Nw ZWxsaW5nKG1pc3NwZWxsaW5nT2Zmc2V0LCBmYWxzZSwgZmlyc3RNaXNzcGVsbGluZ1JhbmdlKTsK IAotI2lmIFVTRShHUkFNTUFSX0NIRUNLSU5HKQogICAgICAgICAgICAgZ3JhbW1hclNlYXJjaFJh bmdlID0gc3BlbGxpbmdTZWFyY2hSYW5nZS0+Y2xvbmVSYW5nZSgpOwogICAgICAgICAgICAgaWYg KCFtaXNzcGVsbGVkV29yZC5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgICAgICAvLyBTdG9wIGxv b2tpbmcgYXQgc3RhcnQgb2YgbmV4dCBtaXNzcGVsbGVkIHdvcmQKQEAgLTIyODcsMTQgKzIyODQs OSBAQCB2b2lkIEVkaXRvcjo6YWR2YW5jZVRvTmV4dE1pc3NwZWxsaW5nKGJvb2wgc3RhcnRCZWZv cmVTZWxlY3Rpb24pCiAKICAgICAgICAgICAgIGlmIChpc0dyYW1tYXJDaGVja2luZ0VuYWJsZWQo KSkKICAgICAgICAgICAgICAgICBiYWRHcmFtbWFyUGhyYXNlID0gVGV4dENoZWNraW5nSGVscGVy KCpjbGllbnQoKSwgKmdyYW1tYXJTZWFyY2hSYW5nZSkuZmluZEZpcnN0QmFkR3JhbW1hcihncmFt bWFyRGV0YWlsLCBncmFtbWFyUGhyYXNlT2Zmc2V0LCBmYWxzZSk7Ci0jZW5kaWYKICAgICAgICAg fQogICAgIH0KICAgICAKLSNpZiAhVVNFKEdSQU1NQVJfQ0hFQ0tJTkcpCi0gICAgQVNTRVJUKGJh ZEdyYW1tYXJQaHJhc2UuaXNFbXB0eSgpKTsKLSAgICBVTlVTRURfUEFSQU0oZ3JhbW1hclBocmFz ZU9mZnNldCk7Ci0jZWxzZQogICAgIGlmICghYmFkR3JhbW1hclBocmFzZS5pc0VtcHR5KCkpIHsK ICAgICAgICAgLy8gV2UgZm91bmQgYmFkIGdyYW1tYXIuIFNpbmNlIHdlIG9ubHkgc2VhcmNoZWQg Zm9yIGJhZCBncmFtbWFyIHVwIHRvIHRoZSBmaXJzdCBtaXNzcGVsbGVkIHdvcmQsIHRoZSBiYWQg Z3JhbW1hcgogICAgICAgICAvLyB0YWtlcyBwcmVjZWRlbmNlIGFuZCB3ZSBpZ25vcmUgYW55IHBv dGVudGlhbCBtaXNzcGVsbGVkIHdvcmQuIFNlbGVjdCB0aGUgZ3JhbW1hciBkZXRhaWwsIHVwZGF0 ZSB0aGUgc3BlbGxpbmcKQEAgLTIzMTAsOSArMjMwMiw3IEBAIHZvaWQgRWRpdG9yOjphZHZhbmNl VG9OZXh0TWlzc3BlbGxpbmcoYm9vbCBzdGFydEJlZm9yZVNlbGVjdGlvbikKICAgICAgICAgCiAg ICAgICAgIGNsaWVudCgpLT51cGRhdGVTcGVsbGluZ1VJV2l0aEdyYW1tYXJTdHJpbmcoYmFkR3Jh bW1hclBocmFzZSwgZ3JhbW1hckRldGFpbCk7CiAgICAgICAgIGRvY3VtZW50KCkubWFya2Vycygp LmFkZE1hcmtlcihiYWRHcmFtbWFyUmFuZ2UsIERvY3VtZW50TWFya2VyOjpHcmFtbWFyLCBncmFt bWFyRGV0YWlsLnVzZXJEZXNjcmlwdGlvbik7Ci0gICAgfSBlbHNlCi0jZW5kaWYKLSAgICBpZiAo IW1pc3NwZWxsZWRXb3JkLmlzRW1wdHkoKSkgeworICAgIH0gZWxzZSBpZiAoIW1pc3NwZWxsZWRX b3JkLmlzRW1wdHkoKSkgewogICAgICAgICAvLyBXZSBmb3VuZCBhIG1pc3NwZWxsaW5nLCBidXQg bm90IGFueSBlYXJsaWVyIGJhZCBncmFtbWFyLiBTZWxlY3QgdGhlIG1pc3NwZWxsaW5nLCB1cGRh dGUgdGhlIHNwZWxsaW5nIHBhbmVsLCBhbmQgc3RvcmUKICAgICAgICAgLy8gYSBtYXJrZXIgc28g d2UgZHJhdyB0aGUgcmVkIHNxdWlnZ2xlIGxhdGVyLgogICAgICAgICAKQEAgLTIzODUsMTQgKzIz NzUsMTAgQEAgU3RyaW5nIEVkaXRvcjo6bWlzc3BlbGxlZFNlbGVjdGlvblN0cmluZygpIGNvbnN0 CiAKIGJvb2wgRWRpdG9yOjppc1NlbGVjdGlvblVuZ3JhbW1hdGljYWwoKQogewotI2lmIFVTRShH UkFNTUFSX0NIRUNLSU5HKQogICAgIGF1dG8gcmFuZ2UgPSBtX2RvY3VtZW50LnNlbGVjdGlvbigp LnNlbGVjdGlvbigpLnRvTm9ybWFsaXplZFJhbmdlKCk7CiAgICAgaWYgKCFyYW5nZSB8fCAhY2xp ZW50KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICByZXR1cm4gVGV4dENoZWNraW5nSGVs cGVyKCpjbGllbnQoKSwgKnJhbmdlKS5pc1VuZ3JhbW1hdGljYWwoKTsKLSNlbHNlCi0gICAgcmV0 dXJuIGZhbHNlOwotI2VuZGlmCiB9CiAKIFZlY3RvcjxTdHJpbmc+IEVkaXRvcjo6Z3Vlc3Nlc0Zv ck1pc3NwZWxsZWRXb3JkKGNvbnN0IFN0cmluZyYgd29yZCkgY29uc3QKQEAgLTI2NDQsMTQgKzI2 MzAsOCBAQCB2b2lkIEVkaXRvcjo6bWFya01pc3NwZWxsaW5nc09yQmFkR3JhbW1hcihjb25zdCBW aXNpYmxlU2VsZWN0aW9uJiBzZWxlY3Rpb24sIGJvbwogICAgIFRleHRDaGVja2luZ0hlbHBlciBj aGVja2VyKCpjbGllbnQoKSwgKnNlYXJjaFJhbmdlKTsKICAgICBpZiAoY2hlY2tTcGVsbGluZykK ICAgICAgICAgY2hlY2tlci5tYXJrQWxsTWlzc3BlbGxpbmdzKGZpcnN0TWlzc3BlbGxpbmdSYW5n ZSk7Ci0gICAgZWxzZSB7Ci0jaWYgVVNFKEdSQU1NQVJfQ0hFQ0tJTkcpCi0gICAgICAgIGlmIChp c0dyYW1tYXJDaGVja2luZ0VuYWJsZWQoKSkKLSAgICAgICAgICAgIGNoZWNrZXIubWFya0FsbEJh ZEdyYW1tYXIoKTsKLSNlbHNlCi0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotI2VuZGlm Ci0gICAgfSAgICAKKyAgICBlbHNlIGlmIChpc0dyYW1tYXJDaGVja2luZ0VuYWJsZWQoKSkKKyAg ICAgICAgY2hlY2tlci5tYXJrQWxsQmFkR3JhbW1hcigpOwogI2Vsc2UKICAgICBVTlVTRURfUEFS QU0oc2VsZWN0aW9uKTsKICAgICBVTlVTRURfUEFSQU0oY2hlY2tTcGVsbGluZyk7CkBAIC0yNjg1 LDEyICsyNjY1LDggQEAgdm9pZCBFZGl0b3I6Om1hcmtNaXNzcGVsbGluZ3MoY29uc3QgVmlzaWJs ZVNlbGVjdGlvbiYgc2VsZWN0aW9uLCBSZWZQdHI8UmFuZ2U+JgogICAgIAogdm9pZCBFZGl0b3I6 Om1hcmtCYWRHcmFtbWFyKGNvbnN0IFZpc2libGVTZWxlY3Rpb24mIHNlbGVjdGlvbikKIHsKLSNp ZiBVU0UoR1JBTU1BUl9DSEVDS0lORykKICAgICBSZWZQdHI8UmFuZ2U+IGZpcnN0TWlzc3BlbGxp bmdSYW5nZTsKICAgICBtYXJrTWlzc3BlbGxpbmdzT3JCYWRHcmFtbWFyKHNlbGVjdGlvbiwgZmFs c2UsIGZpcnN0TWlzc3BlbGxpbmdSYW5nZSk7Ci0jZWxzZQotICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwotI2VuZGlmCiB9CiAKIHZvaWQgRWRpdG9yOjptYXJrQWxsTWlzc3BlbGxpbmdzQW5kQmFk R3JhbW1hckluUmFuZ2VzKE9wdGlvblNldDxUZXh0Q2hlY2tpbmdUeXBlPiB0ZXh0Q2hlY2tpbmdP cHRpb25zLCBSZWZQdHI8UmFuZ2U+JiYgc3BlbGxpbmdSYW5nZSwgUmVmUHRyPFJhbmdlPiYmIGF1 dG9tYXRpY1JlcGxhY2VtZW50UmFuZ2UsIFJlZlB0cjxSYW5nZT4mJiBncmFtbWFyUmFuZ2UpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRDaGVja2luZ0hlbHBlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRDaGVja2luZ0hlbHBlci5jcHAKaW5kZXggNmVl YTAyNTkwMTE2YmFiOGIwYTExY2E1NmQ3M2EzYmI2MjI0YzkzNS4uOTVlNjUwNWNhNDc4NWM0MTRk N2E2ZDczNWZlNDNiZGMwMTE1YjJiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9UZXh0Q2hlY2tpbmdIZWxwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4 dENoZWNraW5nSGVscGVyLmNwcApAQCAtNDQsOCArNDQsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKICNpZiAhVVNFKFVOSUZJRURfVEVYVF9DSEVDS0lORykKIAotI2lmIFVTRShHUkFNTUFSX0NI RUNLSU5HKQotCiBzdGF0aWMgdm9pZCBmaW5kR3JhbW1hdGljYWxFcnJvcnMoVGV4dENoZWNrZXJD bGllbnQmIGNsaWVudCwgU3RyaW5nVmlldyB0ZXh0LCBWZWN0b3I8VGV4dENoZWNraW5nUmVzdWx0 PiYgcmVzdWx0cykKIHsKICAgICBmb3IgKHVuc2lnbmVkIGNoZWNrTG9jYXRpb24gPSAwOyBjaGVj a0xvY2F0aW9uIDwgdGV4dC5sZW5ndGgoKTsgKSB7CkBAIC03MSw4ICs2OSw2IEBAIHN0YXRpYyB2 b2lkIGZpbmRHcmFtbWF0aWNhbEVycm9ycyhUZXh0Q2hlY2tlckNsaWVudCYgY2xpZW50LCBTdHJp bmdWaWV3IHRleHQsIFZlCiAgICAgfQogfQogCi0jZW5kaWYKLQogc3RhdGljIHZvaWQgZmluZE1p c3NwZWxsaW5ncyhUZXh0Q2hlY2tlckNsaWVudCYgY2xpZW50LCBTdHJpbmdWaWV3IHRleHQsIFZl Y3RvcjxUZXh0Q2hlY2tpbmdSZXN1bHQ+JiByZXN1bHRzKQogewogICAgIFVCcmVha0l0ZXJhdG9y KiBpdGVyYXRvciA9IHdvcmRCcmVha0l0ZXJhdG9yKHRleHQpOwpAQCAtNDIwLDggKzQxNiw2IEBA IFN0cmluZyBUZXh0Q2hlY2tpbmdIZWxwZXI6OmZpbmRGaXJzdE1pc3NwZWxsaW5nT3JCYWRHcmFt bWFyKGJvb2wgY2hlY2tHcmFtbWFyLCBiCiAgICAgcmV0dXJuIGZpcnN0Rm91bmRJdGVtOwogfQog Ci0jaWYgVVNFKEdSQU1NQVJfQ0hFQ0tJTkcpCi0KIGludCBUZXh0Q2hlY2tpbmdIZWxwZXI6OmZp bmRGaXJzdEdyYW1tYXJEZXRhaWwoY29uc3QgVmVjdG9yPEdyYW1tYXJEZXRhaWw+JiBncmFtbWFy RGV0YWlscywgdWludDY0X3QgYmFkR3JhbW1hclBocmFzZUxvY2F0aW9uLCB1aW50NjRfdCBzdGFy dE9mZnNldCwgdWludDY0X3QgZW5kT2Zmc2V0LCBib29sIG1hcmtBbGwpIGNvbnN0CiB7CiAgICAg Ly8gRm91bmQgc29tZSBiYWQgZ3JhbW1hci4gRmluZCB0aGUgZWFybGllc3QgZGV0YWlsIHJhbmdl IHRoYXQgc3RhcnRzIGluIG91ciBzZWFyY2ggcmFuZ2UgKGlmIGFueSkuCkBAIC01NTUsOCArNTQ5 LDYgQEAgYm9vbCBUZXh0Q2hlY2tpbmdIZWxwZXI6OmlzVW5ncmFtbWF0aWNhbCgpIGNvbnN0CiAg ICAgcmV0dXJuIHRydWU7CiB9CiAKLSNlbmRpZiAvLyBVU0UoR1JBTU1BUl9DSEVDS0lORykKLQog VmVjdG9yPFN0cmluZz4gVGV4dENoZWNraW5nSGVscGVyOjpndWVzc2VzRm9yTWlzc3BlbGxlZE9y VW5ncmFtbWF0aWNhbFJhbmdlKGJvb2wgY2hlY2tHcmFtbWFyLCBib29sJiBtaXNzcGVsbGVkLCBi b29sJiB1bmdyYW1tYXRpY2FsKSBjb25zdAogewogICAgIGlmICghdW5pZmllZFRleHRDaGVja2Vy RW5hYmxlZCgpKQpAQCAtNjI4LDcgKzYyMCw2IEBAIHZvaWQgVGV4dENoZWNraW5nSGVscGVyOjpt YXJrQWxsTWlzc3BlbGxpbmdzKFJlZlB0cjxSYW5nZT4mIGZpcnN0TWlzc3BlbGxpbmdSYW5nCiAg ICAgZmluZEZpcnN0TWlzc3BlbGxpbmcoaWdub3JlZE9mZnNldCwgdHJ1ZSwgZmlyc3RNaXNzcGVs bGluZ1JhbmdlKTsKIH0KIAotI2lmIFVTRShHUkFNTUFSX0NIRUNLSU5HKQogdm9pZCBUZXh0Q2hl Y2tpbmdIZWxwZXI6Om1hcmtBbGxCYWRHcmFtbWFyKCkKIHsKICAgICAvLyBVc2UgdGhlICJtYXJr QWxsIiBmZWF0dXJlIG9mIG9maW5kRmlyc3RCYWRHcmFtbWFyLiBJZ25vcmUgdGhlIHJldHVybiB2 YWx1ZSBhbmQgIm91dCBwYXJhbWV0ZXJzIjsgYWxsIHdlIG5lZWQgdG8KQEAgLTYzNyw3ICs2Mjgs NiBAQCB2b2lkIFRleHRDaGVja2luZ0hlbHBlcjo6bWFya0FsbEJhZEdyYW1tYXIoKQogICAgIHVp bnQ2NF90IGlnbm9yZWRPZmZzZXQ7CiAgICAgZmluZEZpcnN0QmFkR3JhbW1hcihpZ25vcmVkR3Jh bW1hckRldGFpbCwgaWdub3JlZE9mZnNldCwgdHJ1ZSk7CiB9Ci0jZW5kaWYKIAogYm9vbCBUZXh0 Q2hlY2tpbmdIZWxwZXI6OnVuaWZpZWRUZXh0Q2hlY2tlckVuYWJsZWQoKSBjb25zdAogewpAQCAt NjUxLDI3ICs2NDEsMjUgQEAgdm9pZCBjaGVja1RleHRPZlBhcmFncmFwaChUZXh0Q2hlY2tlckNs aWVudCYgY2xpZW50LCBTdHJpbmdWaWV3IHRleHQsIE9wdGlvblNldDwKICNlbHNlCiAgICAgVU5V U0VEX1BBUkFNKGN1cnJlbnRTZWxlY3Rpb24pOwogCi0gICAgVmVjdG9yPFRleHRDaGVja2luZ1Jl c3VsdD4gbWlzcGVsbGluZ3M7CisgICAgVmVjdG9yPFRleHRDaGVja2luZ1Jlc3VsdD4gbWlzc3Bl bGxpbmdzOwogICAgIGlmIChjaGVja2luZ1R5cGVzLmNvbnRhaW5zKFRleHRDaGVja2luZ1R5cGU6 OlNwZWxsaW5nKSkKLSAgICAgICAgZmluZE1pc3NwZWxsaW5ncyhjbGllbnQsIHRleHQsIG1pc3Bl bGxpbmdzKTsKKyAgICAgICAgZmluZE1pc3NwZWxsaW5ncyhjbGllbnQsIHRleHQsIG1pc3NwZWxs aW5ncyk7CiAKLSNpZiBVU0UoR1JBTU1BUl9DSEVDS0lORykKICAgICAvLyBMb29rIGZvciBncmFt bWF0aWNhbCBlcnJvcnMgdGhhdCBvY2N1ciBiZWZvcmUgdGhlIGZpcnN0IG1pc3NwZWxsaW5nLgog ICAgIFZlY3RvcjxUZXh0Q2hlY2tpbmdSZXN1bHQ+IGdyYW1tYXRpY2FsRXJyb3JzOwogICAgIGlm IChjaGVja2luZ1R5cGVzLmNvbnRhaW5zKFRleHRDaGVja2luZ1R5cGU6OkdyYW1tYXIpKSB7CiAg ICAgICAgIHVuc2lnbmVkIGdyYW1tYXJDaGVja0xlbmd0aCA9IHRleHQubGVuZ3RoKCk7Ci0gICAg ICAgIGZvciAoYXV0byYgbWlzcGVsbGluZyA6IG1pc3BlbGxpbmdzKQotICAgICAgICAgICAgZ3Jh bW1hckNoZWNrTGVuZ3RoID0gc3RkOjptaW48dW5zaWduZWQ+KGdyYW1tYXJDaGVja0xlbmd0aCwg bWlzcGVsbGluZy5yYW5nZS5sb2NhdGlvbik7CisgICAgICAgIGZvciAoYXV0byYgbWlzc3BlbGxp bmcgOiBtaXNzcGVsbGluZ3MpCisgICAgICAgICAgICBncmFtbWFyQ2hlY2tMZW5ndGggPSBzdGQ6 Om1pbjx1bnNpZ25lZD4oZ3JhbW1hckNoZWNrTGVuZ3RoLCBtaXNzcGVsbGluZy5yYW5nZS5sb2Nh dGlvbik7CiAgICAgICAgIGZpbmRHcmFtbWF0aWNhbEVycm9ycyhjbGllbnQsIHRleHQuc3Vic3Ry aW5nKDAsIGdyYW1tYXJDaGVja0xlbmd0aCksIGdyYW1tYXRpY2FsRXJyb3JzKTsKICAgICB9CiAK ICAgICByZXN1bHRzID0gV1RGTW92ZShncmFtbWF0aWNhbEVycm9ycyk7Ci0jZW5kaWYKIAogICAg IGlmIChyZXN1bHRzLmlzRW1wdHkoKSkKLSAgICAgICAgcmVzdWx0cyA9IFdURk1vdmUobWlzcGVs bGluZ3MpOworICAgICAgICByZXN1bHRzID0gV1RGTW92ZShtaXNzcGVsbGluZ3MpOwogICAgIGVs c2UKLSAgICAgICAgcmVzdWx0cy5hcHBlbmRWZWN0b3IobWlzcGVsbGluZ3MpOworICAgICAgICBy ZXN1bHRzLmFwcGVuZFZlY3RvcihtaXNzcGVsbGluZ3MpOwogI2VuZGlmIC8vIFVTRShVTklGSUVE X1RFWFRfQ0hFQ0tJTkcpCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv VGV4dENoZWNraW5nSGVscGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRDaGVja2lu Z0hlbHBlci5oCmluZGV4IDhiZWFkMzdkZThhMGViMzgwNWY3NzMxZjkwNzllM2Y3ZGQ5YThjYzYu LmM2ODg4NzQwZDI3MTU3ZDIxZGVmMzNjNjRhZWJmYjk0ZmYxYjIzMmEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dENoZWNraW5nSGVscGVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvZWRpdGluZy9UZXh0Q2hlY2tpbmdIZWxwZXIuaApAQCAtODMsMTEgKzgzLDkgQEAgcHVi bGljOgogICAgIFN0cmluZyBmaW5kRmlyc3RNaXNzcGVsbGluZyh1aW50NjRfdCYgZmlyc3RNaXNz cGVsbGluZ09mZnNldCwgYm9vbCBtYXJrQWxsLCBSZWZQdHI8UmFuZ2U+JiBmaXJzdE1pc3NwZWxs aW5nUmFuZ2UpOwogICAgIFN0cmluZyBmaW5kRmlyc3RNaXNzcGVsbGluZ09yQmFkR3JhbW1hcihi b29sIGNoZWNrR3JhbW1hciwgYm9vbCYgb3V0SXNTcGVsbGluZywgdWludDY0X3QmIG91dEZpcnN0 Rm91bmRPZmZzZXQsIEdyYW1tYXJEZXRhaWwmIG91dEdyYW1tYXJEZXRhaWwpOwogICAgIHZvaWQg bWFya0FsbE1pc3NwZWxsaW5ncyhSZWZQdHI8UmFuZ2U+JiBmaXJzdE1pc3NwZWxsaW5nUmFuZ2Up OwotI2lmIFVTRShHUkFNTUFSX0NIRUNLSU5HKQogICAgIFN0cmluZyBmaW5kRmlyc3RCYWRHcmFt bWFyKEdyYW1tYXJEZXRhaWwmIG91dEdyYW1tYXJEZXRhaWwsIHVpbnQ2NF90JiBvdXRHcmFtbWFy UGhyYXNlT2Zmc2V0LCBib29sIG1hcmtBbGwpIGNvbnN0OwogICAgIHZvaWQgbWFya0FsbEJhZEdy YW1tYXIoKTsKICAgICBib29sIGlzVW5ncmFtbWF0aWNhbCgpIGNvbnN0OwotI2VuZGlmCiAgICAg VmVjdG9yPFN0cmluZz4gZ3Vlc3Nlc0Zvck1pc3NwZWxsZWRPclVuZ3JhbW1hdGljYWxSYW5nZShi b29sIGNoZWNrR3JhbW1hciwgYm9vbCYgbWlzc3BlbGxlZCwgYm9vbCYgdW5ncmFtbWF0aWNhbCkg Y29uc3Q7CiAKIHByaXZhdGU6CkBAIC05NSw5ICs5Myw3IEBAIHByaXZhdGU6CiAgICAgU2ltcGxl UmFuZ2UgbV9yYW5nZTsKIAogICAgIGJvb2wgdW5pZmllZFRleHRDaGVja2VyRW5hYmxlZCgpIGNv bnN0OwotI2lmIFVTRShHUkFNTUFSX0NIRUNLSU5HKQogICAgIGludCBmaW5kRmlyc3RHcmFtbWFy RGV0YWlsKGNvbnN0IFZlY3RvcjxHcmFtbWFyRGV0YWlsPiYsIHVpbnQ2NF90IGJhZEdyYW1tYXJQ aHJhc2VMb2NhdGlvbiwgdWludDY0X3Qgc3RhcnRPZmZzZXQsIHVpbnQ2NF90IGVuZE9mZnNldCwg Ym9vbCBtYXJrQWxsKSBjb25zdDsKLSNlbmRpZgogfTsKIAogdm9pZCBjaGVja1RleHRPZlBhcmFn cmFwaChUZXh0Q2hlY2tlckNsaWVudCYsIFN0cmluZ1ZpZXcsIE9wdGlvblNldDxUZXh0Q2hlY2tp bmdUeXBlPiwgVmVjdG9yPFRleHRDaGVja2luZ1Jlc3VsdD4mLCBjb25zdCBWaXNpYmxlU2VsZWN0 aW9uJiBjdXJyZW50U2VsZWN0aW9uKTsK