180070 2017-11-28 00:38:40 -0800 [JSC] Add MacroAssembler::getEffectiveAddress in all platforms 2017-11-29 09:39:57 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki commit-queue ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1375279 0 ysuzuki 2017-11-28 00:38:40 -0800 [JSC] Add MacroAssembler::getEffectiveAddress in all platforms 1375280 1 327734 ysuzuki 2017-11-28 00:40:25 -0800 Created attachment 327734 Patch 1375283 2 327736 ysuzuki 2017-11-28 00:54:53 -0800 Created attachment 327736 Patch 1375855 3 327736 saam 2017-11-29 09:12:22 -0800 Comment on attachment 327736 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=327736&action=review > Source/JavaScriptCore/yarr/YarrJIT.cpp:361 > + notUnicode.append(branchPtr(AboveOrEqual, regUnicodeInputAndTrail, regUnicodeTemp)); Is it possible to add a test for this? 1375857 4 327736 ysuzuki 2017-11-29 09:17:39 -0800 Comment on attachment 327736 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=327736&action=review Thanks >> Source/JavaScriptCore/yarr/YarrJIT.cpp:361 >> + notUnicode.append(branchPtr(AboveOrEqual, regUnicodeInputAndTrail, regUnicodeTemp)); > > Is it possible to add a test for this? I think this is a bit difficult since it depends on string ptr's lower 32bit. If +2 is accidentally overflowed, original 32bit comparison becomes incorrect. 1375871 5 327736 commit-queue 2017-11-29 09:37:40 -0800 Comment on attachment 327736 Patch Clearing flags on attachment: 327736 Committed r225271: <https://trac.webkit.org/changeset/225271> 1375872 6 commit-queue 2017-11-29 09:37:41 -0800 All reviewed patches have been landed. Closing bug. 1375873 7 webkit-bug-importer 2017-11-29 09:39:57 -0800 <rdar://problem/35749735> 327734 2017-11-28 00:40:25 -0800 2017-11-28 00:54:51 -0800 Patch bug-180070-20171128174024.patch text/plain 11133 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy Y2Q5ZTZkZGQ2ZmNmMGU1ZWQ0ZjFjYjA2N2ZiMjFjNDA2M2Q5ODJkLi5lNGNjYzE2ZTRlN2Q4MDBl MDVkYmViNDRjYjU4ZjM2MDM1YzkyY2VkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxNy0xMS0yOCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBBZGQgTWFjcm9Bc3NlbWJsZXI6OmdldEVmZmVjdGl2ZUFk ZHJlc3MgaW4gYWxsIHBsYXRmb3JtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTgwMDcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGdldEVmZmVjdGl2ZUFkZHJlc3MgaW4gYWxs IEpJVCBwbGF0Zm9ybXMuCisgICAgICAgIFRoaXMgaXMgYWJzdHJhY3RlZCB2ZXJzaW9uIG9mIHg4 NiBsZWEuCisKKyAgICAgICAgV2UgYWxzbyBmaXggYSBidWcgaW4gWWFyciB0aGF0IHVzZXMgYnJh bmNoMzIgaW5zdGVhZCBvZiBicmFuY2hQdHIgZm9yIGFkZHJlc3Nlcy4KKworICAgICAgICAqIGFz c2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxl ckFSTTo6Z2V0RWZmZWN0aXZlQWRkcmVzcyk6CisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNz ZW1ibGVyQVJNNjQuaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6Z2V0RWZm ZWN0aXZlQWRkcmVzcyk6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjQ6OmdldEVm ZmVjdGl2ZUFkZHJlc3M2NCk6IERlbGV0ZWQuCisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNz ZW1ibGVyQVJNdjcuaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk12Nzo6Z2V0RWZm ZWN0aXZlQWRkcmVzcyk6CisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5o OgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlck1JUFM6OmdldEVmZmVjdGl2ZUFkZHJlc3Mp OgorICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4Ni5oOgorICAgICAgICAoSlND OjpNYWNyb0Fzc2VtYmxlclg4Njo6Z2V0RWZmZWN0aXZlQWRkcmVzcyk6CisgICAgICAgICogYXNz ZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2XzY0Lmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1i bGVyWDg2XzY0OjpnZXRFZmZlY3RpdmVBZGRyZXNzKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3Nl bWJsZXJYODZfNjQ6OmdldEVmZmVjdGl2ZUFkZHJlc3M2NCk6IERlbGV0ZWQuCisgICAgICAgICog YXNzZW1ibGVyL3Rlc3RtYXNtLmNwcDoKKyAgICAgICAgKEpTQzo6dGVzdEdldEVmZmVjdGl2ZUFk ZHJlc3MpOgorICAgICAgICAoSlNDOjpydW4pOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2 ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVBcnJh eVB1c2gpOgorICAgICAgICAqIHlhcnIvWWFyckpJVC5jcHA6CisgICAgICAgIChKU0M6OllhcnI6 OllhcnJHZW5lcmF0b3I6OnRyeVJlYWRVbmljb2RlQ2hhckltcGwpOgorICAgICAgICAoSlNDOjpZ YXJyOjpZYXJyR2VuZXJhdG9yOjp0cnlSZWFkVW5pY29kZUNoYXIpOgorCiAyMDE3LTExLTI3ICBT YWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIFNwcmVhZCBjYW4gZXNj YXBlIHdoZW4gQ3JlYXRlUmVzdCBkb2VzIG5vdApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oCmluZGV4IDQ2YTU0N2UyZGEzNDVmYTY1 ZTllMGZiNzZiYTYzYWEyMzBiYzRiNzguLjZiMjU4Yjc1NDkwZmEzNDNkYzA2MTkwMDM3NWFkNjI1 N2Q0ODUxNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFj cm9Bc3NlbWJsZXJBUk0uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01h Y3JvQXNzZW1ibGVyQVJNLmgKQEAgLTEyOCw2ICsxMjgsMTMgQEAgY2xhc3MgTWFjcm9Bc3NlbWJs ZXJBUk0gOiBwdWJsaWMgQWJzdHJhY3RNYWNyb0Fzc2VtYmxlcjxBUk1Bc3NlbWJsZXI+IHsKICAg ICAgICAgbV9hc3NlbWJsZXIuYWRkcyhkZXN0LCBzcmMsIG1fYXNzZW1ibGVyLmdldEltbShpbW0u bV92YWx1ZSwgQVJNUmVnaXN0ZXJzOjpTMCkpOwogICAgIH0KIAorICAgIHZvaWQgZ2V0RWZmZWN0 aXZlQWRkcmVzcyhCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHsKKyAg ICAgICAgbV9hc3NlbWJsZXIuYWRkKGRlc3QsIGFkZHJlc3MuYmFzZSwgbV9hc3NlbWJsZXIubHNs KGFkZHJlc3MuaW5kZXgsIHN0YXRpY19jYXN0PGludD4oYWRkcmVzcy5zY2FsZSkpKTsKKyAgICAg ICAgaWYgKGFkZHJlc3Mub2Zmc2V0KQorICAgICAgICAgICAgYWRkMzIoVHJ1c3RlZEltbTMyKGFk ZHJlc3Mub2Zmc2V0KSwgZGVzdCk7CisgICAgfQorCiAgICAgdm9pZCBhbmQzMihSZWdpc3RlcklE IHNyYywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAgICAgICAgbV9hc3NlbWJsZXIuYml0QW5k cyhkZXN0LCBkZXN0LCBzcmMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNz ZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaAppbmRleCBkMjRlMGY1ZjBmNTdmNDEwNTQ2NjQ0 YjM4YzMxMjUzNThiMDA3ZjFiLi44MDZlY2RjOWNkNmY5NzIyNWU3MjlkZDQ1NTdjYjExOWY5Zjg2 YTg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNz ZW1ibGVyQVJNNjQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3Jv QXNzZW1ibGVyQVJNNjQuaApAQCAtMTU0MCw3ICsxNTQwLDcgQEAgY2xhc3MgTWFjcm9Bc3NlbWJs ZXJBUk02NCA6IHB1YmxpYyBBYnN0cmFjdE1hY3JvQXNzZW1ibGVyPEFSTTY0QXNzZW1ibGVyPiB7 CiAgICAgICAgIG1fYXNzZW1ibGVyLnN0cmIoc3JjLCBkZXN0LCBzaW1tKTsKICAgICB9CiAKLSAg ICB2b2lkIGdldEVmZmVjdGl2ZUFkZHJlc3M2NChCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJ RCBkZXN0KQorICAgIHZvaWQgZ2V0RWZmZWN0aXZlQWRkcmVzcyhCYXNlSW5kZXggYWRkcmVzcywg UmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAgICAgICAgbV9hc3NlbWJsZXIuYWRkPDY0PihkZXN0 LCBhZGRyZXNzLmJhc2UsIGFkZHJlc3MuaW5kZXgsIEFSTTY0QXNzZW1ibGVyOjpMU0wsIGFkZHJl c3Muc2NhbGUpOwogICAgICAgICBpZiAoYWRkcmVzcy5vZmZzZXQpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNdjcuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCmluZGV4IDcz NjhlYjQzNmMyNDI4YjdmOTk2NDhiMmQ2ODYzNzdhZTliNThhNTYuLmU1NTcyNzgzMjkwZWZhNmI1 ZDZhNmZiYmI2ZDA4YmFiNjBhM2ZhODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCkBAIC0yMzIsNiArMjMyLDEzIEBA IGNsYXNzIE1hY3JvQXNzZW1ibGVyQVJNdjcgOiBwdWJsaWMgQWJzdHJhY3RNYWNyb0Fzc2VtYmxl cjxBUk12N0Fzc2VtYmxlcj4gewogICAgICAgICBzdG9yZTMyKGRhdGFUZW1wUmVnaXN0ZXIsIGFk ZHJlc3MubV9wdHIpOwogICAgIH0KIAorICAgIHZvaWQgZ2V0RWZmZWN0aXZlQWRkcmVzcyhCYXNl SW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHsKKyAgICAgICAgbV9hc3NlbWJs ZXIuYWRkKGRlc3QsIGFkZHJlc3MuYmFzZSwgbV9hc3NlbWJsZXIubHNsKGFkZHJlc3MuaW5kZXgs IHN0YXRpY19jYXN0PGludD4oYWRkcmVzcy5zY2FsZSkpKTsKKyAgICAgICAgaWYgKGFkZHJlc3Mu b2Zmc2V0KQorICAgICAgICAgICAgYWRkMzIoVHJ1c3RlZEltbTMyKGFkZHJlc3Mub2Zmc2V0KSwg ZGVzdCk7CisgICAgfQorCiAgICAgdm9pZCBhZGRQdHJOb0ZsYWdzKFRydXN0ZWRJbW0zMiBpbW0s IFJlZ2lzdGVySUQgc3JjRGVzdCkKICAgICB7CiAgICAgICAgIGFkZDMyKGltbSwgc3JjRGVzdCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1i bGVyTUlQUy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxl ck1JUFMuaAppbmRleCBhMTJhOTNlZWM1Nzk5ZWIxOTQ0Y2MyNmEyMzU5YWI0NDVlYTIxMmJmLi41 YzQyMGMxNzU2YzU4YWQ4NWM3YTU5NDVjZjY2NDEwYTA1YTg1Mzg4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgKQEAgLTI3 MCw2ICsyNzAsMTQgQEAgY2xhc3MgTWFjcm9Bc3NlbWJsZXJNSVBTIDogcHVibGljIEFic3RyYWN0 TWFjcm9Bc3NlbWJsZXI8TUlQU0Fzc2VtYmxlcj4gewogICAgICAgICBtX2Fzc2VtYmxlci5zdyhk YXRhVGVtcFJlZ2lzdGVyLCBhZGRyVGVtcFJlZ2lzdGVyLCA0KTsKICAgICB9CiAKKyAgICB2b2lk IGdldEVmZmVjdGl2ZUFkZHJlc3MoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkK KyAgICB7CisgICAgICAgIG1fYXNzZW1ibGVyLnNsbChhZGRyVGVtcFJlZ2lzdGVyLCBhZGRyZXNz LmluZGV4LCBhZGRyZXNzLnNjYWxlKTsKKyAgICAgICAgbV9hc3NlbWJsZXIuYWRkdShkZXN0LCBh ZGRyVGVtcFJlZ2lzdGVyLCBhZGRyZXNzLmJhc2UpOworICAgICAgICBpZiAoYWRkcmVzcy5vZmZz ZXQpCisgICAgICAgICAgICBhZGQzMihUcnVzdGVkSW1tMzIoYWRkcmVzcy5vZmZzZXQpLCBkZXN0 KTsKKyAgICB9CisKICAgICB2b2lkIGFuZDMyKEFkZHJlc3Mgc3JjLCBSZWdpc3RlcklEIGRlc3Qp CiAgICAgewogICAgICAgICBsb2FkMzIoc3JjLCBkYXRhVGVtcFJlZ2lzdGVyKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODYuaCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODYuaAppbmRl eCA3NWYzNTQ1NmQyMWQzYmEzYjlhMDVkNWVlOWE1Y2ZiOWFmNDI0OWM5Li5iZjU5OTFjMzc5ODFm MGQ2NTE1MmIwMzgwMDIwODRkMmI3ODkzOWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2LmgKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4Ni5oCkBAIC03OSw2ICs3OSwxMSBAQCBj bGFzcyBNYWNyb0Fzc2VtYmxlclg4NiA6IHB1YmxpYyBNYWNyb0Fzc2VtYmxlclg4NkNvbW1vbiB7 CiAgICAgICAgIG1fYXNzZW1ibGVyLmFkY2xfaW0oaW1tLm1fdmFsdWUgPj4gMzEsIHJlaW50ZXJw cmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGFkZHJlc3MubV9wdHIpICsgc2l6ZW9mKGludDMyX3QpKTsK ICAgICB9CiAKKyAgICB2b2lkIGdldEVmZmVjdGl2ZUFkZHJlc3MoQmFzZUluZGV4IGFkZHJlc3Ms IFJlZ2lzdGVySUQgZGVzdCkKKyAgICB7CisgICAgICAgIHJldHVybiB4ODZMZWEzMihhZGRyZXNz LCBkZXN0KTsKKyAgICB9CisKICAgICB2b2lkIGFuZDMyKFRydXN0ZWRJbW0zMiBpbW0sIEFic29s dXRlQWRkcmVzcyBhZGRyZXNzKQogICAgIHsKICAgICAgICAgbV9hc3NlbWJsZXIuYW5kbF9pbShp bW0ubV92YWx1ZSwgYWRkcmVzcy5tX3B0cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2XzY0LmggYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2XzY0LmgKaW5kZXggZTg1NjRiZjU0NDRi YTQ5NDI0NzNlNGZlMTBlYzg2ZTc1OWI0MTc5ZC4uNmM0NmRhMGNlMmFmNDcwYzc3YWQ4MmMzZDYx ZmRiNjUwYTQzZjBkNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxl ci9NYWNyb0Fzc2VtYmxlclg4Nl82NC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvTWFjcm9Bc3NlbWJsZXJYODZfNjQuaApAQCAtMzY0LDcgKzM2NCw3IEBAIGNsYXNzIE1h Y3JvQXNzZW1ibGVyWDg2XzY0IDogcHVibGljIE1hY3JvQXNzZW1ibGVyWDg2Q29tbW9uIHsKICAg ICAgICAgbV9hc3NlbWJsZXIubGVhcV9tcihpbmRleC5vZmZzZXQsIGluZGV4LmJhc2UsIGluZGV4 LmluZGV4LCBpbmRleC5zY2FsZSwgZGVzdCk7CiAgICAgfQogCi0gICAgdm9pZCBnZXRFZmZlY3Rp dmVBZGRyZXNzNjQoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB2b2lk IGdldEVmZmVjdGl2ZUFkZHJlc3MoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkK ICAgICB7CiAgICAgICAgIHJldHVybiB4ODZMZWE2NChhZGRyZXNzLCBkZXN0KTsKICAgICB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL3Rlc3RtYXNtLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvdGVzdG1hc20uY3BwCmluZGV4IDdkMzRj OWYwZWEwN2JhOWVmNzMzMDAxODNjYzdmMDE1YzhhODcyNTEuLjNjNGQ3M2Q1YjllZmNhNTIxYWU3 NjE5Yzg5ZDU1YzE4MzdhMDIxMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9h c3NlbWJsZXIvdGVzdG1hc20uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvdGVzdG1hc20uY3BwCkBAIC0xNzEsNiArMTcxLDE4IEBAIHZvaWQgdGVzdFNpbXBsZSgpCiAg ICAgfSksIDQyKTsKIH0KIAordm9pZCB0ZXN0R2V0RWZmZWN0aXZlQWRkcmVzcyhzaXplX3QgcG9p bnRlciwgcHRyZGlmZl90IGxlbmd0aCwgaW50MzJfdCBvZmZzZXQsIENDYWxsSGVscGVyczo6U2Nh bGUgc2NhbGUpCit7CisgICAgQ0hFQ0tfRVEoY29tcGlsZUFuZFJ1bjxzaXplX3Q+KFs9XSAoQ0Nh bGxIZWxwZXJzJiBqaXQpIHsKKyAgICAgICAgaml0LmVtaXRGdW5jdGlvblByb2xvZ3VlKCk7Cisg ICAgICAgIGppdC5tb3ZlKENDYWxsSGVscGVyczo6VHJ1c3RlZEltbVB0cihiaXR3aXNlX2Nhc3Q8 dm9pZCo+KHBvaW50ZXIpKSwgR1BSSW5mbzo6cmVnVDApOworICAgICAgICBqaXQubW92ZShDQ2Fs bEhlbHBlcnM6OlRydXN0ZWRJbW1QdHIoYml0d2lzZV9jYXN0PHZvaWQqPihsZW5ndGgpKSwgR1BS SW5mbzo6cmVnVDEpOworICAgICAgICBqaXQuZ2V0RWZmZWN0aXZlQWRkcmVzcyhDQ2FsbEhlbHBl cnM6OkJhc2VJbmRleChHUFJJbmZvOjpyZWdUMCwgR1BSSW5mbzo6cmVnVDEsIHNjYWxlLCBvZmZz ZXQpLCBHUFJJbmZvOjpyZXR1cm5WYWx1ZUdQUik7CisgICAgICAgIGppdC5lbWl0RnVuY3Rpb25F cGlsb2d1ZSgpOworICAgICAgICBqaXQucmV0KCk7CisgICAgfSksIHBvaW50ZXIgKyBvZmZzZXQg KyAoMSA8PCBzdGF0aWNfY2FzdDxpbnQ+KHNjYWxlKSkgKiBsZW5ndGgpOworfQorCiAvLyBicmFu Y2hUcnVuY2F0ZURvdWJsZVRvSW50MzIoKSwgd2hlbiBlbmNvdW50ZXJpbmcgSW5maW5pdHksIC1J bmZpbml0eSBvciBhCiAvLyBOYW4sIHNob3VsZCBlaXRoZXIgeWllbGQgMCBpbiBkZXN0IG9yIGZh aWwuCiB2b2lkIHRlc3RCcmFuY2hUcnVuY2F0ZURvdWJsZVRvSW50MzIoZG91YmxlIHZhbCwgaW50 MzJfdCBleHBlY3RlZCkKQEAgLTczMCw2ICs3NDIsOCBAQCB2b2lkIHJ1bihjb25zdCBjaGFyKiBm aWx0ZXIpCiAgICAgfTsKIAogICAgIFJVTih0ZXN0U2ltcGxlKCkpOworICAgIFJVTih0ZXN0R2V0 RWZmZWN0aXZlQWRkcmVzcygweGZmMDAsIDQyLCA4LCBDQ2FsbEhlbHBlcnM6OlRpbWVzRWlnaHQp KTsKKyAgICBSVU4odGVzdEdldEVmZmVjdGl2ZUFkZHJlc3MoMHhmZjAwLCAtMjAwLCAtMzAwLCBD Q2FsbEhlbHBlcnM6OlRpbWVzRWlnaHQpKTsKICAgICBSVU4odGVzdEJyYW5jaFRydW5jYXRlRG91 YmxlVG9JbnQzMigwLCAwKSk7CiAgICAgUlVOKHRlc3RCcmFuY2hUcnVuY2F0ZURvdWJsZVRvSW50 MzIoNDIsIDQyKSk7CiAgICAgUlVOKHRlc3RCcmFuY2hUcnVuY2F0ZURvdWJsZVRvSW50MzIoNDIu NywgNDIpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3Vs YXRpdmVKSVQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJ VC5jcHAKaW5kZXggZWIxMmMxMzUwNjgyZWNiYzYxZmE4N2ZmMTE5ZmQzOTkyMmI0ODg1ZC4uMDQw YTlkYWFkNjQwYjYzYWM1OWUyMjEwMzVlZjMxNmVmY2Q3MzYzMyAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKQEAgLTc5NzMsMTYgKzc5NzMs OCBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlQXJyYXlQdXNoKE5vZGUqIG5vZGUpCiAj ZW5kaWYKIAogICAgIGF1dG8gZ2V0U3RvcmFnZUJ1ZmZlckFkZHJlc3MgPSBbJl0gKEdQUlJlZyBz dG9yYWdlR1BSLCBHUFJSZWcgaW5kZXhHUFIsIGludDMyX3Qgb2Zmc2V0LCBHUFJSZWcgYnVmZmVy R1BSKSB7Ci0jaWYgVVNFKEpTVkFMVUUzMl82NCkKICAgICAgICAgc3RhdGljX2Fzc2VydChzaXpl b2YoSlNWYWx1ZSkgPT0gOCAmJiAxIDw8IDMgPT0gOCwgIlRoaXMgaXMgc3Ryb25nbHkgYXNzdW1l ZCBpbiB0aGUgY29kZSBiZWxvdy4iKTsKLSAgICAgICAgbV9qaXQubW92ZShpbmRleEdQUiwgYnVm ZmVyR1BSKTsKLSAgICAgICAgbV9qaXQubHNoaWZ0MzIoVHJ1c3RlZEltbTMyKDMpLCBidWZmZXJH UFIpOwotICAgICAgICBtX2ppdC5hZGQzMihzdG9yYWdlR1BSLCBidWZmZXJHUFIpOwotICAgICAg ICBpZiAob2Zmc2V0KQotICAgICAgICAgICAgbV9qaXQuYWRkMzIoVHJ1c3RlZEltbTMyKG9mZnNl dCksIGJ1ZmZlckdQUik7Ci0jZWxzZQotICAgICAgICBtX2ppdC5nZXRFZmZlY3RpdmVBZGRyZXNz NjQoTWFjcm9Bc3NlbWJsZXI6OkJhc2VJbmRleChzdG9yYWdlR1BSLCBpbmRleEdQUiwgTWFjcm9B c3NlbWJsZXI6OlRpbWVzRWlnaHQsIG9mZnNldCksIGJ1ZmZlckdQUik7Ci0jZW5kaWYKKyAgICAg ICAgbV9qaXQuZ2V0RWZmZWN0aXZlQWRkcmVzcyhNYWNyb0Fzc2VtYmxlcjo6QmFzZUluZGV4KHN0 b3JhZ2VHUFIsIGluZGV4R1BSLCBNYWNyb0Fzc2VtYmxlcjo6VGltZXNFaWdodCwgb2Zmc2V0KSwg YnVmZmVyR1BSKTsKICAgICB9OwogCiAgICAgc3dpdGNoIChub2RlLT5hcnJheU1vZGUoKS50eXBl KCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJKSVQuY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAKaW5kZXggMjUzNTkxYzli YmI0NWQyZGM1MzZmMTVjYTM0MzVhNTY4ZDBmNjViOC4uMjJiNWY3ZTlmNGZkMmQxYTc1Y2M0MGRk YWNmOWI0MzEyMTFjYWUxZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIv WWFyckpJVC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAK QEAgLTM1Nyw4ICszNTcsOCBAQCBjbGFzcyBZYXJyR2VuZXJhdG9yIDogcHJpdmF0ZSBNYWNyb0Fz c2VtYmxlciB7CiAgICAgICAgIGFuZDMyKHN1cnJvZ2F0ZVRhZ01hc2ssIHJlc3VsdFJlZywgcmVn VW5pY29kZVRlbXApOwogICAgICAgICBub3RVbmljb2RlLmFwcGVuZChicmFuY2gzMihOb3RFcXVh bCwgcmVnVW5pY29kZVRlbXAsIGxlYWRpbmdTdXJyb2dhdGVUYWcpKTsKICAgICAgICAgYWRkUHRy KFRydXN0ZWRJbW0zMigyKSwgcmVnVW5pY29kZUlucHV0QW5kVHJhaWwpOwotICAgICAgICBnZXRF ZmZlY3RpdmVBZGRyZXNzNjQoQmFzZUluZGV4KGlucHV0LCBsZW5ndGgsIFRpbWVzVHdvKSwgcmVn VW5pY29kZVRlbXApOwotICAgICAgICBub3RVbmljb2RlLmFwcGVuZChicmFuY2gzMihBYm92ZU9y RXF1YWwsIHJlZ1VuaWNvZGVJbnB1dEFuZFRyYWlsLCByZWdVbmljb2RlVGVtcCkpOworICAgICAg ICBnZXRFZmZlY3RpdmVBZGRyZXNzKEJhc2VJbmRleChpbnB1dCwgbGVuZ3RoLCBUaW1lc1R3byks IHJlZ1VuaWNvZGVUZW1wKTsKKyAgICAgICAgbm90VW5pY29kZS5hcHBlbmQoYnJhbmNoUHRyKEFi b3ZlT3JFcXVhbCwgcmVnVW5pY29kZUlucHV0QW5kVHJhaWwsIHJlZ1VuaWNvZGVUZW1wKSk7CiAg ICAgICAgIGxvYWQxNlVuYWxpZ25lZChBZGRyZXNzKHJlZ1VuaWNvZGVJbnB1dEFuZFRyYWlsKSwg cmVnVW5pY29kZUlucHV0QW5kVHJhaWwpOwogICAgICAgICBhbmQzMihzdXJyb2dhdGVUYWdNYXNr LCByZWdVbmljb2RlSW5wdXRBbmRUcmFpbCwgcmVnVW5pY29kZVRlbXApOwogICAgICAgICBub3RV bmljb2RlLmFwcGVuZChicmFuY2gzMihOb3RFcXVhbCwgcmVnVW5pY29kZVRlbXAsIHRyYWlsaW5n U3Vycm9nYXRlVGFnKSk7CkBAIC0zNzQsNyArMzc0LDcgQEAgY2xhc3MgWWFyckdlbmVyYXRvciA6 IHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogICAgIHsKICAgICAgICAgQVNTRVJUKG1fY2hhclNp emUgPT0gQ2hhcjE2KTsKIAotICAgICAgICBnZXRFZmZlY3RpdmVBZGRyZXNzNjQoYWRkcmVzcywg cmVnVW5pY29kZUlucHV0QW5kVHJhaWwpOworICAgICAgICBnZXRFZmZlY3RpdmVBZGRyZXNzKGFk ZHJlc3MsIHJlZ1VuaWNvZGVJbnB1dEFuZFRyYWlsKTsKIAogICAgICAgICBpZiAocmVzdWx0UmVn ID09IHJlZ1QwKQogICAgICAgICAgICAgbV90cnlSZWFkVW5pY29kZUNoYXJhY3RlckNhbGxzLmFw cGVuZChuZWFyQ2FsbCgpKTsK 327736 2017-11-28 00:54:53 -0800 2017-11-29 09:37:40 -0800 Patch bug-180070-20171128175452.patch text/plain 11184 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy Y2Q5ZTZkZGQ2ZmNmMGU1ZWQ0ZjFjYjA2N2ZiMjFjNDA2M2Q5ODJkLi5lNGNjYzE2ZTRlN2Q4MDBl MDVkYmViNDRjYjU4ZjM2MDM1YzkyY2VkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxNy0xMS0yOCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBBZGQgTWFjcm9Bc3NlbWJsZXI6OmdldEVmZmVjdGl2ZUFk ZHJlc3MgaW4gYWxsIHBsYXRmb3JtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTgwMDcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGdldEVmZmVjdGl2ZUFkZHJlc3MgaW4gYWxs IEpJVCBwbGF0Zm9ybXMuCisgICAgICAgIFRoaXMgaXMgYWJzdHJhY3RlZCB2ZXJzaW9uIG9mIHg4 NiBsZWEuCisKKyAgICAgICAgV2UgYWxzbyBmaXggYSBidWcgaW4gWWFyciB0aGF0IHVzZXMgYnJh bmNoMzIgaW5zdGVhZCBvZiBicmFuY2hQdHIgZm9yIGFkZHJlc3Nlcy4KKworICAgICAgICAqIGFz c2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxl ckFSTTo6Z2V0RWZmZWN0aXZlQWRkcmVzcyk6CisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNz ZW1ibGVyQVJNNjQuaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6Z2V0RWZm ZWN0aXZlQWRkcmVzcyk6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjQ6OmdldEVm ZmVjdGl2ZUFkZHJlc3M2NCk6IERlbGV0ZWQuCisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNz ZW1ibGVyQVJNdjcuaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk12Nzo6Z2V0RWZm ZWN0aXZlQWRkcmVzcyk6CisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5o OgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlck1JUFM6OmdldEVmZmVjdGl2ZUFkZHJlc3Mp OgorICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4Ni5oOgorICAgICAgICAoSlND OjpNYWNyb0Fzc2VtYmxlclg4Njo6Z2V0RWZmZWN0aXZlQWRkcmVzcyk6CisgICAgICAgICogYXNz ZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2XzY0Lmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1i bGVyWDg2XzY0OjpnZXRFZmZlY3RpdmVBZGRyZXNzKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3Nl bWJsZXJYODZfNjQ6OmdldEVmZmVjdGl2ZUFkZHJlc3M2NCk6IERlbGV0ZWQuCisgICAgICAgICog YXNzZW1ibGVyL3Rlc3RtYXNtLmNwcDoKKyAgICAgICAgKEpTQzo6dGVzdEdldEVmZmVjdGl2ZUFk ZHJlc3MpOgorICAgICAgICAoSlNDOjpydW4pOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2 ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVBcnJh eVB1c2gpOgorICAgICAgICAqIHlhcnIvWWFyckpJVC5jcHA6CisgICAgICAgIChKU0M6OllhcnI6 OllhcnJHZW5lcmF0b3I6OnRyeVJlYWRVbmljb2RlQ2hhckltcGwpOgorICAgICAgICAoSlNDOjpZ YXJyOjpZYXJyR2VuZXJhdG9yOjp0cnlSZWFkVW5pY29kZUNoYXIpOgorCiAyMDE3LTExLTI3ICBT YWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIFNwcmVhZCBjYW4gZXNj YXBlIHdoZW4gQ3JlYXRlUmVzdCBkb2VzIG5vdApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oCmluZGV4IDQ2YTU0N2UyZGEzNDVmYTY1 ZTllMGZiNzZiYTYzYWEyMzBiYzRiNzguLjZiMjU4Yjc1NDkwZmEzNDNkYzA2MTkwMDM3NWFkNjI1 N2Q0ODUxNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFj cm9Bc3NlbWJsZXJBUk0uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01h Y3JvQXNzZW1ibGVyQVJNLmgKQEAgLTEyOCw2ICsxMjgsMTMgQEAgY2xhc3MgTWFjcm9Bc3NlbWJs ZXJBUk0gOiBwdWJsaWMgQWJzdHJhY3RNYWNyb0Fzc2VtYmxlcjxBUk1Bc3NlbWJsZXI+IHsKICAg ICAgICAgbV9hc3NlbWJsZXIuYWRkcyhkZXN0LCBzcmMsIG1fYXNzZW1ibGVyLmdldEltbShpbW0u bV92YWx1ZSwgQVJNUmVnaXN0ZXJzOjpTMCkpOwogICAgIH0KIAorICAgIHZvaWQgZ2V0RWZmZWN0 aXZlQWRkcmVzcyhCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHsKKyAg ICAgICAgbV9hc3NlbWJsZXIuYWRkKGRlc3QsIGFkZHJlc3MuYmFzZSwgbV9hc3NlbWJsZXIubHNs KGFkZHJlc3MuaW5kZXgsIHN0YXRpY19jYXN0PGludD4oYWRkcmVzcy5zY2FsZSkpKTsKKyAgICAg ICAgaWYgKGFkZHJlc3Mub2Zmc2V0KQorICAgICAgICAgICAgYWRkMzIoVHJ1c3RlZEltbTMyKGFk ZHJlc3Mub2Zmc2V0KSwgZGVzdCk7CisgICAgfQorCiAgICAgdm9pZCBhbmQzMihSZWdpc3RlcklE IHNyYywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAgICAgICAgbV9hc3NlbWJsZXIuYml0QW5k cyhkZXN0LCBkZXN0LCBzcmMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNz ZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaAppbmRleCBkMjRlMGY1ZjBmNTdmNDEwNTQ2NjQ0 YjM4YzMxMjUzNThiMDA3ZjFiLi44MDZlY2RjOWNkNmY5NzIyNWU3MjlkZDQ1NTdjYjExOWY5Zjg2 YTg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNz ZW1ibGVyQVJNNjQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3Jv QXNzZW1ibGVyQVJNNjQuaApAQCAtMTU0MCw3ICsxNTQwLDcgQEAgY2xhc3MgTWFjcm9Bc3NlbWJs ZXJBUk02NCA6IHB1YmxpYyBBYnN0cmFjdE1hY3JvQXNzZW1ibGVyPEFSTTY0QXNzZW1ibGVyPiB7 CiAgICAgICAgIG1fYXNzZW1ibGVyLnN0cmIoc3JjLCBkZXN0LCBzaW1tKTsKICAgICB9CiAKLSAg ICB2b2lkIGdldEVmZmVjdGl2ZUFkZHJlc3M2NChCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJ RCBkZXN0KQorICAgIHZvaWQgZ2V0RWZmZWN0aXZlQWRkcmVzcyhCYXNlSW5kZXggYWRkcmVzcywg UmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAgICAgICAgbV9hc3NlbWJsZXIuYWRkPDY0PihkZXN0 LCBhZGRyZXNzLmJhc2UsIGFkZHJlc3MuaW5kZXgsIEFSTTY0QXNzZW1ibGVyOjpMU0wsIGFkZHJl c3Muc2NhbGUpOwogICAgICAgICBpZiAoYWRkcmVzcy5vZmZzZXQpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNdjcuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCmluZGV4IDcz NjhlYjQzNmMyNDI4YjdmOTk2NDhiMmQ2ODYzNzdhZTliNThhNTYuLmMyYzVlMzY1ZTA0YzQ4NjY3 MjY5NWY3MTg2NDQzMTM5MzU4OGRjZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCkBAIC0yMzIsNiArMjMyLDE0IEBA IGNsYXNzIE1hY3JvQXNzZW1ibGVyQVJNdjcgOiBwdWJsaWMgQWJzdHJhY3RNYWNyb0Fzc2VtYmxl cjxBUk12N0Fzc2VtYmxlcj4gewogICAgICAgICBzdG9yZTMyKGRhdGFUZW1wUmVnaXN0ZXIsIGFk ZHJlc3MubV9wdHIpOwogICAgIH0KIAorICAgIHZvaWQgZ2V0RWZmZWN0aXZlQWRkcmVzcyhCYXNl SW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHsKKyAgICAgICAgbV9hc3NlbWJs ZXIubHNsKGFkZHJlc3NUZW1wUmVnaXN0ZXIsIGFkZHJlc3MuaW5kZXgsIHN0YXRpY19jYXN0PGlu dD4oYWRkcmVzcy5zY2FsZSkpOworICAgICAgICBtX2Fzc2VtYmxlci5hZGQoZGVzdCwgYWRkcmVz cy5iYXNlLCBhZGRyZXNzVGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgaWYgKGFkZHJlc3Mub2Zmc2V0 KQorICAgICAgICAgICAgYWRkMzIoVHJ1c3RlZEltbTMyKGFkZHJlc3Mub2Zmc2V0KSwgZGVzdCk7 CisgICAgfQorCiAgICAgdm9pZCBhZGRQdHJOb0ZsYWdzKFRydXN0ZWRJbW0zMiBpbW0sIFJlZ2lz dGVySUQgc3JjRGVzdCkKICAgICB7CiAgICAgICAgIGFkZDMyKGltbSwgc3JjRGVzdCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQ Uy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMu aAppbmRleCBhMTJhOTNlZWM1Nzk5ZWIxOTQ0Y2MyNmEyMzU5YWI0NDVlYTIxMmJmLi41YzQyMGMx NzU2YzU4YWQ4NWM3YTU5NDVjZjY2NDEwYTA1YTg1Mzg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgKQEAgLTI3MCw2ICsy NzAsMTQgQEAgY2xhc3MgTWFjcm9Bc3NlbWJsZXJNSVBTIDogcHVibGljIEFic3RyYWN0TWFjcm9B c3NlbWJsZXI8TUlQU0Fzc2VtYmxlcj4gewogICAgICAgICBtX2Fzc2VtYmxlci5zdyhkYXRhVGVt cFJlZ2lzdGVyLCBhZGRyVGVtcFJlZ2lzdGVyLCA0KTsKICAgICB9CiAKKyAgICB2b2lkIGdldEVm ZmVjdGl2ZUFkZHJlc3MoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB7 CisgICAgICAgIG1fYXNzZW1ibGVyLnNsbChhZGRyVGVtcFJlZ2lzdGVyLCBhZGRyZXNzLmluZGV4 LCBhZGRyZXNzLnNjYWxlKTsKKyAgICAgICAgbV9hc3NlbWJsZXIuYWRkdShkZXN0LCBhZGRyVGVt cFJlZ2lzdGVyLCBhZGRyZXNzLmJhc2UpOworICAgICAgICBpZiAoYWRkcmVzcy5vZmZzZXQpCisg ICAgICAgICAgICBhZGQzMihUcnVzdGVkSW1tMzIoYWRkcmVzcy5vZmZzZXQpLCBkZXN0KTsKKyAg ICB9CisKICAgICB2b2lkIGFuZDMyKEFkZHJlc3Mgc3JjLCBSZWdpc3RlcklEIGRlc3QpCiAgICAg ewogICAgICAgICBsb2FkMzIoc3JjLCBkYXRhVGVtcFJlZ2lzdGVyKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODYuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODYuaAppbmRleCA3NWYz NTQ1NmQyMWQzYmEzYjlhMDVkNWVlOWE1Y2ZiOWFmNDI0OWM5Li5iZjU5OTFjMzc5ODFmMGQ2NTE1 MmIwMzgwMDIwODRkMmI3ODkzOWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4Ni5oCkBAIC03OSw2ICs3OSwxMSBAQCBjbGFzcyBN YWNyb0Fzc2VtYmxlclg4NiA6IHB1YmxpYyBNYWNyb0Fzc2VtYmxlclg4NkNvbW1vbiB7CiAgICAg ICAgIG1fYXNzZW1ibGVyLmFkY2xfaW0oaW1tLm1fdmFsdWUgPj4gMzEsIHJlaW50ZXJwcmV0X2Nh c3Q8Y29uc3QgY2hhcio+KGFkZHJlc3MubV9wdHIpICsgc2l6ZW9mKGludDMyX3QpKTsKICAgICB9 CiAKKyAgICB2b2lkIGdldEVmZmVjdGl2ZUFkZHJlc3MoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lz dGVySUQgZGVzdCkKKyAgICB7CisgICAgICAgIHJldHVybiB4ODZMZWEzMihhZGRyZXNzLCBkZXN0 KTsKKyAgICB9CisKICAgICB2b2lkIGFuZDMyKFRydXN0ZWRJbW0zMiBpbW0sIEFic29sdXRlQWRk cmVzcyBhZGRyZXNzKQogICAgIHsKICAgICAgICAgbV9hc3NlbWJsZXIuYW5kbF9pbShpbW0ubV92 YWx1ZSwgYWRkcmVzcy5tX3B0cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2XzY0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2XzY0LmgKaW5kZXggZTg1NjRiZjU0NDRiYTQ5NDI0 NzNlNGZlMTBlYzg2ZTc1OWI0MTc5ZC4uNmM0NmRhMGNlMmFmNDcwYzc3YWQ4MmMzZDYxZmRiNjUw YTQzZjBkNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNy b0Fzc2VtYmxlclg4Nl82NC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIv TWFjcm9Bc3NlbWJsZXJYODZfNjQuaApAQCAtMzY0LDcgKzM2NCw3IEBAIGNsYXNzIE1hY3JvQXNz ZW1ibGVyWDg2XzY0IDogcHVibGljIE1hY3JvQXNzZW1ibGVyWDg2Q29tbW9uIHsKICAgICAgICAg bV9hc3NlbWJsZXIubGVhcV9tcihpbmRleC5vZmZzZXQsIGluZGV4LmJhc2UsIGluZGV4LmluZGV4 LCBpbmRleC5zY2FsZSwgZGVzdCk7CiAgICAgfQogCi0gICAgdm9pZCBnZXRFZmZlY3RpdmVBZGRy ZXNzNjQoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB2b2lkIGdldEVm ZmVjdGl2ZUFkZHJlc3MoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7 CiAgICAgICAgIHJldHVybiB4ODZMZWE2NChhZGRyZXNzLCBkZXN0KTsKICAgICB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL3Rlc3RtYXNtLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvdGVzdG1hc20uY3BwCmluZGV4IDdkMzRjOWYwZWEw N2JhOWVmNzMzMDAxODNjYzdmMDE1YzhhODcyNTEuLjNjNGQ3M2Q1YjllZmNhNTIxYWU3NjE5Yzg5 ZDU1YzE4MzdhMDIxMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvdGVzdG1hc20uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvdGVz dG1hc20uY3BwCkBAIC0xNzEsNiArMTcxLDE4IEBAIHZvaWQgdGVzdFNpbXBsZSgpCiAgICAgfSks IDQyKTsKIH0KIAordm9pZCB0ZXN0R2V0RWZmZWN0aXZlQWRkcmVzcyhzaXplX3QgcG9pbnRlciwg cHRyZGlmZl90IGxlbmd0aCwgaW50MzJfdCBvZmZzZXQsIENDYWxsSGVscGVyczo6U2NhbGUgc2Nh bGUpCit7CisgICAgQ0hFQ0tfRVEoY29tcGlsZUFuZFJ1bjxzaXplX3Q+KFs9XSAoQ0NhbGxIZWxw ZXJzJiBqaXQpIHsKKyAgICAgICAgaml0LmVtaXRGdW5jdGlvblByb2xvZ3VlKCk7CisgICAgICAg IGppdC5tb3ZlKENDYWxsSGVscGVyczo6VHJ1c3RlZEltbVB0cihiaXR3aXNlX2Nhc3Q8dm9pZCo+ KHBvaW50ZXIpKSwgR1BSSW5mbzo6cmVnVDApOworICAgICAgICBqaXQubW92ZShDQ2FsbEhlbHBl cnM6OlRydXN0ZWRJbW1QdHIoYml0d2lzZV9jYXN0PHZvaWQqPihsZW5ndGgpKSwgR1BSSW5mbzo6 cmVnVDEpOworICAgICAgICBqaXQuZ2V0RWZmZWN0aXZlQWRkcmVzcyhDQ2FsbEhlbHBlcnM6OkJh c2VJbmRleChHUFJJbmZvOjpyZWdUMCwgR1BSSW5mbzo6cmVnVDEsIHNjYWxlLCBvZmZzZXQpLCBH UFJJbmZvOjpyZXR1cm5WYWx1ZUdQUik7CisgICAgICAgIGppdC5lbWl0RnVuY3Rpb25FcGlsb2d1 ZSgpOworICAgICAgICBqaXQucmV0KCk7CisgICAgfSksIHBvaW50ZXIgKyBvZmZzZXQgKyAoMSA8 PCBzdGF0aWNfY2FzdDxpbnQ+KHNjYWxlKSkgKiBsZW5ndGgpOworfQorCiAvLyBicmFuY2hUcnVu Y2F0ZURvdWJsZVRvSW50MzIoKSwgd2hlbiBlbmNvdW50ZXJpbmcgSW5maW5pdHksIC1JbmZpbml0 eSBvciBhCiAvLyBOYW4sIHNob3VsZCBlaXRoZXIgeWllbGQgMCBpbiBkZXN0IG9yIGZhaWwuCiB2 b2lkIHRlc3RCcmFuY2hUcnVuY2F0ZURvdWJsZVRvSW50MzIoZG91YmxlIHZhbCwgaW50MzJfdCBl eHBlY3RlZCkKQEAgLTczMCw2ICs3NDIsOCBAQCB2b2lkIHJ1bihjb25zdCBjaGFyKiBmaWx0ZXIp CiAgICAgfTsKIAogICAgIFJVTih0ZXN0U2ltcGxlKCkpOworICAgIFJVTih0ZXN0R2V0RWZmZWN0 aXZlQWRkcmVzcygweGZmMDAsIDQyLCA4LCBDQ2FsbEhlbHBlcnM6OlRpbWVzRWlnaHQpKTsKKyAg ICBSVU4odGVzdEdldEVmZmVjdGl2ZUFkZHJlc3MoMHhmZjAwLCAtMjAwLCAtMzAwLCBDQ2FsbEhl bHBlcnM6OlRpbWVzRWlnaHQpKTsKICAgICBSVU4odGVzdEJyYW5jaFRydW5jYXRlRG91YmxlVG9J bnQzMigwLCAwKSk7CiAgICAgUlVOKHRlc3RCcmFuY2hUcnVuY2F0ZURvdWJsZVRvSW50MzIoNDIs IDQyKSk7CiAgICAgUlVOKHRlc3RCcmFuY2hUcnVuY2F0ZURvdWJsZVRvSW50MzIoNDIuNywgNDIp KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVK SVQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAK aW5kZXggZWIxMmMxMzUwNjgyZWNiYzYxZmE4N2ZmMTE5ZmQzOTkyMmI0ODg1ZC4uMDQwYTlkYWFk NjQwYjYzYWM1OWUyMjEwMzVlZjMxNmVmY2Q3MzYzMyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKQEAgLTc5NzMsMTYgKzc5NzMsOCBAQCB2 b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlQXJyYXlQdXNoKE5vZGUqIG5vZGUpCiAjZW5kaWYK IAogICAgIGF1dG8gZ2V0U3RvcmFnZUJ1ZmZlckFkZHJlc3MgPSBbJl0gKEdQUlJlZyBzdG9yYWdl R1BSLCBHUFJSZWcgaW5kZXhHUFIsIGludDMyX3Qgb2Zmc2V0LCBHUFJSZWcgYnVmZmVyR1BSKSB7 Ci0jaWYgVVNFKEpTVkFMVUUzMl82NCkKICAgICAgICAgc3RhdGljX2Fzc2VydChzaXplb2YoSlNW YWx1ZSkgPT0gOCAmJiAxIDw8IDMgPT0gOCwgIlRoaXMgaXMgc3Ryb25nbHkgYXNzdW1lZCBpbiB0 aGUgY29kZSBiZWxvdy4iKTsKLSAgICAgICAgbV9qaXQubW92ZShpbmRleEdQUiwgYnVmZmVyR1BS KTsKLSAgICAgICAgbV9qaXQubHNoaWZ0MzIoVHJ1c3RlZEltbTMyKDMpLCBidWZmZXJHUFIpOwot ICAgICAgICBtX2ppdC5hZGQzMihzdG9yYWdlR1BSLCBidWZmZXJHUFIpOwotICAgICAgICBpZiAo b2Zmc2V0KQotICAgICAgICAgICAgbV9qaXQuYWRkMzIoVHJ1c3RlZEltbTMyKG9mZnNldCksIGJ1 ZmZlckdQUik7Ci0jZWxzZQotICAgICAgICBtX2ppdC5nZXRFZmZlY3RpdmVBZGRyZXNzNjQoTWFj cm9Bc3NlbWJsZXI6OkJhc2VJbmRleChzdG9yYWdlR1BSLCBpbmRleEdQUiwgTWFjcm9Bc3NlbWJs ZXI6OlRpbWVzRWlnaHQsIG9mZnNldCksIGJ1ZmZlckdQUik7Ci0jZW5kaWYKKyAgICAgICAgbV9q aXQuZ2V0RWZmZWN0aXZlQWRkcmVzcyhNYWNyb0Fzc2VtYmxlcjo6QmFzZUluZGV4KHN0b3JhZ2VH UFIsIGluZGV4R1BSLCBNYWNyb0Fzc2VtYmxlcjo6VGltZXNFaWdodCwgb2Zmc2V0KSwgYnVmZmVy R1BSKTsKICAgICB9OwogCiAgICAgc3dpdGNoIChub2RlLT5hcnJheU1vZGUoKS50eXBlKCkpIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJKSVQuY3BwIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAKaW5kZXggMjUzNTkxYzliYmI0NWQy ZGM1MzZmMTVjYTM0MzVhNTY4ZDBmNjViOC4uMjJiNWY3ZTlmNGZkMmQxYTc1Y2M0MGRkYWNmOWI0 MzEyMTFjYWUxZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJ VC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAKQEAgLTM1 Nyw4ICszNTcsOCBAQCBjbGFzcyBZYXJyR2VuZXJhdG9yIDogcHJpdmF0ZSBNYWNyb0Fzc2VtYmxl ciB7CiAgICAgICAgIGFuZDMyKHN1cnJvZ2F0ZVRhZ01hc2ssIHJlc3VsdFJlZywgcmVnVW5pY29k ZVRlbXApOwogICAgICAgICBub3RVbmljb2RlLmFwcGVuZChicmFuY2gzMihOb3RFcXVhbCwgcmVn VW5pY29kZVRlbXAsIGxlYWRpbmdTdXJyb2dhdGVUYWcpKTsKICAgICAgICAgYWRkUHRyKFRydXN0 ZWRJbW0zMigyKSwgcmVnVW5pY29kZUlucHV0QW5kVHJhaWwpOwotICAgICAgICBnZXRFZmZlY3Rp dmVBZGRyZXNzNjQoQmFzZUluZGV4KGlucHV0LCBsZW5ndGgsIFRpbWVzVHdvKSwgcmVnVW5pY29k ZVRlbXApOwotICAgICAgICBub3RVbmljb2RlLmFwcGVuZChicmFuY2gzMihBYm92ZU9yRXF1YWws IHJlZ1VuaWNvZGVJbnB1dEFuZFRyYWlsLCByZWdVbmljb2RlVGVtcCkpOworICAgICAgICBnZXRF ZmZlY3RpdmVBZGRyZXNzKEJhc2VJbmRleChpbnB1dCwgbGVuZ3RoLCBUaW1lc1R3byksIHJlZ1Vu aWNvZGVUZW1wKTsKKyAgICAgICAgbm90VW5pY29kZS5hcHBlbmQoYnJhbmNoUHRyKEFib3ZlT3JF cXVhbCwgcmVnVW5pY29kZUlucHV0QW5kVHJhaWwsIHJlZ1VuaWNvZGVUZW1wKSk7CiAgICAgICAg IGxvYWQxNlVuYWxpZ25lZChBZGRyZXNzKHJlZ1VuaWNvZGVJbnB1dEFuZFRyYWlsKSwgcmVnVW5p Y29kZUlucHV0QW5kVHJhaWwpOwogICAgICAgICBhbmQzMihzdXJyb2dhdGVUYWdNYXNrLCByZWdV bmljb2RlSW5wdXRBbmRUcmFpbCwgcmVnVW5pY29kZVRlbXApOwogICAgICAgICBub3RVbmljb2Rl LmFwcGVuZChicmFuY2gzMihOb3RFcXVhbCwgcmVnVW5pY29kZVRlbXAsIHRyYWlsaW5nU3Vycm9n YXRlVGFnKSk7CkBAIC0zNzQsNyArMzc0LDcgQEAgY2xhc3MgWWFyckdlbmVyYXRvciA6IHByaXZh dGUgTWFjcm9Bc3NlbWJsZXIgewogICAgIHsKICAgICAgICAgQVNTRVJUKG1fY2hhclNpemUgPT0g Q2hhcjE2KTsKIAotICAgICAgICBnZXRFZmZlY3RpdmVBZGRyZXNzNjQoYWRkcmVzcywgcmVnVW5p Y29kZUlucHV0QW5kVHJhaWwpOworICAgICAgICBnZXRFZmZlY3RpdmVBZGRyZXNzKGFkZHJlc3Ms IHJlZ1VuaWNvZGVJbnB1dEFuZFRyYWlsKTsKIAogICAgICAgICBpZiAocmVzdWx0UmVnID09IHJl Z1QwKQogICAgICAgICAgICAgbV90cnlSZWFkVW5pY29kZUNoYXJhY3RlckNhbGxzLmFwcGVuZChu ZWFyQ2FsbCgpKTsK