216225 2020-09-06 02:26:21 -0700 Make CompactUniquePtrTuple actually work with subclassing and custom deleter 2020-09-08 00:22:38 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 216264 1 rniwa rniwa benjamin cdumez cmarcelo darin ews-watchlist saam webkit-bug-importer ysuzuki oldest_to_newest 1686181 0 rniwa 2020-09-06 02:26:21 -0700 There are some bugs :( 1686182 1 408121 rniwa 2020-09-06 02:33:31 -0700 Created attachment 408121 Fixes the bugs 1686211 2 408121 darin 2020-09-06 14:09:36 -0700 Comment on attachment 408121 Fixes the bugs View in context: https://bugs.webkit.org/attachment.cgi?id=408121&action=review > Source/WTF/wtf/CompactUniquePtrTuple.h:69 > + CompactUniquePtrTuple<T, Type, Deleter> moved { WTFMove(other) }; Here inside a member we should not need to repeat the template arguments, so although it can’t use auto, it can be like this: CompactUniquePtrTuple moved { WTFMove(other) }; > Source/WTF/wtf/CompactUniquePtrTuple.h:118 > + template <typename U, typename Y, typename D> friend class CompactUniquePtrTuple; No need for the U/Y/D here. Can just be "typename, typename, typename". 1686467 3 rniwa 2020-09-07 20:46:29 -0700 Thanks for the reviews! (In reply to Darin Adler from comment #2) > Comment on attachment 408121 [details] > Fixes the bugs > > View in context: > https://bugs.webkit.org/attachment.cgi?id=408121&action=review > > > Source/WTF/wtf/CompactUniquePtrTuple.h:69 > > + CompactUniquePtrTuple<T, Type, Deleter> moved { WTFMove(other) }; > > Here inside a member we should not need to repeat the template arguments, so > although it can’t use auto, it can be like this: Done. > CompactUniquePtrTuple moved { WTFMove(other) }; > > > Source/WTF/wtf/CompactUniquePtrTuple.h:118 > > + template <typename U, typename Y, typename D> friend class CompactUniquePtrTuple; > > No need for the U/Y/D here. Can just be "typename, typename, typename". Removed. 1686468 4 rniwa 2020-09-07 20:50:16 -0700 Committed r266713: <https://trac.webkit.org/changeset/266713> 1686469 5 webkit-bug-importer 2020-09-07 20:51:17 -0700 <rdar://problem/68484458> 408121 2020-09-06 02:33:31 -0700 2020-09-06 14:09:36 -0700 Fixes the bugs bug-216225-20200906023333.patch text/plain 13495 rniwa SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNjY1NzUpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA5LTA2ICBSeW9zdWtlIE5pd2EgIDxybml3 YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1ha2UgQ29tcGFjdFVuaXF1ZVB0clR1cGxlIGFjdHVh bGx5IHdvcmsgd2l0aCBzdWJjbGFzc2luZyBhbmQgY3VzdG9tIGRlbGV0ZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjIyNQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIGJ1Z3MgaW4gQ29tcGFj dFVuaXF1ZVB0clR1cGxlIHdoaWNoIHByZXZlbnRlZCBzdWJjbGFzc2luZyBhbmQgY3VzdG9tIGRl bGV0ZXIgdG8gd29yay4KKworICAgICAgICAqIHd0Zi9Db21wYWN0UG9pbnRlclR1cGxlLmg6Cisg ICAgICAgIChXVEY6OkNvbXBhY3RQb2ludGVyVHVwbGU6OkNvbXBhY3RQb2ludGVyVHVwbGUpOiBB ZGRlZCBtb3ZlIGNvbnN0cnVjdG9yIHdpdGggaW1wbGljaXQgY2FzdAorICAgICAgICBvZiBhIGNv bnZlcnRpYmxlIHBvaW50ZXIgdHlwZS4KKyAgICAgICAgKiB3dGYvQ29tcGFjdFVuaXF1ZVB0clR1 cGxlLmg6CisgICAgICAgIChXVEY6Om1ha2VDb21wYWN0VW5pcXVlUHRyKTogQWRkZWQgdGhlIG1p c3NpbmcgZGVsZXRlciBmcm9tIHRoZSByZXR1cm4gdHlwZS4KKyAgICAgICAgKFdURjo6Q29tcGFj dFVuaXF1ZVB0clR1cGxlOjpDb21wYWN0VW5pcXVlUHRyVHVwbGUpOiBBbGxvdyBEZWxldGVyIHRv IGJlIGRpZmZlcmVudCBpZiBpdCdzCisgICAgICAgIHRoZSBkZWZhdWx0IGRlbGV0ZXIgaW4gdGhl IG1vdmUgY29uc3RydWN0b3Igc28gdGhhdCBDb21wYWN0VW5pcXVlUHRyVHVwbGU8VSwgVHlwZT4g Y291bGQgYmUKKyAgICAgICAgbW92ZWQgdG8gQ29tcGFjdFVuaXF1ZVB0clR1cGxlPFQsIFR5cGU+ IGlmIFUgaXMgY29udmVydGlibGUgdG8gVCB3aXRob3V0IGhhdmluZyB0byBzcGVjaWZ5CisgICAg ICAgIHRoZSBzYW1lIGRlbGV0ZXIgKHN0ZDo6ZGVmYXVsdF9kZWxldGU8VT4gaXMgbm90IHNhbWUg YXMgc3RkOjpkZWZhdWx0X2RlbGV0ZTxUPiBidXQgYWxsb3cgaXQpLgorICAgICAgICAoV1RGOjpD b21wYWN0VW5pcXVlUHRyVHVwbGU6Om9wZXJhdG9yPSk6IERpdHRvLgorICAgICAgICAoV1RGOjpD b21wYWN0VW5pcXVlUHRyVHVwbGU6OnNldFBvaW50ZXIpOiBEaXR0byBmcm9tIHN0ZDo6dW5pcXVl X3B0ci4KKyAgICAgICAgKFdURjo6Q29tcGFjdFVuaXF1ZVB0clR1cGxlKTogRnJpZW5kIGRlY2xh cmUgYWxsIG90aGVyIHNwZWNpYWxpemF0aW9ucyBvZiBDb21wYWN0VW5pcXVlUHRyVHVwbGUKKyAg ICAgICAgc28gdGhhdCB0aGUgYWJvdmUgZml4ZXMgd29yay4KKwogMjAyMC0wOS0wMiAgUnlvc3Vr ZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgQ29tcGFjdFVuaXF1ZVB0 clR1cGxlCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9Db21wYWN0UG9pbnRlclR1cGxlLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dURi93dGYvQ29tcGFjdFBvaW50ZXJUdXBsZS5oCShyZXZpc2lvbiAy NjY1NzUpCisrKyBTb3VyY2UvV1RGL3d0Zi9Db21wYWN0UG9pbnRlclR1cGxlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTY4LDYgKzY4LDEyIEBAIHB1YmxpYzoKICAgICAgICAgQVNTRVJUKHRoaXMtPnBv aW50ZXIoKSA9PSBwb2ludGVyKTsKICAgICB9CiAKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBPdGhl clBvaW50ZXJUeXBlLCB0eXBlbmFtZSA9IHN0ZDo6ZW5hYmxlX2lmPHN0ZDo6aXNfcG9pbnRlcjxQ b2ludGVyVHlwZT46OnZhbHVlICYmIHN0ZDo6aXNfY29udmVydGlibGU8T3RoZXJQb2ludGVyVHlw ZSwgUG9pbnRlclR5cGU+Ojp2YWx1ZT4+CisgICAgQ29tcGFjdFBvaW50ZXJUdXBsZShDb21wYWN0 UG9pbnRlclR1cGxlPE90aGVyUG9pbnRlclR5cGUsIFR5cGU+JiYgb3RoZXIpCisgICAgICAgIDog bV9kYXRhIHsgc3RkOjpleGNoYW5nZShvdGhlci5tX2RhdGEsIHsgfSkgfQorICAgIHsKKyAgICB9 CisKICAgICBQb2ludGVyVHlwZSBwb2ludGVyKCkgY29uc3QgeyByZXR1cm4gYml0d2lzZV9jYXN0 PFBvaW50ZXJUeXBlPihtX2RhdGEgJiBwb2ludGVyTWFzayk7IH0KICAgICB2b2lkIHNldFBvaW50 ZXIoUG9pbnRlclR5cGUgcG9pbnRlcikKICAgICB7CkBAIC0xMDgsNiArMTE0LDEzIEBAIHB1Ymxp YzoKICAgICB7CiAgICAgfQogCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgT3RoZXJQb2ludGVyVHlw ZSwgdHlwZW5hbWUgPSBzdGQ6OmVuYWJsZV9pZjxzdGQ6OmlzX3BvaW50ZXI8UG9pbnRlclR5cGU+ Ojp2YWx1ZSAmJiBzdGQ6OmlzX2NvbnZlcnRpYmxlPE90aGVyUG9pbnRlclR5cGUsIFBvaW50ZXJU eXBlPjo6dmFsdWU+PgorICAgIENvbXBhY3RQb2ludGVyVHVwbGUoQ29tcGFjdFBvaW50ZXJUdXBs ZTxPdGhlclBvaW50ZXJUeXBlLCBUeXBlPiYmIG90aGVyKQorICAgICAgICA6IG1fcG9pbnRlciB7 IHN0ZDo6ZXhjaGFuZ2Uob3RoZXIubV9wb2ludGVyLCB7IH0pIH0KKyAgICAgICAgLCBtX3R5cGUg eyBzdGQ6OmV4Y2hhbmdlKG90aGVyLm1fdHlwZSwgeyB9KSB9CisgICAgeworICAgIH0KKwogICAg IFBvaW50ZXJUeXBlIHBvaW50ZXIoKSBjb25zdCB7IHJldHVybiBtX3BvaW50ZXI7IH0KICAgICB2 b2lkIHNldFBvaW50ZXIoUG9pbnRlclR5cGUgcG9pbnRlcikgeyBtX3BvaW50ZXIgPSBwb2ludGVy OyB9CiAgICAgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlOyB9CkBAIC0xMTcsNiAr MTMwLDggQEAgcHJpdmF0ZToKICAgICBQb2ludGVyVHlwZSBtX3BvaW50ZXIgeyBudWxscHRyIH07 CiAgICAgVHlwZSBtX3R5cGUgeyAwIH07CiAjZW5kaWYKKworICAgIHRlbXBsYXRlPHR5cGVuYW1l IFAsIHR5cGVuYW1lIFQ+IGZyaWVuZCBjbGFzcyBDb21wYWN0UG9pbnRlclR1cGxlOwogfTsKIAog fSAvLyBuYW1lc3BhY2UgV1RGCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9Db21wYWN0VW5pcXVlUHRy VHVwbGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9Db21wYWN0VW5pcXVlUHRyVHVw bGUuaAkocmV2aXNpb24gMjY2NTc1KQorKysgU291cmNlL1dURi93dGYvQ29tcGFjdFVuaXF1ZVB0 clR1cGxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQwLDcgKzQwLDcgQEAgQUxXQVlTX0lOTElORSBD b21wYWN0VW5pcXVlUHRyVHVwbGU8VCwgVAogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBl bmFtZSBUeXBlLCB0eXBlbmFtZSBEZWxldGVyLCB0eXBlbmFtZS4uLiBBcmdzPgotQUxXQVlTX0lO TElORSBDb21wYWN0VW5pcXVlUHRyVHVwbGU8VCwgVHlwZT4gbWFrZUNvbXBhY3RVbmlxdWVQdHIo QXJncyYmLi4uIGFyZ3MpCitBTFdBWVNfSU5MSU5FIENvbXBhY3RVbmlxdWVQdHJUdXBsZTxULCBU eXBlLCBEZWxldGVyPiBtYWtlQ29tcGFjdFVuaXF1ZVB0cihBcmdzJiYuLi4gYXJncykKIHsKICAg ICByZXR1cm4gQ29tcGFjdFVuaXF1ZVB0clR1cGxlPFQsIFR5cGUsIERlbGV0ZXI+KG1ha2VVbmlx dWU8VD4oc3RkOjpmb3J3YXJkPEFyZ3M+KGFyZ3MpLi4uKSk7CiB9CkBAIC01Miw4ICs1Miw4IEBA IGNsYXNzIENvbXBhY3RVbmlxdWVQdHJUdXBsZSBmaW5hbCB7CiBwdWJsaWM6CiAgICAgQ29tcGFj dFVuaXF1ZVB0clR1cGxlKCkgPSBkZWZhdWx0OwogCi0gICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+ Ci0gICAgQ29tcGFjdFVuaXF1ZVB0clR1cGxlKENvbXBhY3RVbmlxdWVQdHJUdXBsZTxVLCBUeXBl LCBEZWxldGVyPiYmIG90aGVyKQorICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVLCB0eXBlbmFtZSBV RGVsZXRlciwgdHlwZW5hbWUgPSBzdGQ6OmVuYWJsZV9pZl90PHN0ZDo6aXNfc2FtZTxVRGVsZXRl ciwgRGVsZXRlcj46OnZhbHVlIHx8IHN0ZDo6aXNfc2FtZTxVRGVsZXRlciwgc3RkOjpkZWZhdWx0 X2RlbGV0ZTxVPj46OnZhbHVlPj4KKyAgICBDb21wYWN0VW5pcXVlUHRyVHVwbGUoQ29tcGFjdFVu aXF1ZVB0clR1cGxlPFUsIFR5cGUsIFVEZWxldGVyPiYmIG90aGVyKQogICAgICAgICA6IG1fZGF0 YSB7IHN0ZDo6ZXhjaGFuZ2Uob3RoZXIubV9kYXRhLCB7IH0pIH0KICAgICB7CiAgICAgfQpAQCAt NjMsMTAgKzYzLDEwIEBAIHB1YmxpYzoKICAgICAgICAgc2V0UG9pbnRlcihudWxscHRyKTsKICAg ICB9CiAKLSAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVT4KLSAgICBDb21wYWN0VW5pcXVlUHRyVHVw bGU8VCwgVHlwZSwgRGVsZXRlcj4mIG9wZXJhdG9yPShDb21wYWN0VW5pcXVlUHRyVHVwbGU8VSwg VHlwZSwgRGVsZXRlcj4mJiBvdGhlcikKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVSwgdHlwZW5h bWUgVURlbGV0ZXIsIHR5cGVuYW1lID0gc3RkOjplbmFibGVfaWZfdDxzdGQ6OmlzX3NhbWU8VURl bGV0ZXIsIERlbGV0ZXI+Ojp2YWx1ZSB8fCBzdGQ6OmlzX3NhbWU8VURlbGV0ZXIsIHN0ZDo6ZGVm YXVsdF9kZWxldGU8VT4+Ojp2YWx1ZT4+CisgICAgQ29tcGFjdFVuaXF1ZVB0clR1cGxlPFQsIFR5 cGUsIERlbGV0ZXI+JiBvcGVyYXRvcj0oQ29tcGFjdFVuaXF1ZVB0clR1cGxlPFUsIFR5cGUsIFVE ZWxldGVyPiYmIG90aGVyKQogICAgIHsKLSAgICAgICAgYXV0byBtb3ZlZCA9IFdURk1vdmUob3Ro ZXIpOworICAgICAgICBDb21wYWN0VW5pcXVlUHRyVHVwbGU8VCwgVHlwZSwgRGVsZXRlcj4gbW92 ZWQgeyBXVEZNb3ZlKG90aGVyKSB9OwogICAgICAgICBzdGQ6OnN3YXAobV9kYXRhLCBtb3ZlZC5t X2RhdGEpOwogICAgICAgICByZXR1cm4gKnRoaXM7CiAgICAgfQpAQCAtODYsOCArODYsOCBAQCBw dWJsaWM6CiAgICAgICAgIG1fZGF0YS5zZXRQb2ludGVyKG51bGxwdHIpOwogICAgIH0KIAotICAg IHRlbXBsYXRlIDx0eXBlbmFtZSBVPgotICAgIHZvaWQgc2V0UG9pbnRlcihzdGQ6OnVuaXF1ZV9w dHI8VSwgRGVsZXRlcj4mJiBwb2ludGVyKQorICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVLCB0eXBl bmFtZSBVRGVsZXRlciwgdHlwZW5hbWUgPSBzdGQ6OmVuYWJsZV9pZl90PHN0ZDo6aXNfc2FtZTxV RGVsZXRlciwgRGVsZXRlcj46OnZhbHVlIHx8IHN0ZDo6aXNfc2FtZTxVRGVsZXRlciwgc3RkOjpk ZWZhdWx0X2RlbGV0ZTxVPj46OnZhbHVlPj4KKyAgICB2b2lkIHNldFBvaW50ZXIoc3RkOjp1bmlx dWVfcHRyPFUsIFVEZWxldGVyPiYmIHBvaW50ZXIpCiAgICAgewogICAgICAgICBkZWxldGVQb2lu dGVyKCk7CiAgICAgICAgIG1fZGF0YS5zZXRQb2ludGVyKHBvaW50ZXIucmVsZWFzZSgpKTsKQEAg LTExNSw2ICsxMTUsOCBAQCBwcml2YXRlOgogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFUsIHR5cGVu YW1lIEUsIHR5cGVuYW1lLi4uIEFyZ3M+IGZyaWVuZCBDb21wYWN0VW5pcXVlUHRyVHVwbGU8VSwg RT4gbWFrZUNvbXBhY3RVbmlxdWVQdHIoQXJncyYmLi4uIGFyZ3MpOwogICAgIHRlbXBsYXRlPHR5 cGVuYW1lIFUsIHR5cGVuYW1lIEUsIHR5cGVuYW1lIEQsIHR5cGVuYW1lLi4uIEFyZ3M+IGZyaWVu ZCBDb21wYWN0VW5pcXVlUHRyVHVwbGU8VSwgRSwgRD4gbWFrZUNvbXBhY3RVbmlxdWVQdHIoQXJn cyYmLi4uIGFyZ3MpOwogCisgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFUsIHR5cGVuYW1lIFksIHR5 cGVuYW1lIEQ+IGZyaWVuZCBjbGFzcyBDb21wYWN0VW5pcXVlUHRyVHVwbGU7CisKICAgICBDb21w YWN0UG9pbnRlclR1cGxlPFQqLCBUeXBlPiBtX2RhdGE7CiB9OwogCkluZGV4OiBUb29scy9DaGFu Z2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjY2NzkpCisr KyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAyMC0w OS0wNiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAgICAgICBNYWtlIENv bXBhY3RVbmlxdWVQdHJUdXBsZSBhY3R1YWxseSB3b3JrIHdpdGggc3ViY2xhc3NpbmcgYW5kIGN1 c3RvbSBkZWxldGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTYyMjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0NvbXBhY3RVbmlxdWVQdHJUdXBsZS5jcHA6 CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpBOjp+QSk6IE1ha2UgdGhpcyB2aXJ0dWFsLgorICAg ICAgICAoVGVzdFdlYktpdEFQSTo6Qik6IEFkZGVkLgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6 Qjo6Qik6IEFkZGVkLgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6Qjo6fkIpOiBBZGRlZC4KKyAg ICAgICAgKFdURl9Db21wYWN0VW5pcXVlUHRyVHVwbGUuU3ViY2xhc3NpbmcpOiBBZGRlZC4gVGVz dHMgc3ViY2xhc3NpbmcuCisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpBRGVsZXRlcik6IEFkZGVk LgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6QURlbGV0ZXI6Om9wZXJhdG9yKCkgY29uc3QpOgor ICAgICAgICAoV1RGX0NvbXBhY3RVbmlxdWVQdHJUdXBsZS5EZWxldGVyKTogQWRkZWQuIFRlc3Rz IGEgY3VzdG9tIGRlbGV0ZXIuCisKIDIwMjAtMDktMDQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hy aXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBNb3ZlIFBERiBoZWFkcy11cCBkaXNwbGF5 IHRvIFVJIHByb2Nlc3Mgb24gbWFjT1MKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V1RGL0NvbXBhY3RVbmlxdWVQdHJUdXBsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XVEYvQ29tcGFjdFVuaXF1ZVB0clR1cGxlLmNwcAkocmV2aXNpb24gMjY2 NTc1KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvQ29tcGFjdFVuaXF1ZVB0clR1 cGxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzgsOCArMzgsOCBAQCBjbGFzcyBBIHsKIAogcHVi bGljOgogICAgIEEoKSB7ICsrc19jb25zdHJ1Y3RvckNhbGxDb3VudDsgfQotICAgIH5BKCkgeyAr K3NfZGVzdHJ1Y3RvckNhbGxDb3VudDsgfQotICAgIAorICAgIHZpcnR1YWwgfkEoKSB7ICsrc19k ZXN0cnVjdG9yQ2FsbENvdW50OyB9CisKICAgICBzdGF0aWMgdW5zaWduZWQgc19jb25zdHJ1Y3Rv ckNhbGxDb3VudDsKICAgICBzdGF0aWMgdW5zaWduZWQgc19kZXN0cnVjdG9yQ2FsbENvdW50Owog fTsKQEAgLTE0OSw0ICsxNDksMTc3IEBAIFRFU1QoV1RGX0NvbXBhY3RVbmlxdWVQdHJUdXBsZSwg QmFzaWMpCiAgICAgRVhQRUNUX0VRKDB4ZjJmMlUsIGIudHlwZSgpKTsKIH0KIAorY2xhc3MgQiA6 IHB1YmxpYyBBIHsKKyAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKKworcHVibGljOgorICAg IEIoKSB7ICsrc19jb25zdHJ1Y3RvckNhbGxDb3VudDsgfQorICAgIHZpcnR1YWwgfkIoKSB7ICsr c19kZXN0cnVjdG9yQ2FsbENvdW50OyB9CisKKyAgICBzdGF0aWMgdW5zaWduZWQgc19jb25zdHJ1 Y3RvckNhbGxDb3VudDsKKyAgICBzdGF0aWMgdW5zaWduZWQgc19kZXN0cnVjdG9yQ2FsbENvdW50 OworfTsKKwordW5zaWduZWQgQjo6c19jb25zdHJ1Y3RvckNhbGxDb3VudCA9IDA7Cit1bnNpZ25l ZCBCOjpzX2Rlc3RydWN0b3JDYWxsQ291bnQgPSAwOworCitURVNUKFdURl9Db21wYWN0VW5pcXVl UHRyVHVwbGUsIFN1YmNsYXNzaW5nKQoreworICAgIEE6OnNfY29uc3RydWN0b3JDYWxsQ291bnQg PSAwOworICAgIEE6OnNfZGVzdHJ1Y3RvckNhbGxDb3VudCA9IDA7CisgICAgQjo6c19jb25zdHJ1 Y3RvckNhbGxDb3VudCA9IDA7CisgICAgQjo6c19kZXN0cnVjdG9yQ2FsbENvdW50ID0gMDsKKwor ICAgIENvbXBhY3RVbmlxdWVQdHJUdXBsZTxCLCB1aW50MTZfdD4gZW1wdHk7CisgICAgRVhQRUNU X0VRKDBVLCBBOjpzX2NvbnN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMFUsIEE6 OnNfZGVzdHJ1Y3RvckNhbGxDb3VudCk7CisgICAgRVhQRUNUX0VRKDBVLCBCOjpzX2NvbnN0cnVj dG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMFUsIEI6OnNfZGVzdHJ1Y3RvckNhbGxDb3Vu dCk7CisgICAgRVhQRUNUX0VRKG51bGxwdHIsIGVtcHR5LnBvaW50ZXIoKSk7CisgICAgRVhQRUNU X0VRKDBVLCBlbXB0eS50eXBlKCkpOworCisgICAgQ29tcGFjdFVuaXF1ZVB0clR1cGxlPEIsIHVp bnQxNl90PiBiID0gbWFrZUNvbXBhY3RVbmlxdWVQdHI8QiwgdWludDE2X3Q+KCk7CisgICAgRVhQ RUNUX0VRKDFVLCBBOjpzX2NvbnN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMFUs IEE6OnNfZGVzdHJ1Y3RvckNhbGxDb3VudCk7CisgICAgRVhQRUNUX0VRKDFVLCBCOjpzX2NvbnN0 cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMFUsIEI6OnNfZGVzdHJ1Y3RvckNhbGxD b3VudCk7CisgICAgRVhQRUNUX05FKG51bGxwdHIsIGIucG9pbnRlcigpKTsKKyAgICBFWFBFQ1Rf RVEoMFUsIGIudHlwZSgpKTsKKworICAgIGIuc2V0VHlwZSgweGZmKTsKKyAgICBFWFBFQ1RfRVEo MVUsIEE6OnNfY29uc3RydWN0b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgwVSwgQTo6c19k ZXN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMVUsIEI6OnNfY29uc3RydWN0b3JD YWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgwVSwgQjo6c19kZXN0cnVjdG9yQ2FsbENvdW50KTsK KyAgICBFWFBFQ1RfTkUobnVsbHB0ciwgYi5wb2ludGVyKCkpOworICAgIEVYUEVDVF9FUSgweGZm VSwgYi50eXBlKCkpOworCisgICAgYi5zZXRQb2ludGVyKG51bGxwdHIpOworICAgIEVYUEVDVF9F USgxVSwgQTo6c19jb25zdHJ1Y3RvckNhbGxDb3VudCk7CisgICAgRVhQRUNUX0VRKDFVLCBBOjpz X2Rlc3RydWN0b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgxVSwgQjo6c19jb25zdHJ1Y3Rv ckNhbGxDb3VudCk7CisgICAgRVhQRUNUX0VRKDFVLCBCOjpzX2Rlc3RydWN0b3JDYWxsQ291bnQp OworICAgIEVYUEVDVF9FUShudWxscHRyLCBiLnBvaW50ZXIoKSk7CisgICAgRVhQRUNUX0VRKDB4 ZmZVLCBiLnR5cGUoKSk7CisKKyAgICBDb21wYWN0VW5pcXVlUHRyVHVwbGU8QSwgdWludDE2X3Q+ IGEgPSBtYWtlQ29tcGFjdFVuaXF1ZVB0cjxCLCB1aW50MTZfdD4oKTsKKyAgICBFWFBFQ1RfRVEo MlUsIEE6OnNfY29uc3RydWN0b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgxVSwgQTo6c19k ZXN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMlUsIEI6OnNfY29uc3RydWN0b3JD YWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgxVSwgQjo6c19kZXN0cnVjdG9yQ2FsbENvdW50KTsK KyAgICBFWFBFQ1RfTkUobnVsbHB0ciwgYS5wb2ludGVyKCkpOworICAgIEVYUEVDVF9FUSgwVSwg YS50eXBlKCkpOworCisgICAgYS5zZXRUeXBlKDB4MWMpOworICAgIEVYUEVDVF9FUSgyVSwgQTo6 c19jb25zdHJ1Y3RvckNhbGxDb3VudCk7CisgICAgRVhQRUNUX0VRKDFVLCBBOjpzX2Rlc3RydWN0 b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgyVSwgQjo6c19jb25zdHJ1Y3RvckNhbGxDb3Vu dCk7CisgICAgRVhQRUNUX0VRKDFVLCBCOjpzX2Rlc3RydWN0b3JDYWxsQ291bnQpOworICAgIEVY UEVDVF9ORShudWxscHRyLCBhLnBvaW50ZXIoKSk7CisgICAgRVhQRUNUX0VRKDB4MWNVLCBhLnR5 cGUoKSk7CisKKyAgICBhdXRvKiBvbGRQb2ludGVyID0gYS5wb2ludGVyKCk7CisgICAgYS5zZXRQ b2ludGVyKG1ha2VVbmlxdWU8Qj4oKSk7CisgICAgRVhQRUNUX0VRKDNVLCBBOjpzX2NvbnN0cnVj dG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMlUsIEE6OnNfZGVzdHJ1Y3RvckNhbGxDb3Vu dCk7CisgICAgRVhQRUNUX0VRKDNVLCBCOjpzX2NvbnN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBF WFBFQ1RfRVEoMlUsIEI6OnNfZGVzdHJ1Y3RvckNhbGxDb3VudCk7CisgICAgRVhQRUNUX05FKG9s ZFBvaW50ZXIsIGEucG9pbnRlcigpKTsKKyAgICBFWFBFQ1RfRVEoMHgxY1UsIGEudHlwZSgpKTsK KworICAgIGEgPSBtYWtlQ29tcGFjdFVuaXF1ZVB0cjxBLCB1aW50MTZfdD4oKTsKKyAgICBFWFBF Q1RfRVEoNFUsIEE6OnNfY29uc3RydWN0b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgzVSwg QTo6c19kZXN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoM1UsIEI6OnNfY29uc3Ry dWN0b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgzVSwgQjo6c19kZXN0cnVjdG9yQ2FsbENv dW50KTsKKyAgICBFWFBFQ1RfTkUob2xkUG9pbnRlciwgYS5wb2ludGVyKCkpOworICAgIEVYUEVD VF9FUSgwVSwgYS50eXBlKCkpOworCisgICAgYS5zZXRUeXBlKDB4ZmVkKTsKKyAgICBFWFBFQ1Rf RVEoNFUsIEE6OnNfY29uc3RydWN0b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgzVSwgQTo6 c19kZXN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoM1UsIEI6OnNfY29uc3RydWN0 b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgzVSwgQjo6c19kZXN0cnVjdG9yQ2FsbENvdW50 KTsKKyAgICBFWFBFQ1RfTkUobnVsbHB0ciwgYS5wb2ludGVyKCkpOworICAgIEVYUEVDVF9FUSgw eGZlZFUsIGEudHlwZSgpKTsKKworICAgIG9sZFBvaW50ZXIgPSBhLnBvaW50ZXIoKTsKKyAgICBh dXRvIHVuaXF1ZUEgPSBhLm1vdmVUb1VuaXF1ZVB0cigpOworICAgIEVYUEVDVF9FUSg0VSwgQTo6 c19jb25zdHJ1Y3RvckNhbGxDb3VudCk7CisgICAgRVhQRUNUX0VRKDNVLCBBOjpzX2Rlc3RydWN0 b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgzVSwgQjo6c19jb25zdHJ1Y3RvckNhbGxDb3Vu dCk7CisgICAgRVhQRUNUX0VRKDNVLCBCOjpzX2Rlc3RydWN0b3JDYWxsQ291bnQpOworICAgIEVY UEVDVF9FUShudWxscHRyLCBhLnBvaW50ZXIoKSk7CisgICAgRVhQRUNUX0VRKG9sZFBvaW50ZXIs IHVuaXF1ZUEuZ2V0KCkpOworICAgIEVYUEVDVF9FUSgweGZlZFUsIGEudHlwZSgpKTsKKyAgICAK KyAgICB1bmlxdWVBID0gbnVsbHB0cjsKKyAgICBFWFBFQ1RfRVEoNFUsIEE6OnNfY29uc3RydWN0 b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSg0VSwgQTo6c19kZXN0cnVjdG9yQ2FsbENvdW50 KTsKKyAgICBFWFBFQ1RfRVEoM1UsIEI6OnNfY29uc3RydWN0b3JDYWxsQ291bnQpOworICAgIEVY UEVDVF9FUSgzVSwgQjo6c19kZXN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEobnVs bHB0ciwgYS5wb2ludGVyKCkpOworICAgIEVYUEVDVF9FUShudWxscHRyLCB1bmlxdWVBLmdldCgp KTsKKyAgICBFWFBFQ1RfRVEoMHhmZWRVLCBhLnR5cGUoKSk7Cit9CisKK3N0cnVjdCBBRGVsZXRl ciB7CisgICAgc3RhdGljIHVuc2lnbmVkIHNfY2FsbENvdW50OworCisgICAgdm9pZCBvcGVyYXRv cigpKEEqIGEpIGNvbnN0CisgICAgeworICAgICAgICArK3NfY2FsbENvdW50OworICAgICAgICBk ZWxldGUgYTsKKyAgICB9Cit9OworCit1bnNpZ25lZCBBRGVsZXRlcjo6c19jYWxsQ291bnQgPSAw OworCitURVNUKFdURl9Db21wYWN0VW5pcXVlUHRyVHVwbGUsIERlbGV0ZXIpCit7CisgICAgQTo6 c19jb25zdHJ1Y3RvckNhbGxDb3VudCA9IDA7CisgICAgQTo6c19kZXN0cnVjdG9yQ2FsbENvdW50 ID0gMDsKKyAgICBCOjpzX2NvbnN0cnVjdG9yQ2FsbENvdW50ID0gMDsKKyAgICBCOjpzX2Rlc3Ry dWN0b3JDYWxsQ291bnQgPSAwOworICAgIEFEZWxldGVyOjpzX2NhbGxDb3VudCA9IDA7CisKKyAg ICBDb21wYWN0VW5pcXVlUHRyVHVwbGU8QiwgdWludDE2X3QsIEFEZWxldGVyPiBlbXB0eTsKKyAg ICBFWFBFQ1RfRVEoMFUsIEE6OnNfY29uc3RydWN0b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9F USgwVSwgQTo6c19kZXN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMFUsIEI6OnNf Y29uc3RydWN0b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgwVSwgQjo6c19kZXN0cnVjdG9y Q2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMFUsIEFEZWxldGVyOjpzX2NhbGxDb3VudCk7Cisg ICAgRVhQRUNUX0VRKG51bGxwdHIsIGVtcHR5LnBvaW50ZXIoKSk7CisgICAgRVhQRUNUX0VRKDBV LCBlbXB0eS50eXBlKCkpOworCisgICAgQ29tcGFjdFVuaXF1ZVB0clR1cGxlPEEsIHVpbnQxNl90 LCBBRGVsZXRlcj4gYSA9IG1ha2VDb21wYWN0VW5pcXVlUHRyPEEsIHVpbnQxNl90LCBBRGVsZXRl cj4oKTsKKyAgICBFWFBFQ1RfRVEoMVUsIEE6OnNfY29uc3RydWN0b3JDYWxsQ291bnQpOworICAg IEVYUEVDVF9FUSgwVSwgQTo6c19kZXN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEo MFUsIEI6OnNfY29uc3RydWN0b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgwVSwgQjo6c19k ZXN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMFUsIEFEZWxldGVyOjpzX2NhbGxD b3VudCk7CisgICAgRVhQRUNUX05FKG51bGxwdHIsIGEucG9pbnRlcigpKTsKKyAgICBFWFBFQ1Rf RVEoMFUsIGEudHlwZSgpKTsKKworICAgIGEuc2V0VHlwZSgweDdlODlVKTsKKyAgICBFWFBFQ1Rf RVEoMVUsIEE6OnNfY29uc3RydWN0b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgwVSwgQTo6 c19kZXN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMFUsIEI6OnNfY29uc3RydWN0 b3JDYWxsQ291bnQpOworICAgIEVYUEVDVF9FUSgwVSwgQjo6c19kZXN0cnVjdG9yQ2FsbENvdW50 KTsKKyAgICBFWFBFQ1RfRVEoMFUsIEFEZWxldGVyOjpzX2NhbGxDb3VudCk7CisgICAgRVhQRUNU X05FKG51bGxwdHIsIGEucG9pbnRlcigpKTsKKyAgICBFWFBFQ1RfRVEoMHg3ZTg5VSwgYS50eXBl KCkpOworCisgICAgYXV0byogb2xkUG9pbnRlciA9IGEucG9pbnRlcigpOworICAgIGEuc2V0UG9p bnRlcihzdGQ6OnVuaXF1ZV9wdHI8QiwgQURlbGV0ZXI+KG5ldyBCKSk7CisgICAgRVhQRUNUX0VR KDJVLCBBOjpzX2NvbnN0cnVjdG9yQ2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMVUsIEE6OnNf ZGVzdHJ1Y3RvckNhbGxDb3VudCk7CisgICAgRVhQRUNUX0VRKDFVLCBCOjpzX2NvbnN0cnVjdG9y Q2FsbENvdW50KTsKKyAgICBFWFBFQ1RfRVEoMFUsIEI6OnNfZGVzdHJ1Y3RvckNhbGxDb3VudCk7 CisgICAgRVhQRUNUX0VRKDFVLCBBRGVsZXRlcjo6c19jYWxsQ291bnQpOworICAgIEVYUEVDVF9O RShvbGRQb2ludGVyLCBhLnBvaW50ZXIoKSk7CisgICAgRVhQRUNUX0VRKDB4N2U4OVUsIGEudHlw ZSgpKTsKKworfQorCiB9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCg==