197584 2019-05-03 16:02:44 -0700 [JSC] Need to emit SetLocal if we emit MovHint in DFGByteCodeParser 2019-05-03 16:57:32 -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 1533038 0 ysuzuki 2019-05-03 16:02:44 -0700 [JSC] Need to emit SetLocal if we emit MovHint in DFGByteCodeParser 1533063 1 369013 ysuzuki 2019-05-03 16:19:26 -0700 Created attachment 369013 Patch 1533064 2 369014 ysuzuki 2019-05-03 16:21:48 -0700 Created attachment 369014 Patch 1533071 3 ysuzuki 2019-05-03 16:31:15 -0700 <rdar://problem/50435721> 1533087 4 369014 saam 2019-05-03 16:46:37 -0700 Comment on attachment 369014 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=369014&action=review > Source/JavaScriptCore/ChangeLog:10 > + and SetLocal are needed to be a pair in DFGByteCodeParser because we rely on this assumption in SSA conversion phase. SSA conversion phase always emit KillStack This seems weird. 1533088 5 saam 2019-05-03 16:47:38 -0700 (In reply to Saam Barati from comment #4) > Comment on attachment 369014 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=369014&action=review > > > Source/JavaScriptCore/ChangeLog:10 > > + and SetLocal are needed to be a pair in DFGByteCodeParser because we rely on this assumption in SSA conversion phase. SSA conversion phase always emit KillStack > > This seems weird. Actually I guess it makes sense. I wonder if we can remove this requirement at some point 1533091 6 369014 ysuzuki 2019-05-03 16:51:04 -0700 Comment on attachment 369014 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=369014&action=review Thanks! >>> Source/JavaScriptCore/ChangeLog:10 >>> + and SetLocal are needed to be a pair in DFGByteCodeParser because we rely on this assumption in SSA conversion phase. SSA conversion phase always emit KillStack >> >> This seems weird. > > Actually I guess it makes sense. I wonder if we can remove this requirement at some point Yeah, we should eventually remove this requirement... 1533095 7 ysuzuki 2019-05-03 16:57:32 -0700 Committed r244939: <https://trac.webkit.org/changeset/244939> 369013 2019-05-03 16:19:26 -0700 2019-05-03 16:21:47 -0700 Patch bug-197584-20190503161925.patch text/plain 8798 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0OTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 ZGFhNjU0MWEzZTNkNTFmYjMyYjQ5ZTg3MWQ4OWEzNTI3ZGI3OTc4Li4xOTE5YzZjMTRhYjg3MjJm MzQyMGZhODUwZDA4NDc1NTgwMWNjNDUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MyBAQAorMjAxOS0wNS0wMyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIE5lZWQgdG8gZW1pdCBTZXRMb2NhbCBpZiB3ZSBlbWl0IE1vdkhp bnQgaW4gREZHQnl0ZUNvZGVQYXJzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NzU4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEluIHIyNDQ4NjQsIHdlIGVtaXQgTW92SGludCBmb3IgYWRob2NseSBj cmVhdGVkIEdldHRlckNhbGwvU2V0dGVyQ2FsbCBmcmFtZSBsb2NhbHMgaW4gdGhlIGNhbGxlZSBz aWRlIHRvIG1ha2UgT1NSIGF2YWlsYWJpbGl0eSBhbmFseXNpcydzIHBydW5pbmcgY29ycmVjdC4K KyAgICAgICAgSG93ZXZlciwgd2UganVzdCBlbWl0IE1vdkhpbnQsIGFuZCB3ZSBkbyBub3QgZW1p dCBTZXRMb2NhbCBzaW5jZSB3ZSBlbnN1cmVkIHRoYXQgdGhlc2UgbG9jYWxzIGFyZSBhbHJlYWR5 IGZsdXNoZWQgaW4gdGhlIHNhbWUgcGxhY2UgYmVmb3JlLiBIb3dldmVyLCBNb3ZIaW50CisgICAg ICAgIGFuZCBTZXRMb2NhbCBhcmUgbmVlZGVkIHRvIGJlIGEgcGFpciBpbiBERkdCeXRlQ29kZVBh cnNlciBiZWNhdXNlIHdlIHJlbHkgb24gdGhpcyBhc3N1bXB0aW9uIGluIFNTQSBjb252ZXJzaW9u IHBoYXNlLiBTU0EgY29udmVyc2lvbiBwaGFzZSBhbHdheXMgZW1pdCBLaWxsU3RhY2sKKyAgICAg ICAganVzdCBiZWZvcmUgTW92SGludCdzIHRhcmdldCBsb2NhdGlvbiBldmVuIGlmIHRoZSBNb3ZI aW50J3MgdGFyZ2V0IGlzIHRoZSBzYW1lIHRvIHRoZSBwcmV2aW91c2x5IGVtaXR0ZWQgTW92SGlu dCBhbmQgU2V0TG9jYWwuCisgICAgICAgIFRoaXMgcGF0Y2ggZW1pdHMgU2V0TG9jYWwgdG9vIHdo ZW4gZW1pdHRpbmcgTW92SGludCBmb3IgR2V0dGVyQ2FsbC9TZXR0ZXJDYWxsIGZyYW1lIGxvY2Fs cy4KKworICAgICAgICBUaGUgZXhhbXBsZSBpcyBsaWtlIHRoaXMuCisKKyAgICAgICAgICAgIGE6 ICBTb21lVmFsdWVOb2RlCisgICAgICAgICAgICAgOiAgTW92SGludChAYSwgbG9jMTApCisgICAg ICAgICAgICBiOiAgU2V0TG9jYWwoQGEsIGxvYzEwKQorICAgICAgICAgICAgICAgIC4uLgorICAg ICAgICAgICAgYzogIE1vdkhpbnQoQGEsIGxvYzEwKQorCisgICAgICAgIFRoZW4sIHRoaXMgd2ls bCBiZSBjb252ZXJ0ZWQgdG8gdGhlIHN0eWxlIGluIFNTQSBjb252ZXJzaW9uLgorCisgICAgICAg ICAgICBhOiAgU29tZVZhbHVlTm9kZQorICAgICAgICAgICAgIDogIEtpbGxTdGFjayhsb2MxMCkK KyAgICAgICAgICAgIGI6ICBQdXRTdGFjayhAYSwgbG9jMTApCisgICAgICAgICAgICAgICAgLi4u CisgICAgICAgICAgICBjOiAgS2lsbFN0YWNrKGxvYzEwKQorCisgICAgICAgIFRoZW4sIEBiIHdp bGwgYmUgcmVtb3ZlZCBsYXRlciBzaW5jZSBAYyBraWxscyBpdC4KKworICAgICAgICAqIGRmZy9E RkdCeXRlQ29kZVBhcnNlci5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6 OmlubGluZUNhbGwpOgorICAgICAgICAqIGhlYXAvTWFya2VkQmxvY2suY3BwOgorICAgICAgICAo SlNDOjpNYXJrZWRCbG9jazo6TWFya2VkQmxvY2spOgorICAgICAgICAoSlNDOjpNYXJrZWRCbG9j azo6SGFuZGxlOjpzdG9wQWxsb2NhdGluZyk6CisgICAgICAgIChKU0M6Ok1hcmtlZEJsb2NrOjpI YW5kbGU6OnJlc3VtZUFsbG9jYXRpbmcpOgorICAgICAgICAoSlNDOjpNYXJrZWRCbG9jazo6YWJv dXRUb01hcmtTbG93KToKKyAgICAgICAgKEpTQzo6TWFya2VkQmxvY2s6OkhhbmRsZTo6ZGlkQ29u c3VtZUZyZWVMaXN0KToKKwogMjAxOS0wNS0wMyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBw bGUuY29tPgogCiAgICAgICAgIFtKU0NdIEdlbmVyYXRvciBDb2RlQmxvY2sgZ2VuZXJhdGlvbiBz aG91bGQgYmUgaWRlbXBvdGVudApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdCeXRlQ29kZVBhcnNlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5 dGVDb2RlUGFyc2VyLmNwcAppbmRleCAwNmZiMTgxZDNkNzE3NTU0MjJkZWI1NWQwZTY3Mzg0ZWM0 MzA3MzU5Li45ZjA0Mjc1ZDg4ZjdlMzg5NTNhMGEzMTRjZWQ2NjA3ZDA1NTMwYTZiIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcApAQCAtMTY0 Niw3ICsxNjQ2LDkgQEAgdm9pZCBCeXRlQ29kZVBhcnNlcjo6aW5saW5lQ2FsbChOb2RlKiBjYWxs VGFyZ2V0Tm9kZSwgVmlydHVhbFJlZ2lzdGVyIHJlc3VsdCwgQ2EKICAgICAgICAgLy8gY2FsbGVl IG1ha2UgaXQgc28gdGhhdCBpZiB3ZSBleGl0IGF0IDxIRVJFPiwgd2UgY2FuIHJlY292ZXIgbG9j OSBhbmQgbG9jMTAuCiAgICAgICAgIGZvciAoaW50IGluZGV4ID0gMDsgaW5kZXggPCBhcmd1bWVu dENvdW50SW5jbHVkaW5nVGhpczsgKytpbmRleCkgewogICAgICAgICAgICAgVmlydHVhbFJlZ2lz dGVyIGFyZ3VtZW50VG9HZXQgPSBjYWxsZXJTdGFja1RvcC0+cmVtYXBPcGVyYW5kKHZpcnR1YWxS ZWdpc3RlckZvckFyZ3VtZW50KGluZGV4LCByZWdpc3Rlck9mZnNldCkpOwotICAgICAgICAgICAg YWRkVG9HcmFwaChNb3ZIaW50LCBPcEluZm8oYXJndW1lbnRUb0dldC5vZmZzZXQoKSksIGdldERp cmVjdChhcmd1bWVudFRvR2V0KSk7CisgICAgICAgICAgICBOb2RlKiB2YWx1ZSA9IGdldERpcmVj dChhcmd1bWVudFRvR2V0KTsKKyAgICAgICAgICAgIGFkZFRvR3JhcGgoTW92SGludCwgT3BJbmZv KGFyZ3VtZW50VG9HZXQub2Zmc2V0KCkpLCB2YWx1ZSk7CisgICAgICAgICAgICBtX3NldExvY2Fs UXVldWUuYXBwZW5kKERlbGF5ZWRTZXRMb2NhbCB7IGN1cnJlbnRDb2RlT3JpZ2luKCksIGFyZ3Vt ZW50VG9HZXQsIHZhbHVlLCBJbW1lZGlhdGVOYWtlZFNldCB9KTsKICAgICAgICAgfQogICAgICAg ICBicmVhazsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9N YXJrZWRCbG9jay5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRCbG9jay5j cHAKaW5kZXggYjFhMTBhMWU3OTNlMTgxM2Q0MGFmMWExMGM1ZTA1NzI0M2ZlMTJmYy4uNDk1NDM0 ODczOGE3ODlkMjM3YmU3MTgyOTM0MDc4YzE3NTE4OTA1MyAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkQmxvY2suY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9oZWFwL01hcmtlZEJsb2NrLmNwcApAQCAtMzgsNiArMzgsOSBAQAogI2luY2x1ZGUgPHd0 Zi9Db21tYVByaW50ZXIuaD4KIAogbmFtZXNwYWNlIEpTQyB7CituYW1lc3BhY2UgTWFya2VkQmxv Y2tJbnRlcm5hbCB7CitzdGF0aWMgY29uc3RleHByIGJvb2wgdmVyYm9zZSA9IGZhbHNlOworfQog CiBjb25zdCBzaXplX3QgTWFya2VkQmxvY2s6OmJsb2NrU2l6ZTsKIApAQCAtODcsNyArOTAsNyBA QCBNYXJrZWRCbG9jazo6SGFuZGxlOjp+SGFuZGxlKCkKIE1hcmtlZEJsb2NrOjpNYXJrZWRCbG9j ayhWTSYgdm0sIEhhbmRsZSYgaGFuZGxlKQogewogICAgIG5ldyAoJmZvb3RlcigpKSBGb290ZXIo dm0sIGhhbmRsZSk7Ci0gICAgaWYgKGZhbHNlKQorICAgIGlmIChNYXJrZWRCbG9ja0ludGVybmFs Ojp2ZXJib3NlKQogICAgICAgICBkYXRhTG9nKFJhd1BvaW50ZXIodGhpcyksICI6IEFsbG9jYXRl ZC5cbiIpOwogfQogCkBAIC0xMjQsMTIgKzEyNywxMiBAQCB2b2lkIE1hcmtlZEJsb2NrOjpIYW5k bGU6OnN0b3BBbGxvY2F0aW5nKGNvbnN0IEZyZWVMaXN0JiBmcmVlTGlzdCkKIHsKICAgICBhdXRv IGxvY2tlciA9IGhvbGRMb2NrKGJsb2NrRm9vdGVyKCkubV9sb2NrKTsKICAgICAKLSAgICBpZiAo ZmFsc2UpCisgICAgaWYgKE1hcmtlZEJsb2NrSW50ZXJuYWw6OnZlcmJvc2UpCiAgICAgICAgIGRh dGFMb2coUmF3UG9pbnRlcih0aGlzKSwgIjogTWFya2VkQmxvY2s6OkhhbmRsZTo6c3RvcEFsbG9j YXRpbmchXG4iKTsKICAgICBBU1NFUlQoIWRpcmVjdG9yeSgpLT5pc0FsbG9jYXRlZChOb0xvY2tp bmdOZWNlc3NhcnksIHRoaXMpKTsKIAogICAgIGlmICghaXNGcmVlTGlzdGVkKCkpIHsKLSAgICAg ICAgaWYgKGZhbHNlKQorICAgICAgICBpZiAoTWFya2VkQmxvY2tJbnRlcm5hbDo6dmVyYm9zZSkK ICAgICAgICAgICAgIGRhdGFMb2coIlRoZXJlIGFpbid0IG5vIG5ld2x5IGFsbG9jYXRlZC5cbiIp OwogICAgICAgICAvLyBUaGlzIG1lYW5zIHRoYXQgd2UgZWl0aGVyIGRpZG4ndCB1c2UgdGhpcyBi bG9jayBhdCBhbGwgZm9yIGFsbG9jYXRpb24gc2luY2UgbGFzdCBHQywKICAgICAgICAgLy8gb3Ig c29tZW9uZSBoYWQgYWxyZWFkeSBkb25lIHN0b3BBbGxvY2F0aW5nKCkgYmVmb3JlLgpAQCAtMTM3 LDcgKzE0MCw3IEBAIHZvaWQgTWFya2VkQmxvY2s6OkhhbmRsZTo6c3RvcEFsbG9jYXRpbmcoY29u c3QgRnJlZUxpc3QmIGZyZWVMaXN0KQogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIAotICAg IGlmIChmYWxzZSkKKyAgICBpZiAoTWFya2VkQmxvY2tJbnRlcm5hbDo6dmVyYm9zZSkKICAgICAg ICAgZGF0YUxvZygiRnJlZSBsaXN0OiAiLCBmcmVlTGlzdCwgIlxuIik7CiAgICAgCiAgICAgLy8g Um9sbCBiYWNrIHRvIGEgY29oZXJlbnQgc3RhdGUgZm9yIEhlYXAgaW50cm9zcGVjdGlvbi4gQ2Vs bHMgbmV3bHkKQEAgLTE1NSw3ICsxNTgsNyBAQCB2b2lkIE1hcmtlZEJsb2NrOjpIYW5kbGU6OnN0 b3BBbGxvY2F0aW5nKGNvbnN0IEZyZWVMaXN0JiBmcmVlTGlzdCkKIAogICAgIGZyZWVMaXN0LmZv ckVhY2goCiAgICAgICAgIFsmXSAoSGVhcENlbGwqIGNlbGwpIHsKLSAgICAgICAgICAgIGlmIChm YWxzZSkKKyAgICAgICAgICAgIGlmIChNYXJrZWRCbG9ja0ludGVybmFsOjp2ZXJib3NlKQogICAg ICAgICAgICAgICAgIGRhdGFMb2coIkZyZWUgY2VsbDogIiwgUmF3UG9pbnRlcihjZWxsKSwgIlxu Iik7CiAgICAgICAgICAgICBpZiAobV9hdHRyaWJ1dGVzLmRlc3RydWN0aW9uID09IE5lZWRzRGVz dHJ1Y3Rpb24pCiAgICAgICAgICAgICAgICAgY2VsbC0+emFwKCk7CkBAIC0xODMsMTMgKzE4Niwx MyBAQCB2b2lkIE1hcmtlZEJsb2NrOjpIYW5kbGU6OnJlc3VtZUFsbG9jYXRpbmcoRnJlZUxpc3Qm IGZyZWVMaXN0KQogICAgIHsKICAgICAgICAgYXV0byBsb2NrZXIgPSBob2xkTG9jayhibG9ja0Zv b3RlcigpLm1fbG9jayk7CiAgICAgICAgIAotICAgICAgICBpZiAoZmFsc2UpCisgICAgICAgIGlm IChNYXJrZWRCbG9ja0ludGVybmFsOjp2ZXJib3NlKQogICAgICAgICAgICAgZGF0YUxvZyhSYXdQ b2ludGVyKHRoaXMpLCAiOiBNYXJrZWRCbG9jazo6SGFuZGxlOjpyZXN1bWVBbGxvY2F0aW5nIVxu Iik7CiAgICAgICAgIEFTU0VSVCghZGlyZWN0b3J5KCktPmlzQWxsb2NhdGVkKE5vTG9ja2luZ05l Y2Vzc2FyeSwgdGhpcykpOwogICAgICAgICBBU1NFUlQoIWlzRnJlZUxpc3RlZCgpKTsKICAgICAg ICAgCiAgICAgICAgIGlmICghYmxvY2soKS5oYXNBbnlOZXdseUFsbG9jYXRlZCgpKSB7Ci0gICAg ICAgICAgICBpZiAoZmFsc2UpCisgICAgICAgICAgICBpZiAoTWFya2VkQmxvY2tJbnRlcm5hbDo6 dmVyYm9zZSkKICAgICAgICAgICAgICAgICBkYXRhTG9nKCJUaGVyZSBhaW4ndCBubyBuZXdseSBh bGxvY2F0ZWQuXG4iKTsKICAgICAgICAgICAgIC8vIFRoaXMgbWVhbnMgd2UgaGFkIGFscmVhZHkg ZXhoYXVzdGVkIHRoZSBibG9jayB3aGVuIHdlIHN0b3BwZWQgYWxsb2NhdGlvbi4KICAgICAgICAg ICAgIGZyZWVMaXN0LmNsZWFyKCk7CkBAIC0yMjMsNyArMjI2LDcgQEAgdm9pZCBNYXJrZWRCbG9j azo6YWJvdXRUb01hcmtTbG93KEhlYXBWZXJzaW9uIG1hcmtpbmdWZXJzaW9uKQogCiAgICAgaWYg KGhhbmRsZSgpLmRpcmVjdG9yeSgpLT5pc0FsbG9jYXRlZChob2xkTG9jayhkaXJlY3RvcnktPmJp dHZlY3RvckxvY2soKSksICZoYW5kbGUoKSkKICAgICAgICAgfHwgIW1hcmtzQ29udmV5TGl2ZW5l c3NEdXJpbmdNYXJraW5nKG1hcmtpbmdWZXJzaW9uKSkgewotICAgICAgICBpZiAoZmFsc2UpCisg ICAgICAgIGlmIChNYXJrZWRCbG9ja0ludGVybmFsOjp2ZXJib3NlKQogICAgICAgICAgICAgZGF0 YUxvZyhSYXdQb2ludGVyKHRoaXMpLCAiOiBDbGVhcmluZyBtYXJrcyB3aXRob3V0IGRvaW5nIGFu eXRoaW5nIGVsc2UuXG4iKTsKICAgICAgICAgLy8gV2UgYWxyZWFkeSBrbm93IHRoYXQgdGhlIGJs b2NrIGlzIGZ1bGwgYW5kIGlzIGFscmVhZHkgcmVjb2duaXplZCBhcyBzdWNoLCBvciB0aGF0IHRo ZQogICAgICAgICAvLyBibG9jayBkaWQgbm90IHN1cnZpdmUgdGhlIHByZXZpb3VzIEdDLiBTbywg d2UgY2FuIGNsZWFyIG1hcmsgYml0cyB0aGUgb2xkIGZhc2hpb25lZApAQCAtMjMzLDcgKzIzNiw3 IEBAIHZvaWQgTWFya2VkQmxvY2s6OmFib3V0VG9NYXJrU2xvdyhIZWFwVmVyc2lvbiBtYXJraW5n VmVyc2lvbikKICAgICAgICAgLy8gd2UgY3JlYXRlZCBhIG5ld2x5QWxsb2NhdGVkLgogICAgICAg ICBmb290ZXIoKS5tX21hcmtzLmNsZWFyQWxsKCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgaWYg KGZhbHNlKQorICAgICAgICBpZiAoTWFya2VkQmxvY2tJbnRlcm5hbDo6dmVyYm9zZSkKICAgICAg ICAgICAgIGRhdGFMb2coUmF3UG9pbnRlcih0aGlzKSwgIjogRG9pbmcgdGhpbmdzLlxuIik7CiAg ICAgICAgIEhlYXBWZXJzaW9uIG5ld2x5QWxsb2NhdGVkVmVyc2lvbiA9IHNwYWNlKCktPm5ld2x5 QWxsb2NhdGVkVmVyc2lvbigpOwogICAgICAgICBpZiAoZm9vdGVyKCkubV9uZXdseUFsbG9jYXRl ZFZlcnNpb24gPT0gbmV3bHlBbGxvY2F0ZWRWZXJzaW9uKSB7CkBAIC0zMDMsNyArMzA2LDcgQEAg Ym9vbCBNYXJrZWRCbG9jazo6aXNNYXJrZWQoY29uc3Qgdm9pZCogcCkKIHZvaWQgTWFya2VkQmxv Y2s6OkhhbmRsZTo6ZGlkQ29uc3VtZUZyZWVMaXN0KCkKIHsKICAgICBhdXRvIGxvY2tlciA9IGhv bGRMb2NrKGJsb2NrRm9vdGVyKCkubV9sb2NrKTsKLSAgICBpZiAoZmFsc2UpCisgICAgaWYgKE1h cmtlZEJsb2NrSW50ZXJuYWw6OnZlcmJvc2UpCiAgICAgICAgIGRhdGFMb2coUmF3UG9pbnRlcih0 aGlzKSwgIjogTWFya2VkQmxvY2s6OkhhbmRsZTo6ZGlkQ29uc3VtZUZyZWVMaXN0IVxuIik7CiAg ICAgQVNTRVJUKGlzRnJlZUxpc3RlZCgpKTsKICAgICBtX2lzRnJlZUxpc3RlZCA9IGZhbHNlOwpk aWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwppbmRleCAy NGM5ZGM0MmM2Y2E3ZWJmY2M0OWU2YjQxZDg5NDU4Zjc2MjI5YWFhLi43MmIyZGNhOTczMDExNjdk N2UyNTBlYzg4MThjM2M4ZGYxZWIwNzU4IDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZwor KysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA1LTAzICBZdXN1 a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CisKKyAgICAgICAgW0pTQ10gTmVlZCB0byBl bWl0IFNldExvY2FsIGlmIHdlIGVtaXQgTW92SGludCBpbiBERkdCeXRlQ29kZVBhcnNlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3NTg0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdHJlc3MvYWRo b2Mtc2V0dGVyLWZyYW1lLXNob3VsZC1lbWl0LXNldGxvY2FsLWFnYWluLmpzOiBBZGRlZC4KKyAg ICAgICAgKFgpOgorICAgICAgICAoZm9vKToKKwogMjAxOS0wNS0wMyAgWXVzdWtlIFN1enVraSAg PHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIEdlbmVyYXRvciBDb2RlQmxvY2sg Z2VuZXJhdGlvbiBzaG91bGQgYmUgaWRlbXBvdGVudApkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJl c3MvYWRob2Mtc2V0dGVyLWZyYW1lLXNob3VsZC1lbWl0LXNldGxvY2FsLWFnYWluLmpzIGIvSlNU ZXN0cy9zdHJlc3MvYWRob2Mtc2V0dGVyLWZyYW1lLXNob3VsZC1lbWl0LXNldGxvY2FsLWFnYWlu LmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjk4OThlNzgwYTk3MTA4ZjgxZjhmMzczNDZjYzZkNTAxZjliMTYxNjgK LS0tIC9kZXYvbnVsbAorKysgYi9KU1Rlc3RzL3N0cmVzcy9hZGhvYy1zZXR0ZXItZnJhbWUtc2hv dWxkLWVtaXQtc2V0bG9jYWwtYWdhaW4uanMKQEAgLTAsMCArMSwxNyBAQAorZnVuY3Rpb24gWCgp e30KKworWC5wcm90b3R5cGUuX19kZWZpbmVTZXR0ZXJfXygnZicsIGZ1bmN0aW9uKiAoKSB7Cisg ICAgYXJndW1lbnRzOworfSk7CisKK2Z1bmN0aW9uIGZvbyhvKSB7CisgICAgaSsnJzsKKyAgICBm b3IgKHZhciBpID0gMDsgaSA8IDEwMDA7ICsraSkgeworICAgICAgICBvLmYgPSAwOworICAgIH0K K30KK25vSW5saW5lKGZvbyk7CisKK2ZvciAobGV0IGkgPSAwOyBpIDwgMTAwMDsgKytpKSB7Cisg ICAgZm9vKG5ldyBYKCkpOworfQo= 369014 2019-05-03 16:21:48 -0700 2019-05-03 16:46:37 -0700 Patch bug-197584-20190503162147.patch text/plain 7633 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0OTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 ZGFhNjU0MWEzZTNkNTFmYjMyYjQ5ZTg3MWQ4OWEzNTI3ZGI3OTc4Li4yOWFkNTFlMzU0ZDdiY2E0 YTRkNWNlZWIzNzUyZDhkYTNjZjU0MjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MyBAQAorMjAxOS0wNS0wMyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIE5lZWQgdG8gZW1pdCBTZXRMb2NhbCBpZiB3ZSBlbWl0IE1vdkhp bnQgaW4gREZHQnl0ZUNvZGVQYXJzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NzU4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEluIHIyNDQ4NjQsIHdlIGVtaXQgTW92SGludCBmb3IgYWRob2NseSBj cmVhdGVkIEdldHRlckNhbGwvU2V0dGVyQ2FsbCBmcmFtZSBsb2NhbHMgaW4gdGhlIGNhbGxlZSBz aWRlIHRvIG1ha2UgT1NSIGF2YWlsYWJpbGl0eSBhbmFseXNpcydzIHBydW5pbmcgY29ycmVjdC4K KyAgICAgICAgSG93ZXZlciwgd2UganVzdCBlbWl0IE1vdkhpbnQsIGFuZCB3ZSBkbyBub3QgZW1p dCBTZXRMb2NhbCBzaW5jZSB3ZSBlbnN1cmVkIHRoYXQgdGhlc2UgbG9jYWxzIGFyZSBhbHJlYWR5 IGZsdXNoZWQgaW4gdGhlIHNhbWUgcGxhY2UgYmVmb3JlLiBIb3dldmVyLCBNb3ZIaW50CisgICAg ICAgIGFuZCBTZXRMb2NhbCBhcmUgbmVlZGVkIHRvIGJlIGEgcGFpciBpbiBERkdCeXRlQ29kZVBh cnNlciBiZWNhdXNlIHdlIHJlbHkgb24gdGhpcyBhc3N1bXB0aW9uIGluIFNTQSBjb252ZXJzaW9u IHBoYXNlLiBTU0EgY29udmVyc2lvbiBwaGFzZSBhbHdheXMgZW1pdCBLaWxsU3RhY2sKKyAgICAg ICAganVzdCBiZWZvcmUgTW92SGludCdzIHRhcmdldCBsb2NhdGlvbiBldmVuIGlmIHRoZSBNb3ZI aW50J3MgdGFyZ2V0IGlzIHRoZSBzYW1lIHRvIHRoZSBwcmV2aW91c2x5IGVtaXR0ZWQgTW92SGlu dCBhbmQgU2V0TG9jYWwuCisgICAgICAgIFRoaXMgcGF0Y2ggZW1pdHMgU2V0TG9jYWwgdG9vIHdo ZW4gZW1pdHRpbmcgTW92SGludCBmb3IgR2V0dGVyQ2FsbC9TZXR0ZXJDYWxsIGZyYW1lIGxvY2Fs cy4KKworICAgICAgICBUaGUgZXhhbXBsZSBpcyBsaWtlIHRoaXMuCisKKyAgICAgICAgICAgIGE6 ICBTb21lVmFsdWVOb2RlCisgICAgICAgICAgICAgOiAgTW92SGludChAYSwgbG9jMTApCisgICAg ICAgICAgICBiOiAgU2V0TG9jYWwoQGEsIGxvYzEwKQorICAgICAgICAgICAgICAgIC4uLgorICAg ICAgICAgICAgYzogIE1vdkhpbnQoQGEsIGxvYzEwKQorCisgICAgICAgIFRoZW4sIHRoaXMgd2ls bCBiZSBjb252ZXJ0ZWQgdG8gdGhlIHN0eWxlIGluIFNTQSBjb252ZXJzaW9uLgorCisgICAgICAg ICAgICBhOiAgU29tZVZhbHVlTm9kZQorICAgICAgICAgICAgIDogIEtpbGxTdGFjayhsb2MxMCkK KyAgICAgICAgICAgIGI6ICBQdXRTdGFjayhAYSwgbG9jMTApCisgICAgICAgICAgICAgICAgLi4u CisgICAgICAgICAgICBjOiAgS2lsbFN0YWNrKGxvYzEwKQorCisgICAgICAgIFRoZW4sIEBiIHdp bGwgYmUgcmVtb3ZlZCBsYXRlciBzaW5jZSBAYyBraWxscyBpdC4KKworICAgICAgICAqIGRmZy9E RkdCeXRlQ29kZVBhcnNlci5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6 OmlubGluZUNhbGwpOgorICAgICAgICAqIGhlYXAvTWFya2VkQmxvY2suY3BwOgorICAgICAgICAo SlNDOjpNYXJrZWRCbG9jazo6TWFya2VkQmxvY2spOgorICAgICAgICAoSlNDOjpNYXJrZWRCbG9j azo6SGFuZGxlOjpzdG9wQWxsb2NhdGluZyk6CisgICAgICAgIChKU0M6Ok1hcmtlZEJsb2NrOjpI YW5kbGU6OnJlc3VtZUFsbG9jYXRpbmcpOgorICAgICAgICAoSlNDOjpNYXJrZWRCbG9jazo6YWJv dXRUb01hcmtTbG93KToKKyAgICAgICAgKEpTQzo6TWFya2VkQmxvY2s6OkhhbmRsZTo6ZGlkQ29u c3VtZUZyZWVMaXN0KTogSSBjaGFuZ2VkIGBpZiAoZmFsc2UpYCB0byBgaWYgKE1hcmtlZEJsb2Nr SW50ZXJuYWw6OnZlcmJvc2UpYCB0byBzd2l0Y2ggdGhlbSBlYXNpbHkuIEl0IHdhcyBoZWxwZnVs IHRvIGRlYnVnLgorCiAyMDE5LTA1LTAzICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5j b20+CiAKICAgICAgICAgW0pTQ10gR2VuZXJhdG9yIENvZGVCbG9jayBnZW5lcmF0aW9uIHNob3Vs ZCBiZSBpZGVtcG90ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R0J5dGVDb2RlUGFyc2VyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNv ZGVQYXJzZXIuY3BwCmluZGV4IDA2ZmIxODFkM2Q3MTc1NTQyMmRlYjU1ZDBlNjczODRlYzQzMDcz NTkuLjlmMDQyNzVkODhmN2UzODk1M2EwYTMxNGNlZDY2MDdkMDU1MzBhNmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCkBAIC0xNjQ2LDcg KzE2NDYsOSBAQCB2b2lkIEJ5dGVDb2RlUGFyc2VyOjppbmxpbmVDYWxsKE5vZGUqIGNhbGxUYXJn ZXROb2RlLCBWaXJ0dWFsUmVnaXN0ZXIgcmVzdWx0LCBDYQogICAgICAgICAvLyBjYWxsZWUgbWFr ZSBpdCBzbyB0aGF0IGlmIHdlIGV4aXQgYXQgPEhFUkU+LCB3ZSBjYW4gcmVjb3ZlciBsb2M5IGFu ZCBsb2MxMC4KICAgICAgICAgZm9yIChpbnQgaW5kZXggPSAwOyBpbmRleCA8IGFyZ3VtZW50Q291 bnRJbmNsdWRpbmdUaGlzOyArK2luZGV4KSB7CiAgICAgICAgICAgICBWaXJ0dWFsUmVnaXN0ZXIg YXJndW1lbnRUb0dldCA9IGNhbGxlclN0YWNrVG9wLT5yZW1hcE9wZXJhbmQodmlydHVhbFJlZ2lz dGVyRm9yQXJndW1lbnQoaW5kZXgsIHJlZ2lzdGVyT2Zmc2V0KSk7Ci0gICAgICAgICAgICBhZGRU b0dyYXBoKE1vdkhpbnQsIE9wSW5mbyhhcmd1bWVudFRvR2V0Lm9mZnNldCgpKSwgZ2V0RGlyZWN0 KGFyZ3VtZW50VG9HZXQpKTsKKyAgICAgICAgICAgIE5vZGUqIHZhbHVlID0gZ2V0RGlyZWN0KGFy Z3VtZW50VG9HZXQpOworICAgICAgICAgICAgYWRkVG9HcmFwaChNb3ZIaW50LCBPcEluZm8oYXJn dW1lbnRUb0dldC5vZmZzZXQoKSksIHZhbHVlKTsKKyAgICAgICAgICAgIG1fc2V0TG9jYWxRdWV1 ZS5hcHBlbmQoRGVsYXllZFNldExvY2FsIHsgY3VycmVudENvZGVPcmlnaW4oKSwgYXJndW1lbnRU b0dldCwgdmFsdWUsIEltbWVkaWF0ZU5ha2VkU2V0IH0pOwogICAgICAgICB9CiAgICAgICAgIGJy ZWFrOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtl ZEJsb2NrLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEJsb2NrLmNwcApp bmRleCBiMWExMGExZTc5M2UxODEzZDQwYWYxYTEwYzVlMDU3MjQzZmUxMmZjLi40OTU0MzQ4NzM4 YTc4OWQyMzdiZTcxODI5MzQwNzhjMTc1MTg5MDUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaGVhcC9NYXJrZWRCbG9jay5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2hlYXAvTWFya2VkQmxvY2suY3BwCkBAIC0zOCw2ICszOCw5IEBACiAjaW5jbHVkZSA8d3RmL0Nv bW1hUHJpbnRlci5oPgogCiBuYW1lc3BhY2UgSlNDIHsKK25hbWVzcGFjZSBNYXJrZWRCbG9ja0lu dGVybmFsIHsKK3N0YXRpYyBjb25zdGV4cHIgYm9vbCB2ZXJib3NlID0gZmFsc2U7Cit9CiAKIGNv bnN0IHNpemVfdCBNYXJrZWRCbG9jazo6YmxvY2tTaXplOwogCkBAIC04Nyw3ICs5MCw3IEBAIE1h cmtlZEJsb2NrOjpIYW5kbGU6On5IYW5kbGUoKQogTWFya2VkQmxvY2s6Ok1hcmtlZEJsb2NrKFZN JiB2bSwgSGFuZGxlJiBoYW5kbGUpCiB7CiAgICAgbmV3ICgmZm9vdGVyKCkpIEZvb3Rlcih2bSwg aGFuZGxlKTsKLSAgICBpZiAoZmFsc2UpCisgICAgaWYgKE1hcmtlZEJsb2NrSW50ZXJuYWw6OnZl cmJvc2UpCiAgICAgICAgIGRhdGFMb2coUmF3UG9pbnRlcih0aGlzKSwgIjogQWxsb2NhdGVkLlxu Iik7CiB9CiAKQEAgLTEyNCwxMiArMTI3LDEyIEBAIHZvaWQgTWFya2VkQmxvY2s6OkhhbmRsZTo6 c3RvcEFsbG9jYXRpbmcoY29uc3QgRnJlZUxpc3QmIGZyZWVMaXN0KQogewogICAgIGF1dG8gbG9j a2VyID0gaG9sZExvY2soYmxvY2tGb290ZXIoKS5tX2xvY2spOwogICAgIAotICAgIGlmIChmYWxz ZSkKKyAgICBpZiAoTWFya2VkQmxvY2tJbnRlcm5hbDo6dmVyYm9zZSkKICAgICAgICAgZGF0YUxv ZyhSYXdQb2ludGVyKHRoaXMpLCAiOiBNYXJrZWRCbG9jazo6SGFuZGxlOjpzdG9wQWxsb2NhdGlu ZyFcbiIpOwogICAgIEFTU0VSVCghZGlyZWN0b3J5KCktPmlzQWxsb2NhdGVkKE5vTG9ja2luZ05l Y2Vzc2FyeSwgdGhpcykpOwogCiAgICAgaWYgKCFpc0ZyZWVMaXN0ZWQoKSkgewotICAgICAgICBp ZiAoZmFsc2UpCisgICAgICAgIGlmIChNYXJrZWRCbG9ja0ludGVybmFsOjp2ZXJib3NlKQogICAg ICAgICAgICAgZGF0YUxvZygiVGhlcmUgYWluJ3Qgbm8gbmV3bHkgYWxsb2NhdGVkLlxuIik7CiAg ICAgICAgIC8vIFRoaXMgbWVhbnMgdGhhdCB3ZSBlaXRoZXIgZGlkbid0IHVzZSB0aGlzIGJsb2Nr IGF0IGFsbCBmb3IgYWxsb2NhdGlvbiBzaW5jZSBsYXN0IEdDLAogICAgICAgICAvLyBvciBzb21l b25lIGhhZCBhbHJlYWR5IGRvbmUgc3RvcEFsbG9jYXRpbmcoKSBiZWZvcmUuCkBAIC0xMzcsNyAr MTQwLDcgQEAgdm9pZCBNYXJrZWRCbG9jazo6SGFuZGxlOjpzdG9wQWxsb2NhdGluZyhjb25zdCBG cmVlTGlzdCYgZnJlZUxpc3QpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgCi0gICAgaWYg KGZhbHNlKQorICAgIGlmIChNYXJrZWRCbG9ja0ludGVybmFsOjp2ZXJib3NlKQogICAgICAgICBk YXRhTG9nKCJGcmVlIGxpc3Q6ICIsIGZyZWVMaXN0LCAiXG4iKTsKICAgICAKICAgICAvLyBSb2xs IGJhY2sgdG8gYSBjb2hlcmVudCBzdGF0ZSBmb3IgSGVhcCBpbnRyb3NwZWN0aW9uLiBDZWxscyBu ZXdseQpAQCAtMTU1LDcgKzE1OCw3IEBAIHZvaWQgTWFya2VkQmxvY2s6OkhhbmRsZTo6c3RvcEFs bG9jYXRpbmcoY29uc3QgRnJlZUxpc3QmIGZyZWVMaXN0KQogCiAgICAgZnJlZUxpc3QuZm9yRWFj aCgKICAgICAgICAgWyZdIChIZWFwQ2VsbCogY2VsbCkgewotICAgICAgICAgICAgaWYgKGZhbHNl KQorICAgICAgICAgICAgaWYgKE1hcmtlZEJsb2NrSW50ZXJuYWw6OnZlcmJvc2UpCiAgICAgICAg ICAgICAgICAgZGF0YUxvZygiRnJlZSBjZWxsOiAiLCBSYXdQb2ludGVyKGNlbGwpLCAiXG4iKTsK ICAgICAgICAgICAgIGlmIChtX2F0dHJpYnV0ZXMuZGVzdHJ1Y3Rpb24gPT0gTmVlZHNEZXN0cnVj dGlvbikKICAgICAgICAgICAgICAgICBjZWxsLT56YXAoKTsKQEAgLTE4MywxMyArMTg2LDEzIEBA IHZvaWQgTWFya2VkQmxvY2s6OkhhbmRsZTo6cmVzdW1lQWxsb2NhdGluZyhGcmVlTGlzdCYgZnJl ZUxpc3QpCiAgICAgewogICAgICAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKGJsb2NrRm9vdGVy KCkubV9sb2NrKTsKICAgICAgICAgCi0gICAgICAgIGlmIChmYWxzZSkKKyAgICAgICAgaWYgKE1h cmtlZEJsb2NrSW50ZXJuYWw6OnZlcmJvc2UpCiAgICAgICAgICAgICBkYXRhTG9nKFJhd1BvaW50 ZXIodGhpcyksICI6IE1hcmtlZEJsb2NrOjpIYW5kbGU6OnJlc3VtZUFsbG9jYXRpbmchXG4iKTsK ICAgICAgICAgQVNTRVJUKCFkaXJlY3RvcnkoKS0+aXNBbGxvY2F0ZWQoTm9Mb2NraW5nTmVjZXNz YXJ5LCB0aGlzKSk7CiAgICAgICAgIEFTU0VSVCghaXNGcmVlTGlzdGVkKCkpOwogICAgICAgICAK ICAgICAgICAgaWYgKCFibG9jaygpLmhhc0FueU5ld2x5QWxsb2NhdGVkKCkpIHsKLSAgICAgICAg ICAgIGlmIChmYWxzZSkKKyAgICAgICAgICAgIGlmIChNYXJrZWRCbG9ja0ludGVybmFsOjp2ZXJi b3NlKQogICAgICAgICAgICAgICAgIGRhdGFMb2coIlRoZXJlIGFpbid0IG5vIG5ld2x5IGFsbG9j YXRlZC5cbiIpOwogICAgICAgICAgICAgLy8gVGhpcyBtZWFucyB3ZSBoYWQgYWxyZWFkeSBleGhh dXN0ZWQgdGhlIGJsb2NrIHdoZW4gd2Ugc3RvcHBlZCBhbGxvY2F0aW9uLgogICAgICAgICAgICAg ZnJlZUxpc3QuY2xlYXIoKTsKQEAgLTIyMyw3ICsyMjYsNyBAQCB2b2lkIE1hcmtlZEJsb2NrOjph Ym91dFRvTWFya1Nsb3coSGVhcFZlcnNpb24gbWFya2luZ1ZlcnNpb24pCiAKICAgICBpZiAoaGFu ZGxlKCkuZGlyZWN0b3J5KCktPmlzQWxsb2NhdGVkKGhvbGRMb2NrKGRpcmVjdG9yeS0+Yml0dmVj dG9yTG9jaygpKSwgJmhhbmRsZSgpKQogICAgICAgICB8fCAhbWFya3NDb252ZXlMaXZlbmVzc0R1 cmluZ01hcmtpbmcobWFya2luZ1ZlcnNpb24pKSB7Ci0gICAgICAgIGlmIChmYWxzZSkKKyAgICAg ICAgaWYgKE1hcmtlZEJsb2NrSW50ZXJuYWw6OnZlcmJvc2UpCiAgICAgICAgICAgICBkYXRhTG9n KFJhd1BvaW50ZXIodGhpcyksICI6IENsZWFyaW5nIG1hcmtzIHdpdGhvdXQgZG9pbmcgYW55dGhp bmcgZWxzZS5cbiIpOwogICAgICAgICAvLyBXZSBhbHJlYWR5IGtub3cgdGhhdCB0aGUgYmxvY2sg aXMgZnVsbCBhbmQgaXMgYWxyZWFkeSByZWNvZ25pemVkIGFzIHN1Y2gsIG9yIHRoYXQgdGhlCiAg ICAgICAgIC8vIGJsb2NrIGRpZCBub3Qgc3Vydml2ZSB0aGUgcHJldmlvdXMgR0MuIFNvLCB3ZSBj YW4gY2xlYXIgbWFyayBiaXRzIHRoZSBvbGQgZmFzaGlvbmVkCkBAIC0yMzMsNyArMjM2LDcgQEAg dm9pZCBNYXJrZWRCbG9jazo6YWJvdXRUb01hcmtTbG93KEhlYXBWZXJzaW9uIG1hcmtpbmdWZXJz aW9uKQogICAgICAgICAvLyB3ZSBjcmVhdGVkIGEgbmV3bHlBbGxvY2F0ZWQuCiAgICAgICAgIGZv b3RlcigpLm1fbWFya3MuY2xlYXJBbGwoKTsKICAgICB9IGVsc2UgewotICAgICAgICBpZiAoZmFs c2UpCisgICAgICAgIGlmIChNYXJrZWRCbG9ja0ludGVybmFsOjp2ZXJib3NlKQogICAgICAgICAg ICAgZGF0YUxvZyhSYXdQb2ludGVyKHRoaXMpLCAiOiBEb2luZyB0aGluZ3MuXG4iKTsKICAgICAg ICAgSGVhcFZlcnNpb24gbmV3bHlBbGxvY2F0ZWRWZXJzaW9uID0gc3BhY2UoKS0+bmV3bHlBbGxv Y2F0ZWRWZXJzaW9uKCk7CiAgICAgICAgIGlmIChmb290ZXIoKS5tX25ld2x5QWxsb2NhdGVkVmVy c2lvbiA9PSBuZXdseUFsbG9jYXRlZFZlcnNpb24pIHsKQEAgLTMwMyw3ICszMDYsNyBAQCBib29s IE1hcmtlZEJsb2NrOjppc01hcmtlZChjb25zdCB2b2lkKiBwKQogdm9pZCBNYXJrZWRCbG9jazo6 SGFuZGxlOjpkaWRDb25zdW1lRnJlZUxpc3QoKQogewogICAgIGF1dG8gbG9ja2VyID0gaG9sZExv Y2soYmxvY2tGb290ZXIoKS5tX2xvY2spOwotICAgIGlmIChmYWxzZSkKKyAgICBpZiAoTWFya2Vk QmxvY2tJbnRlcm5hbDo6dmVyYm9zZSkKICAgICAgICAgZGF0YUxvZyhSYXdQb2ludGVyKHRoaXMp LCAiOiBNYXJrZWRCbG9jazo6SGFuZGxlOjpkaWRDb25zdW1lRnJlZUxpc3QhXG4iKTsKICAgICBB U1NFUlQoaXNGcmVlTGlzdGVkKCkpOwogICAgIG1faXNGcmVlTGlzdGVkID0gZmFsc2U7Cg==