206329 2020-01-15 17:42:40 -0800 Try to simplify the template deduction used by callOperation in DFGSpeculativeJIT 2020-01-17 09:47:54 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rmorisset rmorisset commit-queue ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1607273 0 rmorisset 2020-01-15 17:42:40 -0800 Might slightly help compile times and be more readable to boot. 1607277 1 387879 rmorisset 2020-01-15 17:46:22 -0800 Created attachment 387879 Patch 1607280 2 387879 keith_miller 2020-01-15 17:51:19 -0800 Comment on attachment 387879 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387879&action=review r=me with question. > Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h:-954 > - callOperation(OperationType operation, NoResultTag, Args... args) Does anyone use NoResultTag now? If not, we should just get rid of it. 1607281 3 rmorisset 2020-01-15 17:52:35 -0800 (In reply to Keith Miller from comment #2) > Comment on attachment 387879 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=387879&action=review > > r=me with question. > > > Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h:-954 > > - callOperation(OperationType operation, NoResultTag, Args... args) > > Does anyone use NoResultTag now? If not, we should just get rid of it. It is still used by various other functions. It is not clear whether it can also be removed from those. 1607730 4 387879 commit-queue 2020-01-16 16:06:40 -0800 Comment on attachment 387879 Patch Clearing flags on attachment: 387879 Committed r254717: <https://trac.webkit.org/changeset/254717> 1607731 5 commit-queue 2020-01-16 16:06:42 -0800 All reviewed patches have been landed. Closing bug. 1607733 6 webkit-bug-importer 2020-01-16 16:07:45 -0800 <rdar://problem/58662089> 1607890 7 saam 2020-01-16 23:34:48 -0800 Did it make compile times faster? 1608046 8 rmorisset 2020-01-17 09:47:54 -0800 (In reply to Saam Barati from comment #7) > Did it make compile times faster? I was hoping that it would, but it apparently did not (or at least not significantly): https://perf.safari.apple.com/v3/#/charts?since=1578678298555&paneList=((1117-4968-null-null-(5-2.5-500))-(1117-4990-null-null-(5-2.5-500))) 387879 2020-01-15 17:46:22 -0800 2020-01-16 16:06:40 -0800 Patch patch206329 text/plain 15660 rmorisset ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGY4ZDhhYWZkZjRmLi4xMTNmYzE4ZTI0MiAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjAtMDEtMTUgIFJvYmlu IE1vcmlzc2V0ICA8cm1vcmlzc2V0QGFwcGxlLmNvbT4KKworICAgICAgICBUcnkgdG8gc2ltcGxp ZnkgdGhlIHRlbXBsYXRlIGRlZHVjdGlvbiB1c2VkIGJ5IGNhbGxPcGVyYXRpb24gaW4gREZHU3Bl Y3VsYXRpdmVKSVQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwNjMyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoZSBjaGFuZ2UgaXMgdmVyeSBzaW1wbGU6IHN0b3AgdXNpbmcgTm9SZXN1bHRUYWcgaW4g Y2FsbE9wZXJhdGlvbiwgc2luY2UgaXQgaXMgcmVkdW5kYW50IHdpdGggIUZ1bmN0aW9uVHJhaXRz PE9wZXJhdGlvblR5cGU+OjpoYXNSZXN1bHQKKworICAgICAgICAqIGRmZy9ERkdTbG93UGF0aEdl bmVyYXRvci5oOgorICAgICAgICAoSlNDOjpERkc6OkNhbGxSZXN1bHRBbmRBcmd1bWVudHNTbG93 UGF0aEdlbmVyYXRvcjo6dW5wYWNrQW5kR2VuZXJhdGUpOgorICAgICAgICAqIGRmZy9ERkdTcGVj dWxhdGl2ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBp bGVQdXRBY2Nlc3NvckJ5SWQpOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpj b21waWxlUHV0R2V0dGVyU2V0dGVyQnlJZCk6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRp dmVKSVQ6OmNvbXBpbGVQdXREeW5hbWljVmFyKToKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxh dGl2ZUpJVDo6Y29tcGlsZVB1dEFjY2Vzc29yQnlWYWwpOgorICAgICAgICAoSlNDOjpERkc6OlNw ZWN1bGF0aXZlSklUOjpjb21waWxlRGVmaW5lRGF0YVByb3BlcnR5KToKKyAgICAgICAgKEpTQzo6 REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZURlZmluZUFjY2Vzc29yUHJvcGVydHkpOgorICAg ICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlUHV0QnlJZFdpdGhUaGlzKToK KyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuaDoKKyAgICAgICAgKEpTQzo6REZHOjpT cGVjdWxhdGl2ZUpJVDo6Y2FsbE9wZXJhdGlvbik6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0 aXZlSklUMzJfNjQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21w aWxlKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHA6CisgICAgICAgIChK U0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUpOgorCiAyMDIwLTAxLTE1ICBBbGV4ZXkg U2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAogICAgICAgICBPYmplY3QucHJldmVu dEV4dGVuc2lvbnMgc2hvdWxkIHRocm93IGlmIG5vdCBzdWNjZXNzZnVsCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1Nsb3dQYXRoR2VuZXJhdG9yLmggYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR1Nsb3dQYXRoR2VuZXJhdG9yLmgKaW5kZXggOGZmYmQzYzg2 MDEuLmFjYjllZTE1NGE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1Nsb3dQYXRoR2VuZXJhdG9yLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdT bG93UGF0aEdlbmVyYXRvci5oCkBAIC0xNzUsNyArMTc1LDEwIEBAIHByb3RlY3RlZDoKICAgICB2 b2lkIHVucGFja0FuZEdlbmVyYXRlKFNwZWN1bGF0aXZlSklUKiBqaXQsIHN0ZDo6aW5kZXhfc2Vx dWVuY2U8QXJndW1lbnRzSW5kZXguLi4+KQogICAgIHsKICAgICAgICAgdGhpcy0+c2V0VXAoaml0 KTsKLSAgICAgICAgdGhpcy0+cmVjb3JkQ2FsbChqaXQtPmNhbGxPcGVyYXRpb24odGhpcy0+bV9m dW5jdGlvbiwgZXh0cmFjdFJlc3VsdCh0aGlzLT5tX3Jlc3VsdCksIHN0ZDo6Z2V0PEFyZ3VtZW50 c0luZGV4PihtX2FyZ3VtZW50cykuLi4pKTsKKyAgICAgICAgaWYgY29uc3RleHByIChzdGQ6Omlz X3NhbWU8UmVzdWx0VHlwZSwgTm9SZXN1bHRUYWc+Ojp2YWx1ZSkKKyAgICAgICAgICAgIHRoaXMt PnJlY29yZENhbGwoaml0LT5jYWxsT3BlcmF0aW9uKHRoaXMtPm1fZnVuY3Rpb24sIHN0ZDo6Z2V0 PEFyZ3VtZW50c0luZGV4PihtX2FyZ3VtZW50cykuLi4pKTsKKyAgICAgICAgZWxzZQorICAgICAg ICAgICAgdGhpcy0+cmVjb3JkQ2FsbChqaXQtPmNhbGxPcGVyYXRpb24odGhpcy0+bV9mdW5jdGlv biwgZXh0cmFjdFJlc3VsdCh0aGlzLT5tX3Jlc3VsdCksIHN0ZDo6Z2V0PEFyZ3VtZW50c0luZGV4 PihtX2FyZ3VtZW50cykuLi4pKTsKICAgICAgICAgdGhpcy0+dGVhckRvd24oaml0KTsKICAgICB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVK SVQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAK aW5kZXggMDcwMjRjZGI0MDYuLjY4ZjUyM2ZlOTg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcApAQCAtMTEyNDgsNyArMTEyNDgsNyBAQCB2 b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlUHV0QWNjZXNzb3JCeUlkKE5vZGUqIG5vZGUpCiAg ICAgR1BSUmVnIGFjY2Vzc29yR1BSID0gYWNjZXNzb3IuZ3ByKCk7CiAKICAgICBmbHVzaFJlZ2lz dGVycygpOwotICAgIGNhbGxPcGVyYXRpb24obm9kZS0+b3AoKSA9PSBQdXRHZXR0ZXJCeUlkID8g b3BlcmF0aW9uUHV0R2V0dGVyQnlJZCA6IG9wZXJhdGlvblB1dFNldHRlckJ5SWQsIE5vUmVzdWx0 LCBUcnVzdGVkSW1tUHRyOjp3ZWFrUG9pbnRlcihtX2dyYXBoLCBtX2dyYXBoLmdsb2JhbE9iamVj dEZvcihub2RlLT5vcmlnaW4uc2VtYW50aWMpKSwgYmFzZUdQUiwgaWRlbnRpZmllclVJRChub2Rl LT5pZGVudGlmaWVyTnVtYmVyKCkpLCBub2RlLT5hY2Nlc3NvckF0dHJpYnV0ZXMoKSwgYWNjZXNz b3JHUFIpOworICAgIGNhbGxPcGVyYXRpb24obm9kZS0+b3AoKSA9PSBQdXRHZXR0ZXJCeUlkID8g b3BlcmF0aW9uUHV0R2V0dGVyQnlJZCA6IG9wZXJhdGlvblB1dFNldHRlckJ5SWQsIFRydXN0ZWRJ bW1QdHI6OndlYWtQb2ludGVyKG1fZ3JhcGgsIG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9yKG5vZGUt Pm9yaWdpbi5zZW1hbnRpYykpLCBiYXNlR1BSLCBpZGVudGlmaWVyVUlEKG5vZGUtPmlkZW50aWZp ZXJOdW1iZXIoKSksIG5vZGUtPmFjY2Vzc29yQXR0cmlidXRlcygpLCBhY2Nlc3NvckdQUik7CiAg ICAgbV9qaXQuZXhjZXB0aW9uQ2hlY2soKTsKIAogICAgIG5vUmVzdWx0KG5vZGUpOwpAQCAtMTEy NjYsNyArMTEyNjYsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlUHV0R2V0dGVyU2V0 dGVyQnlJZChOb2RlKiBub2RlKQogICAgIEdQUlJlZyBzZXR0ZXJHUFIgPSBzZXR0ZXIuZ3ByKCk7 CiAKICAgICBmbHVzaFJlZ2lzdGVycygpOwotICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uUHV0 R2V0dGVyU2V0dGVyLCBOb1Jlc3VsdCwgVHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50ZXIobV9ncmFw aCwgbV9ncmFwaC5nbG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSksIGJhc2VH UFIsIGlkZW50aWZpZXJVSUQobm9kZS0+aWRlbnRpZmllck51bWJlcigpKSwgbm9kZS0+YWNjZXNz b3JBdHRyaWJ1dGVzKCksIGdldHRlckdQUiwgc2V0dGVyR1BSKTsKKyAgICBjYWxsT3BlcmF0aW9u KG9wZXJhdGlvblB1dEdldHRlclNldHRlciwgVHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50ZXIobV9n cmFwaCwgbV9ncmFwaC5nbG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSksIGJh c2VHUFIsIGlkZW50aWZpZXJVSUQobm9kZS0+aWRlbnRpZmllck51bWJlcigpKSwgbm9kZS0+YWNj ZXNzb3JBdHRyaWJ1dGVzKCksIGdldHRlckdQUiwgc2V0dGVyR1BSKTsKICNlbHNlCiAgICAgLy8g VGhlc2UgSlNWYWx1ZXMgbWF5IGJlIEpTVW5kZWZpbmVkIE9SIEpTRnVuY3Rpb24qLgogICAgIC8v IEF0IHRoYXQgdGltZSwKQEAgLTExMjc4LDcgKzExMjc4LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJ VDo6Y29tcGlsZVB1dEdldHRlclNldHRlckJ5SWQoTm9kZSogbm9kZSkKICAgICBKU1ZhbHVlUmVn cyBzZXR0ZXJSZWdzID0gc2V0dGVyLmpzVmFsdWVSZWdzKCk7CiAKICAgICBmbHVzaFJlZ2lzdGVy cygpOwotICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uUHV0R2V0dGVyU2V0dGVyLCBOb1Jlc3Vs dCwgVHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50ZXIobV9ncmFwaCwgbV9ncmFwaC5nbG9iYWxPYmpl Y3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSksIGJhc2VHUFIsIGlkZW50aWZpZXJVSUQobm9k ZS0+aWRlbnRpZmllck51bWJlcigpKSwgbm9kZS0+YWNjZXNzb3JBdHRyaWJ1dGVzKCksIGdldHRl clJlZ3MucGF5bG9hZEdQUigpLCBzZXR0ZXJSZWdzLnBheWxvYWRHUFIoKSk7CisgICAgY2FsbE9w ZXJhdGlvbihvcGVyYXRpb25QdXRHZXR0ZXJTZXR0ZXIsIFRydXN0ZWRJbW1QdHI6OndlYWtQb2lu dGVyKG1fZ3JhcGgsIG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9yKG5vZGUtPm9yaWdpbi5zZW1hbnRp YykpLCBiYXNlR1BSLCBpZGVudGlmaWVyVUlEKG5vZGUtPmlkZW50aWZpZXJOdW1iZXIoKSksIG5v ZGUtPmFjY2Vzc29yQXR0cmlidXRlcygpLCBnZXR0ZXJSZWdzLnBheWxvYWRHUFIoKSwgc2V0dGVy UmVncy5wYXlsb2FkR1BSKCkpOwogI2VuZGlmCiAgICAgbV9qaXQuZXhjZXB0aW9uQ2hlY2soKTsK IApAQCAtMTEzNDYsNyArMTEzNDYsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlUHV0 RHluYW1pY1ZhcihOb2RlKiBub2RlKQogICAgIEpTVmFsdWVSZWdzIHZhbHVlUmVncyA9IHZhbHVl LmpzVmFsdWVSZWdzKCk7CiAKICAgICBmbHVzaFJlZ2lzdGVycygpOwotICAgIGNhbGxPcGVyYXRp b24obV9qaXQuaXNTdHJpY3RNb2RlRm9yKG5vZGUtPm9yaWdpbi5zZW1hbnRpYykgPyBvcGVyYXRp b25QdXREeW5hbWljVmFyU3RyaWN0IDogb3BlcmF0aW9uUHV0RHluYW1pY1Zhck5vblN0cmljdCwg Tm9SZXN1bHQsIFRydXN0ZWRJbW1QdHI6OndlYWtQb2ludGVyKG1fZ3JhcGgsIG1fZ3JhcGguZ2xv YmFsT2JqZWN0Rm9yKG5vZGUtPm9yaWdpbi5zZW1hbnRpYykpLCBzY29wZUdQUiwgdmFsdWVSZWdz LCBpZGVudGlmaWVyVUlEKG5vZGUtPmlkZW50aWZpZXJOdW1iZXIoKSksIG5vZGUtPmdldFB1dElu Zm8oKSk7CisgICAgY2FsbE9wZXJhdGlvbihtX2ppdC5pc1N0cmljdE1vZGVGb3Iobm9kZS0+b3Jp Z2luLnNlbWFudGljKSA/IG9wZXJhdGlvblB1dER5bmFtaWNWYXJTdHJpY3QgOiBvcGVyYXRpb25Q dXREeW5hbWljVmFyTm9uU3RyaWN0LCBUcnVzdGVkSW1tUHRyOjp3ZWFrUG9pbnRlcihtX2dyYXBo LCBtX2dyYXBoLmdsb2JhbE9iamVjdEZvcihub2RlLT5vcmlnaW4uc2VtYW50aWMpKSwgc2NvcGVH UFIsIHZhbHVlUmVncywgaWRlbnRpZmllclVJRChub2RlLT5pZGVudGlmaWVyTnVtYmVyKCkpLCBu b2RlLT5nZXRQdXRJbmZvKCkpOwogICAgIG1faml0LmV4Y2VwdGlvbkNoZWNrKCk7CiAgICAgbm9S ZXN1bHQobm9kZSk7CiB9CkBAIC0xMTQxMiw3ICsxMTQxMiw3IEBAIHZvaWQgU3BlY3VsYXRpdmVK SVQ6OmNvbXBpbGVQdXRBY2Nlc3NvckJ5VmFsKE5vZGUqIG5vZGUpCiAgICAgR1BSUmVnIGFjY2Vz c29yR1BSID0gYWNjZXNzb3IuZ3ByKCk7CiAKICAgICBmbHVzaFJlZ2lzdGVycygpOwotICAgIGNh bGxPcGVyYXRpb24ob3BlcmF0aW9uLCBOb1Jlc3VsdCwgVHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50 ZXIobV9ncmFwaCwgbV9ncmFwaC5nbG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGlj KSksIGJhc2VHUFIsIHN1YnNjcmlwdFJlZ3MsIG5vZGUtPmFjY2Vzc29yQXR0cmlidXRlcygpLCBh Y2Nlc3NvckdQUik7CisgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb24sIFRydXN0ZWRJbW1QdHI6 OndlYWtQb2ludGVyKG1fZ3JhcGgsIG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9yKG5vZGUtPm9yaWdp bi5zZW1hbnRpYykpLCBiYXNlR1BSLCBzdWJzY3JpcHRSZWdzLCBub2RlLT5hY2Nlc3NvckF0dHJp YnV0ZXMoKSwgYWNjZXNzb3JHUFIpOwogICAgIG1faml0LmV4Y2VwdGlvbkNoZWNrKCk7CiAKICAg ICBub1Jlc3VsdChub2RlKTsKQEAgLTExODU1LDcgKzExODU1LDcgQEAgdm9pZCBTcGVjdWxhdGl2 ZUpJVDo6Y29tcGlsZURlZmluZURhdGFQcm9wZXJ0eShOb2RlKiBub2RlKQogICAgICAgICB1c2VD aGlsZHJlbihub2RlKTsKIAogICAgICAgICBmbHVzaFJlZ2lzdGVycygpOwotICAgICAgICBjYWxs T3BlcmF0aW9uKG9wZXJhdGlvbkRlZmluZURhdGFQcm9wZXJ0eVN0cmluZywgTm9SZXN1bHQsIFRy dXN0ZWRJbW1QdHI6OndlYWtQb2ludGVyKG1fZ3JhcGgsIG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9y KG5vZGUtPm9yaWdpbi5zZW1hbnRpYykpLCBiYXNlR1BSLCBwcm9wZXJ0eUdQUiwgdmFsdWVSZWdz LCBhdHRyaWJ1dGVzR1BSKTsKKyAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25EZWZpbmVE YXRhUHJvcGVydHlTdHJpbmcsIFRydXN0ZWRJbW1QdHI6OndlYWtQb2ludGVyKG1fZ3JhcGgsIG1f Z3JhcGguZ2xvYmFsT2JqZWN0Rm9yKG5vZGUtPm9yaWdpbi5zZW1hbnRpYykpLCBiYXNlR1BSLCBw cm9wZXJ0eUdQUiwgdmFsdWVSZWdzLCBhdHRyaWJ1dGVzR1BSKTsKICAgICAgICAgbV9qaXQuZXhj ZXB0aW9uQ2hlY2soKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQpAQCAtMTE4NzIsNyArMTE4NzIs NyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlRGVmaW5lRGF0YVByb3BlcnR5KE5vZGUq IG5vZGUpCiAgICAgICAgIHVzZUNoaWxkcmVuKG5vZGUpOwogCiAgICAgICAgIGZsdXNoUmVnaXN0 ZXJzKCk7Ci0gICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uRGVmaW5lRGF0YVByb3BlcnR5 U3RyaW5nSWRlbnQsIE5vUmVzdWx0LCBUcnVzdGVkSW1tUHRyOjp3ZWFrUG9pbnRlcihtX2dyYXBo LCBtX2dyYXBoLmdsb2JhbE9iamVjdEZvcihub2RlLT5vcmlnaW4uc2VtYW50aWMpKSwgYmFzZUdQ UiwgaWRlbnRHUFIsIHZhbHVlUmVncywgYXR0cmlidXRlc0dQUik7CisgICAgICAgIGNhbGxPcGVy YXRpb24ob3BlcmF0aW9uRGVmaW5lRGF0YVByb3BlcnR5U3RyaW5nSWRlbnQsIFRydXN0ZWRJbW1Q dHI6OndlYWtQb2ludGVyKG1fZ3JhcGgsIG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9yKG5vZGUtPm9y aWdpbi5zZW1hbnRpYykpLCBiYXNlR1BSLCBpZGVudEdQUiwgdmFsdWVSZWdzLCBhdHRyaWJ1dGVz R1BSKTsKICAgICAgICAgbV9qaXQuZXhjZXB0aW9uQ2hlY2soKTsKICAgICAgICAgYnJlYWs7CiAg ICAgfQpAQCAtMTE4ODQsNyArMTE4ODQsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxl RGVmaW5lRGF0YVByb3BlcnR5KE5vZGUqIG5vZGUpCiAgICAgICAgIHVzZUNoaWxkcmVuKG5vZGUp OwogCiAgICAgICAgIGZsdXNoUmVnaXN0ZXJzKCk7Ci0gICAgICAgIGNhbGxPcGVyYXRpb24ob3Bl cmF0aW9uRGVmaW5lRGF0YVByb3BlcnR5U3ltYm9sLCBOb1Jlc3VsdCwgVHJ1c3RlZEltbVB0cjo6 d2Vha1BvaW50ZXIobV9ncmFwaCwgbV9ncmFwaC5nbG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2lu LnNlbWFudGljKSksIGJhc2VHUFIsIHByb3BlcnR5R1BSLCB2YWx1ZVJlZ3MsIGF0dHJpYnV0ZXNH UFIpOworICAgICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvbkRlZmluZURhdGFQcm9wZXJ0eVN5 bWJvbCwgVHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50ZXIobV9ncmFwaCwgbV9ncmFwaC5nbG9iYWxP YmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSksIGJhc2VHUFIsIHByb3BlcnR5R1BSLCB2 YWx1ZVJlZ3MsIGF0dHJpYnV0ZXNHUFIpOwogICAgICAgICBtX2ppdC5leGNlcHRpb25DaGVjaygp OwogICAgICAgICBicmVhazsKICAgICB9CkBAIC0xMTg5NSw3ICsxMTg5NSw3IEBAIHZvaWQgU3Bl Y3VsYXRpdmVKSVQ6OmNvbXBpbGVEZWZpbmVEYXRhUHJvcGVydHkoTm9kZSogbm9kZSkKICAgICAg ICAgdXNlQ2hpbGRyZW4obm9kZSk7CiAKICAgICAgICAgZmx1c2hSZWdpc3RlcnMoKTsKLSAgICAg ICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25EZWZpbmVEYXRhUHJvcGVydHksIE5vUmVzdWx0LCBU cnVzdGVkSW1tUHRyOjp3ZWFrUG9pbnRlcihtX2dyYXBoLCBtX2dyYXBoLmdsb2JhbE9iamVjdEZv cihub2RlLT5vcmlnaW4uc2VtYW50aWMpKSwgYmFzZUdQUiwgcHJvcGVydHlSZWdzLCB2YWx1ZVJl Z3MsIGF0dHJpYnV0ZXNHUFIpOworICAgICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvbkRlZmlu ZURhdGFQcm9wZXJ0eSwgVHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50ZXIobV9ncmFwaCwgbV9ncmFw aC5nbG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSksIGJhc2VHUFIsIHByb3Bl cnR5UmVncywgdmFsdWVSZWdzLCBhdHRyaWJ1dGVzR1BSKTsKICAgICAgICAgbV9qaXQuZXhjZXB0 aW9uQ2hlY2soKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQpAQCAtMTE5MzYsNyArMTE5MzYsNyBA QCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlRGVmaW5lQWNjZXNzb3JQcm9wZXJ0eShOb2Rl KiBub2RlKQogICAgICAgICB1c2VDaGlsZHJlbihub2RlKTsKIAogICAgICAgICBmbHVzaFJlZ2lz dGVycygpOwotICAgICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvbkRlZmluZUFjY2Vzc29yUHJv cGVydHlTdHJpbmcsIE5vUmVzdWx0LCBUcnVzdGVkSW1tUHRyOjp3ZWFrUG9pbnRlcihtX2dyYXBo LCBtX2dyYXBoLmdsb2JhbE9iamVjdEZvcihub2RlLT5vcmlnaW4uc2VtYW50aWMpKSwgYmFzZUdQ UiwgcHJvcGVydHlHUFIsIGdldHRlckdQUiwgc2V0dGVyR1BSLCBhdHRyaWJ1dGVzR1BSKTsKKyAg ICAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25EZWZpbmVBY2Nlc3NvclByb3BlcnR5U3RyaW5n LCBUcnVzdGVkSW1tUHRyOjp3ZWFrUG9pbnRlcihtX2dyYXBoLCBtX2dyYXBoLmdsb2JhbE9iamVj dEZvcihub2RlLT5vcmlnaW4uc2VtYW50aWMpKSwgYmFzZUdQUiwgcHJvcGVydHlHUFIsIGdldHRl ckdQUiwgc2V0dGVyR1BSLCBhdHRyaWJ1dGVzR1BSKTsKICAgICAgICAgbV9qaXQuZXhjZXB0aW9u Q2hlY2soKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQpAQCAtMTE5NTMsNyArMTE5NTMsNyBAQCB2 b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlRGVmaW5lQWNjZXNzb3JQcm9wZXJ0eShOb2RlKiBu b2RlKQogICAgICAgICB1c2VDaGlsZHJlbihub2RlKTsKIAogICAgICAgICBmbHVzaFJlZ2lzdGVy cygpOwotICAgICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvbkRlZmluZUFjY2Vzc29yUHJvcGVy dHlTdHJpbmdJZGVudCwgTm9SZXN1bHQsIFRydXN0ZWRJbW1QdHI6OndlYWtQb2ludGVyKG1fZ3Jh cGgsIG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9yKG5vZGUtPm9yaWdpbi5zZW1hbnRpYykpLCBiYXNl R1BSLCBpZGVudEdQUiwgZ2V0dGVyR1BSLCBzZXR0ZXJHUFIsIGF0dHJpYnV0ZXNHUFIpOworICAg ICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvbkRlZmluZUFjY2Vzc29yUHJvcGVydHlTdHJpbmdJ ZGVudCwgVHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50ZXIobV9ncmFwaCwgbV9ncmFwaC5nbG9iYWxP YmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSksIGJhc2VHUFIsIGlkZW50R1BSLCBnZXR0 ZXJHUFIsIHNldHRlckdQUiwgYXR0cmlidXRlc0dQUik7CiAgICAgICAgIG1faml0LmV4Y2VwdGlv bkNoZWNrKCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTExOTY1LDcgKzExOTY1LDcgQEAg dm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZURlZmluZUFjY2Vzc29yUHJvcGVydHkoTm9kZSog bm9kZSkKICAgICAgICAgdXNlQ2hpbGRyZW4obm9kZSk7CiAKICAgICAgICAgZmx1c2hSZWdpc3Rl cnMoKTsKLSAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25EZWZpbmVBY2Nlc3NvclByb3Bl cnR5U3ltYm9sLCBOb1Jlc3VsdCwgVHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50ZXIobV9ncmFwaCwg bV9ncmFwaC5nbG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSksIGJhc2VHUFIs IHByb3BlcnR5R1BSLCBnZXR0ZXJHUFIsIHNldHRlckdQUiwgYXR0cmlidXRlc0dQUik7CisgICAg ICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uRGVmaW5lQWNjZXNzb3JQcm9wZXJ0eVN5bWJvbCwg VHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50ZXIobV9ncmFwaCwgbV9ncmFwaC5nbG9iYWxPYmplY3RG b3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSksIGJhc2VHUFIsIHByb3BlcnR5R1BSLCBnZXR0ZXJH UFIsIHNldHRlckdQUiwgYXR0cmlidXRlc0dQUik7CiAgICAgICAgIG1faml0LmV4Y2VwdGlvbkNo ZWNrKCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTExOTc2LDcgKzExOTc2LDcgQEAgdm9p ZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZURlZmluZUFjY2Vzc29yUHJvcGVydHkoTm9kZSogbm9k ZSkKICAgICAgICAgdXNlQ2hpbGRyZW4obm9kZSk7CiAKICAgICAgICAgZmx1c2hSZWdpc3RlcnMo KTsKLSAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25EZWZpbmVBY2Nlc3NvclByb3BlcnR5 LCBOb1Jlc3VsdCwgVHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50ZXIobV9ncmFwaCwgbV9ncmFwaC5n bG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSksIGJhc2VHUFIsIHByb3BlcnR5 UmVncywgZ2V0dGVyR1BSLCBzZXR0ZXJHUFIsIGF0dHJpYnV0ZXNHUFIpOworICAgICAgICBjYWxs T3BlcmF0aW9uKG9wZXJhdGlvbkRlZmluZUFjY2Vzc29yUHJvcGVydHksIFRydXN0ZWRJbW1QdHI6 OndlYWtQb2ludGVyKG1fZ3JhcGgsIG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9yKG5vZGUtPm9yaWdp bi5zZW1hbnRpYykpLCBiYXNlR1BSLCBwcm9wZXJ0eVJlZ3MsIGdldHRlckdQUiwgc2V0dGVyR1BS LCBhdHRyaWJ1dGVzR1BSKTsKICAgICAgICAgbV9qaXQuZXhjZXB0aW9uQ2hlY2soKTsKICAgICAg ICAgYnJlYWs7CiAgICAgfQpAQCAtMTIyNzgsNyArMTIyNzgsNyBAQCB2b2lkIFNwZWN1bGF0aXZl SklUOjpjb21waWxlUHV0QnlJZFdpdGhUaGlzKE5vZGUqIG5vZGUpCiAKICAgICBmbHVzaFJlZ2lz dGVycygpOwogICAgIGNhbGxPcGVyYXRpb24obV9qaXQuaXNTdHJpY3RNb2RlRm9yKG5vZGUtPm9y aWdpbi5zZW1hbnRpYykgPyBvcGVyYXRpb25QdXRCeUlkV2l0aFRoaXNTdHJpY3QgOiBvcGVyYXRp b25QdXRCeUlkV2l0aFRoaXMsCi0gICAgICAgIE5vUmVzdWx0LCBUcnVzdGVkSW1tUHRyOjp3ZWFr UG9pbnRlcihtX2dyYXBoLCBtX2dyYXBoLmdsb2JhbE9iamVjdEZvcihub2RlLT5vcmlnaW4uc2Vt YW50aWMpKSwgYmFzZVJlZ3MsIHRoaXNSZWdzLCB2YWx1ZVJlZ3MsIGlkZW50aWZpZXJVSUQobm9k ZS0+aWRlbnRpZmllck51bWJlcigpKSk7CisgICAgICAgIFRydXN0ZWRJbW1QdHI6OndlYWtQb2lu dGVyKG1fZ3JhcGgsIG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9yKG5vZGUtPm9yaWdpbi5zZW1hbnRp YykpLCBiYXNlUmVncywgdGhpc1JlZ3MsIHZhbHVlUmVncywgaWRlbnRpZmllclVJRChub2RlLT5p ZGVudGlmaWVyTnVtYmVyKCkpKTsKICAgICBtX2ppdC5leGNlcHRpb25DaGVjaygpOwogCiAgICAg bm9SZXN1bHQobm9kZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1NwZWN1bGF0aXZlSklULmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0 aXZlSklULmgKaW5kZXggNGEyZjBmNzQ5NjkuLjhmOTYxODIxZjVhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmgKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCkBAIC05MjQsOCArOTI0LDYgQEAg cHVibGljOgogICAgICAgICBnZW5lcmF0aW9uSW5mbyhub2RlKS5pbml0Q29uc3RhbnQobm9kZSwg bm9kZS0+cmVmQ291bnQoKSk7CiAgICAgfQogCi0jZGVmaW5lIEZJUlNUX0FSR1VNRU5UX1RZUEUg dHlwZW5hbWUgRnVuY3Rpb25UcmFpdHM8T3BlcmF0aW9uVHlwZT46OnRlbXBsYXRlIEFyZ3VtZW50 VHlwZTwwPgotCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgT3BlcmF0aW9uVHlwZSwgdHlwZW5hbWUg UmVzdWx0UmVnVHlwZSwgdHlwZW5hbWUuLi4gQXJncz4KICAgICBzdGQ6OmVuYWJsZV9pZl90PAog ICAgICAgICBGdW5jdGlvblRyYWl0czxPcGVyYXRpb25UeXBlPjo6aGFzUmVzdWx0LApAQCAtOTM2 LDM5ICs5MzQsMTYgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gYXBwZW5kQ2FsbFNldFJlc3Vs dChvcGVyYXRpb24sIHJlc3VsdCk7CiAgICAgfQogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgT3Bl cmF0aW9uVHlwZSwgdHlwZW5hbWUgQXJnLCB0eXBlbmFtZS4uLiBBcmdzPgotICAgIHN0ZDo6ZW5h YmxlX2lmX3Q8Ci0gICAgICAgICFGdW5jdGlvblRyYWl0czxPcGVyYXRpb25UeXBlPjo6aGFzUmVz dWx0Ci0gICAgICAgICYmICFzdGQ6OmlzX3NhbWU8QXJnLCBOb1Jlc3VsdFRhZz46OnZhbHVlLAot ICAgIEpJVENvbXBpbGVyOjpDYWxsPgotICAgIGNhbGxPcGVyYXRpb24oT3BlcmF0aW9uVHlwZSBv cGVyYXRpb24sIEFyZyBhcmcsIEFyZ3MuLi4gYXJncykKLSAgICB7Ci0gICAgICAgIG1faml0LnNl dHVwQXJndW1lbnRzPE9wZXJhdGlvblR5cGU+KGFyZywgYXJncy4uLik7Ci0gICAgICAgIHJldHVy biBhcHBlbmRDYWxsKG9wZXJhdGlvbik7Ci0gICAgfQotCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUg T3BlcmF0aW9uVHlwZSwgdHlwZW5hbWUuLi4gQXJncz4KICAgICBzdGQ6OmVuYWJsZV9pZl90PAog ICAgICAgICAhRnVuY3Rpb25UcmFpdHM8T3BlcmF0aW9uVHlwZT46Omhhc1Jlc3VsdCwKICAgICBK SVRDb21waWxlcjo6Q2FsbD4KLSAgICBjYWxsT3BlcmF0aW9uKE9wZXJhdGlvblR5cGUgb3BlcmF0 aW9uLCBOb1Jlc3VsdFRhZywgQXJncy4uLiBhcmdzKQorICAgIGNhbGxPcGVyYXRpb24oT3BlcmF0 aW9uVHlwZSBvcGVyYXRpb24sIEFyZ3MuLi4gYXJncykKICAgICB7CiAgICAgICAgIG1faml0LnNl dHVwQXJndW1lbnRzPE9wZXJhdGlvblR5cGU+KGFyZ3MuLi4pOwogICAgICAgICByZXR1cm4gYXBw ZW5kQ2FsbChvcGVyYXRpb24pOwogICAgIH0KIAotICAgIHRlbXBsYXRlPHR5cGVuYW1lIE9wZXJh dGlvblR5cGU+Ci0gICAgc3RkOjplbmFibGVfaWZfdDwKLSAgICAgICAgIUZ1bmN0aW9uVHJhaXRz PE9wZXJhdGlvblR5cGU+OjpoYXNSZXN1bHQsCi0gICAgSklUQ29tcGlsZXI6OkNhbGw+Ci0gICAg Y2FsbE9wZXJhdGlvbihPcGVyYXRpb25UeXBlIG9wZXJhdGlvbikKLSAgICB7Ci0gICAgICAgIG1f aml0LnNldHVwQXJndW1lbnRzPE9wZXJhdGlvblR5cGU+KCk7Ci0gICAgICAgIHJldHVybiBhcHBl bmRDYWxsKG9wZXJhdGlvbik7Ci0gICAgfQotCi0jdW5kZWYgRklSU1RfQVJHVU1FTlRfVFlQRQot CiAgICAgSklUQ29tcGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbldpdGhDYWxsRnJhbWVSb2xsYmFj a09uRXhjZXB0aW9uKFZfSklUT3BlcmF0aW9uX0NiIG9wZXJhdGlvbiwgQ29kZUJsb2NrKiBjb2Rl QmxvY2spCiAgICAgewogICAgICAgICAvLyBEbyBub3QgcmVnaXN0ZXIgQ29kZUJsb2NrKiBhcyBh IHdlYWstcG9pbnRlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U3BlY3VsYXRpdmVKSVQzMl82NC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1Nw ZWN1bGF0aXZlSklUMzJfNjQuY3BwCmluZGV4IDUxNjI5MTc3OWJlLi5kNDVlZGMxNmMwMiAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0 LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJf NjQuY3BwCkBAIC0yNzgzLDcgKzI3ODMsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxl KE5vZGUqIG5vZGUpCiAKICAgICAgICAgZmx1c2hSZWdpc3RlcnMoKTsKICAgICAgICAgY2FsbE9w ZXJhdGlvbihtX2ppdC5pc1N0cmljdE1vZGVGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSA/IG9w ZXJhdGlvblB1dEJ5VmFsV2l0aFRoaXNTdHJpY3QgOiBvcGVyYXRpb25QdXRCeVZhbFdpdGhUaGlz LAotICAgICAgICAgICAgTm9SZXN1bHQsIFRydXN0ZWRJbW1QdHI6OndlYWtQb2ludGVyKG1fZ3Jh cGgsIG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9yKG5vZGUtPm9yaWdpbi5zZW1hbnRpYykpLCBiYXNl UmVncywgdGhpc1JlZ3MsIHByb3BlcnR5UmVncywgdmFsdWVSZWdzKTsKKyAgICAgICAgICAgIFRy dXN0ZWRJbW1QdHI6OndlYWtQb2ludGVyKG1fZ3JhcGgsIG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9y KG5vZGUtPm9yaWdpbi5zZW1hbnRpYykpLCBiYXNlUmVncywgdGhpc1JlZ3MsIHByb3BlcnR5UmVn cywgdmFsdWVSZWdzKTsKICAgICAgICAgbV9qaXQuZXhjZXB0aW9uQ2hlY2soKTsKIAogICAgICAg ICBub1Jlc3VsdChub2RlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1Nw ZWN1bGF0aXZlSklUNjQuY3BwCmluZGV4IDQ2YjExZGFiMjFmLi5lYzdmMzM3Y2I5ZSAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCkBA IC0zODkxLDcgKzM4OTEsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUqIG5v ZGUpCiAgICAgICAgIEdQUlJlZyB2YWx1ZUdQUiA9IHZhbHVlLmdwcigpOwogCiAgICAgICAgIGZs dXNoUmVnaXN0ZXJzKCk7Ci0gICAgICAgIGNhbGxPcGVyYXRpb24obV9qaXQuaXNTdHJpY3RNb2Rl Rm9yKG5vZGUtPm9yaWdpbi5zZW1hbnRpYykgPyBvcGVyYXRpb25QdXRCeVZhbFdpdGhUaGlzU3Ry aWN0IDogb3BlcmF0aW9uUHV0QnlWYWxXaXRoVGhpcywgTm9SZXN1bHQsIFRydXN0ZWRJbW1QdHI6 OndlYWtQb2ludGVyKG1fZ3JhcGgsIG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9yKG5vZGUtPm9yaWdp bi5zZW1hbnRpYykpLCBiYXNlR1BSLCB0aGlzVmFsdWVHUFIsIHByb3BlcnR5R1BSLCB2YWx1ZUdQ Uik7CisgICAgICAgIGNhbGxPcGVyYXRpb24obV9qaXQuaXNTdHJpY3RNb2RlRm9yKG5vZGUtPm9y aWdpbi5zZW1hbnRpYykgPyBvcGVyYXRpb25QdXRCeVZhbFdpdGhUaGlzU3RyaWN0IDogb3BlcmF0 aW9uUHV0QnlWYWxXaXRoVGhpcywgVHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50ZXIobV9ncmFwaCwg bV9ncmFwaC5nbG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSksIGJhc2VHUFIs IHRoaXNWYWx1ZUdQUiwgcHJvcGVydHlHUFIsIHZhbHVlR1BSKTsKICAgICAgICAgbV9qaXQuZXhj ZXB0aW9uQ2hlY2soKTsKIAogICAgICAgICBub1Jlc3VsdChub2RlKTsK