198175 2019-05-23 00:30:13 -0700 [WHLSL] Add a helper for in-place AST mutation 2019-05-23 12:55:17 -0700 1 1 1 Unclassified WebKit WebGPU Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield saam commit-queue jfbastien saam webkit-bug-importer oldest_to_newest 1538600 0 mmaxfield 2019-05-23 00:30:13 -0700 Something like template <typename Old, typename New, typename ...Args> New* replace(Old& old, Args&&... args) { static_assert(sizeof(New) <= sizeof(Old)); return new (&old) New(std::forward<Args>(args)...); } 1538693 1 saam 2019-05-23 10:54:20 -0700 patch forthcoming 1538721 2 370510 saam 2019-05-23 11:26:03 -0700 Created attachment 370510 patch 1538723 3 370510 mmaxfield 2019-05-23 11:32:05 -0700 Comment on attachment 370510 patch View in context: https://bugs.webkit.org/attachment.cgi?id=370510&action=review > Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLNode.h:56 > + return new (&old) New(std::forward<Args>(args)...); Don’t you have to save the address of “old” before you call its destructor? 1538729 4 saam 2019-05-23 11:38:47 -0700 (In reply to Myles C. Maxfield from comment #3) > Comment on attachment 370510 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=370510&action=review > > > Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLNode.h:56 > > + return new (&old) New(std::forward<Args>(args)...); > > Don’t you have to save the address of “old” before you call its destructor? Spoke with Myles offline. This code is probably fine (since dtor is just a method call), but we're just going to be explicit and do it before. 1538730 5 370512 saam 2019-05-23 11:40:04 -0700 Created attachment 370512 patch for landing 1538752 6 370512 commit-queue 2019-05-23 12:55:00 -0700 Comment on attachment 370512 patch for landing Clearing flags on attachment: 370512 Committed r245706: <https://trac.webkit.org/changeset/245706> 1538753 7 commit-queue 2019-05-23 12:55:01 -0700 All reviewed patches have been landed. Closing bug. 1538754 8 webkit-bug-importer 2019-05-23 12:55:17 -0700 <rdar://problem/51079016> 370510 2019-05-23 11:26:03 -0700 2019-05-23 11:40:04 -0700 patch b-backup.diff text/plain 11208 saam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0NTY5OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDE5LTA1LTIzICBTYWFtIGJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFtXSExTTF0gQWRkIGEgaGVscGVy IGZvciBpbi1wbGFjZSBBU1QgbXV0YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE5ODE3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgbWFrZXMgV0hMU0wgQVNUIG11dGF0aW9uIGNvZGUgYSBi aXQgZWFzaWVyIHRvIHJlYWQgYW5kIHdyaXRlLgorICAgICAgICAKKyAgICAgICAgQ29kZSB0aGF0 IGxvb2tlZCBsaWtlOgorICAgICAgICBgYGAKKyAgICAgICAgc3RhdGljX2Fzc2VydChzaXplb2Yo QVNUOjpEZXJlZmVyZW5jZUV4cHJlc3Npb24pIDw9IHNpemVvZihBU1Q6OkRvdEV4cHJlc3Npb24p LCAiRG90IGV4cHJlc3Npb25zIG5lZWQgdG8gYmUgYWJsZSB0byBiZWNvbWUgZGVyZWZlcmVuY2Ug ZXhwcmVzc2lvbnMgd2l0aG91dCB1cGRhdGluZyBiYWNrcmVmZXJlbmNlcyIpOworICAgICAgICB2 b2lkKiBsb2NhdGlvbiA9ICZkb3RFeHByZXNzaW9uOworICAgICAgICBkb3RFeHByZXNzaW9uLn5E b3RFeHByZXNzaW9uKCk7CisgICAgICAgIGF1dG8qIGRlcmVmZXJlbmNlRXhwcmVzc2lvbiA9IG5l dyAobG9jYXRpb24pIEFTVDo6RGVyZWZlcmVuY2VFeHByZXNzaW9uKFdURk1vdmUob3JpZ2luKSwg V1RGTW92ZShjYWxsRXhwcmVzc2lvbikpOworICAgICAgICBgYGAKKyAgICAgICAgCisgICAgICAg IENhbiBub3cgYmU6CisgICAgICAgIGBgYAorICAgICAgICBhdXRvKiBkZXJlZmVyZW5jZUV4cHJl c3Npb24gPSBBU1Q6OnJlcGxhY2VXaXRoPEFTVDo6RGVyZWZlcmVuY2VFeHByZXNzaW9uPihkb3RF eHByZXNzaW9uLCBXVEZNb3ZlKG9yaWdpbiksIFdURk1vdmUoY2FsbEV4cHJlc3Npb24pKTsKKyAg ICAgICAgYGBgCisKKyAgICAgICAgKiBNb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xOb2Rl Lmg6CisgICAgICAgIChXZWJDb3JlOjpXSExTTDo6QVNUOjpyZXBsYWNlV2l0aCk6CisgICAgICAg ICogTW9kdWxlcy93ZWJncHUvV0hMU0wvV0hMU0xOYW1lUmVzb2x2ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6V0hMU0w6Ok5hbWVSZXNvbHZlcjo6dmlzaXQpOgorICAgICAgICAqIE1vZHVsZXMv d2ViZ3B1L1dITFNML1dITFNMUHJvcGVydHlSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpXSExTTDo6UHJvcGVydHlSZXNvbHZlcjo6dmlzaXQpOgorICAgICAgICAoV2ViQ29yZTo6V0hM U0w6OlByb3BlcnR5UmVzb2x2ZXI6OnNpbXBsaWZ5UmlnaHRWYWx1ZSk6CisgICAgICAgIChXZWJD b3JlOjpXSExTTDo6TGVmdFZhbHVlU2ltcGxpZmllcjo6dmlzaXQpOgorCiAyMDE5LTA1LTIzICBB bnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW1BvaW50ZXIgRXZl bnRzXSBDb21wYXRpYmlsaXR5IG1vdXNlIGV2ZW50cyBjYW4gb25seSBiZSBwcmV2ZW50ZWQgd2hp bGUgdGhlIHBvaW50ZXIgaXMgcHJlc3NlZApJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJncHUvV0hMU0wvV0hMU0xOYW1lUmVzb2x2ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMTmFtZVJlc29sdmVyLmNwcAkocmV2aXNp b24gMjQ1NjkyKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvV0hMU0xO YW1lUmVzb2x2ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTQsMTIgKzE5NCw5IEBAIHZvaWQg TmFtZVJlc29sdmVyOjp2aXNpdChBU1Q6OkRvdEV4cHJlc3MKICAgICAgICAgICAgICAgICBBU1Q6 OkVudW1lcmF0aW9uRGVmaW5pdGlvbiYgZW51bWVyYXRpb25EZWZpbml0aW9uID0gZG93bmNhc3Q8 QVNUOjpFbnVtZXJhdGlvbkRlZmluaXRpb24+KHR5cGUpOwogICAgICAgICAgICAgICAgIGF1dG8g bWVtYmVyTmFtZSA9IGRvdEV4cHJlc3Npb24uZmllbGROYW1lKCk7CiAgICAgICAgICAgICAgICAg aWYgKGF1dG8qIG1lbWJlciA9IGVudW1lcmF0aW9uRGVmaW5pdGlvbi5tZW1iZXJCeU5hbWUobWVt YmVyTmFtZSkpIHsKLSAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Fzc2VydChzaXplb2YoQVNU OjpFbnVtZXJhdGlvbk1lbWJlckxpdGVyYWwpIDw9IHNpemVvZihBU1Q6OkRvdEV4cHJlc3Npb24p LCAiRG90IGV4cHJlc3Npb25zIG5lZWQgdG8gYmUgYWJsZSB0byBiZWNvbWUgRW51bWVyYXRpb25N ZW1iZXJMaXRlcmFscyB3aXRob3V0IHVwZGF0aW5nIGJhY2tyZWZlcmVuY2VzIik7CiAgICAgICAg ICAgICAgICAgICAgIExleGVyOjpUb2tlbiBvcmlnaW4gPSBkb3RFeHByZXNzaW9uLm9yaWdpbigp OwotICAgICAgICAgICAgICAgICAgICB2b2lkKiBsb2NhdGlvbiA9ICZkb3RFeHByZXNzaW9uOwot ICAgICAgICAgICAgICAgICAgICBkb3RFeHByZXNzaW9uLn5Eb3RFeHByZXNzaW9uKCk7CiAgICAg ICAgICAgICAgICAgICAgIGF1dG8gZW51bWVyYXRpb25NZW1iZXJMaXRlcmFsID0gQVNUOjpFbnVt ZXJhdGlvbk1lbWJlckxpdGVyYWw6OndyYXAoV1RGTW92ZShvcmlnaW4pLCBXVEZNb3ZlKGJhc2VO YW1lKSwgV1RGTW92ZShtZW1iZXJOYW1lKSwgZW51bWVyYXRpb25EZWZpbml0aW9uLCAqbWVtYmVy KTsKLSAgICAgICAgICAgICAgICAgICAgbmV3IChsb2NhdGlvbikgQVNUOjpFbnVtZXJhdGlvbk1l bWJlckxpdGVyYWwoV1RGTW92ZShlbnVtZXJhdGlvbk1lbWJlckxpdGVyYWwpKTsKKyAgICAgICAg ICAgICAgICAgICAgQVNUOjpyZXBsYWNlV2l0aDxBU1Q6OkVudW1lcmF0aW9uTWVtYmVyTGl0ZXJh bD4oZG90RXhwcmVzc2lvbiwgV1RGTW92ZShlbnVtZXJhdGlvbk1lbWJlckxpdGVyYWwpKTsKICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg ICAgICBzZXRFcnJvcigpOwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hM U0wvV0hMU0xQcm9wZXJ0eVJlc29sdmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9XSExTTFByb3BlcnR5UmVzb2x2ZXIuY3BwCShyZXZpc2lv biAyNDU2OTIpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9XSExTTFBy b3BlcnR5UmVzb2x2ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MDQsMTEgKzQwNCw4IEBAIHZv aWQgUHJvcGVydHlSZXNvbHZlcjo6dmlzaXQoQVNUOjpBc3NpZ24KICAgICB9CiAgICAgc2ltcGxp ZnlMZWZ0VmFsdWUobW9kaWZ5UmVzdWx0LT5pbm5lckxlZnRWYWx1ZSk7CiAKLSAgICBzdGF0aWNf YXNzZXJ0KHNpemVvZihBU1Q6OkNvbW1hRXhwcmVzc2lvbikgPD0gc2l6ZW9mKEFTVDo6QXNzaWdu bWVudEV4cHJlc3Npb24pLCAiQXNzaWdubWVudCBleHByZXNzaW9ucyBuZWVkIHRvIGJlIGFibGUg dG8gYmVjb21lIGNvbW1hIGV4cHJlc3Npb25zIHdpdGhvdXQgdXBkYXRpbmcgYmFja3JlZmVyZW5j ZXMiKTsKICAgICBMZXhlcjo6VG9rZW4gb3JpZ2luID0gYXNzaWdubWVudEV4cHJlc3Npb24ub3Jp Z2luKCk7Ci0gICAgdm9pZCogbG9jYXRpb24gPSAmYXNzaWdubWVudEV4cHJlc3Npb247Ci0gICAg YXNzaWdubWVudEV4cHJlc3Npb24ufkFzc2lnbm1lbnRFeHByZXNzaW9uKCk7Ci0gICAgYXV0byog Y29tbWFFeHByZXNzaW9uID0gbmV3IChsb2NhdGlvbikgQVNUOjpDb21tYUV4cHJlc3Npb24oV1RG TW92ZShvcmlnaW4pLCBXVEZNb3ZlKG1vZGlmeVJlc3VsdC0+ZXhwcmVzc2lvbnMpKTsKKyAgICBh dXRvKiBjb21tYUV4cHJlc3Npb24gPSBBU1Q6OnJlcGxhY2VXaXRoPEFTVDo6Q29tbWFFeHByZXNz aW9uPihhc3NpZ25tZW50RXhwcmVzc2lvbiwgV1RGTW92ZShvcmlnaW4pLCBXVEZNb3ZlKG1vZGlm eVJlc3VsdC0+ZXhwcmVzc2lvbnMpKTsKICAgICBjb21tYUV4cHJlc3Npb24tPnNldFR5cGUoV1RG TW92ZSh0eXBlKSk7CiAgICAgY29tbWFFeHByZXNzaW9uLT5zZXRUeXBlQW5ub3RhdGlvbihBU1Q6 OlJpZ2h0VmFsdWUoKSk7CiAKQEAgLTUxMywxMSArNTEwLDggQEAgdm9pZCBQcm9wZXJ0eVJlc29s dmVyOjp2aXNpdChBU1Q6OlJlYWRNbwogICAgICAgICBVbmlxdWVSZWY8QVNUOjpWYXJpYWJsZURl Y2xhcmF0aW9uPiBvbGRWYXJpYWJsZURlY2xhcmF0aW9uID0gcmVhZE1vZGlmeVdyaXRlRXhwcmVz c2lvbi50YWtlT2xkVmFsdWUoKTsKICAgICAgICAgVW5pcXVlUmVmPEFTVDo6VmFyaWFibGVEZWNs YXJhdGlvbj4gbmV3VmFyaWFibGVEZWNsYXJhdGlvbiA9IHJlYWRNb2RpZnlXcml0ZUV4cHJlc3Np b24udGFrZU5ld1ZhbHVlKCk7CiAKLSAgICAgICAgc3RhdGljX2Fzc2VydChzaXplb2YoQVNUOjpD b21tYUV4cHJlc3Npb24pIDw9IHNpemVvZihBU1Q6OlJlYWRNb2RpZnlXcml0ZUV4cHJlc3Npb24p LCAiUmVhZE1vZGlmeVdyaXRlIGV4cHJlc3Npb25zIG5lZWQgdG8gYmUgYWJsZSB0byBiZWNvbWUg Y29tbWEgZXhwcmVzc2lvbnMgd2l0aG91dCB1cGRhdGluZyBiYWNrcmVmZXJlbmNlcyIpOwogICAg ICAgICBMZXhlcjo6VG9rZW4gb3JpZ2luID0gcmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lvbi5vcmln aW4oKTsKLSAgICAgICAgdm9pZCogbG9jYXRpb24gPSAmcmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lv bjsKLSAgICAgICAgcmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lvbi5+UmVhZE1vZGlmeVdyaXRlRXhw cmVzc2lvbigpOwotICAgICAgICBhdXRvKiBjb21tYUV4cHJlc3Npb24gPSBuZXcgKGxvY2F0aW9u KSBBU1Q6OkNvbW1hRXhwcmVzc2lvbihXVEZNb3ZlKG9yaWdpbiksIFdURk1vdmUoZXhwcmVzc2lv bnMpKTsKKyAgICAgICAgYXV0byogY29tbWFFeHByZXNzaW9uID0gQVNUOjpyZXBsYWNlV2l0aDxB U1Q6OkNvbW1hRXhwcmVzc2lvbj4ocmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lvbiwgV1RGTW92ZShv cmlnaW4pLCBXVEZNb3ZlKGV4cHJlc3Npb25zKSk7CiAgICAgICAgIGNvbW1hRXhwcmVzc2lvbi0+ c2V0VHlwZShXVEZNb3ZlKHR5cGUpKTsKICAgICAgICAgY29tbWFFeHByZXNzaW9uLT5zZXRUeXBl QW5ub3RhdGlvbihBU1Q6OlJpZ2h0VmFsdWUoKSk7CiAKQEAgLTU4MCwxMSArNTc0LDggQEAgdm9p ZCBQcm9wZXJ0eVJlc29sdmVyOjp2aXNpdChBU1Q6OlJlYWRNbwogICAgIFVuaXF1ZVJlZjxBU1Q6 OlZhcmlhYmxlRGVjbGFyYXRpb24+IG9sZFZhcmlhYmxlRGVjbGFyYXRpb24gPSByZWFkTW9kaWZ5 V3JpdGVFeHByZXNzaW9uLnRha2VPbGRWYWx1ZSgpOwogICAgIFVuaXF1ZVJlZjxBU1Q6OlZhcmlh YmxlRGVjbGFyYXRpb24+IG5ld1ZhcmlhYmxlRGVjbGFyYXRpb24gPSByZWFkTW9kaWZ5V3JpdGVF eHByZXNzaW9uLnRha2VOZXdWYWx1ZSgpOwogCi0gICAgc3RhdGljX2Fzc2VydChzaXplb2YoQVNU OjpDb21tYUV4cHJlc3Npb24pIDw9IHNpemVvZihBU1Q6OlJlYWRNb2RpZnlXcml0ZUV4cHJlc3Np b24pLCAiUmVhZE1vZGlmeVdyaXRlIGV4cHJlc3Npb25zIG5lZWQgdG8gYmUgYWJsZSB0byBiZWNv bWUgY29tbWEgZXhwcmVzc2lvbnMgd2l0aG91dCB1cGRhdGluZyBiYWNrcmVmZXJlbmNlcyIpOwog ICAgIExleGVyOjpUb2tlbiBvcmlnaW4gPSByZWFkTW9kaWZ5V3JpdGVFeHByZXNzaW9uLm9yaWdp bigpOwotICAgIHZvaWQqIGxvY2F0aW9uID0gJnJlYWRNb2RpZnlXcml0ZUV4cHJlc3Npb247Ci0g ICAgcmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lvbi5+UmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lvbigp OwotICAgIGF1dG8qIGNvbW1hRXhwcmVzc2lvbiA9IG5ldyAobG9jYXRpb24pIEFTVDo6Q29tbWFF eHByZXNzaW9uKFdURk1vdmUob3JpZ2luKSwgV1RGTW92ZShtb2RpZnlSZXN1bHQtPmV4cHJlc3Np b25zKSk7CisgICAgYXV0byogY29tbWFFeHByZXNzaW9uID0gQVNUOjpyZXBsYWNlV2l0aDxBU1Q6 OkNvbW1hRXhwcmVzc2lvbj4ocmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lvbiwgV1RGTW92ZShvcmln aW4pLCBXVEZNb3ZlKG1vZGlmeVJlc3VsdC0+ZXhwcmVzc2lvbnMpKTsKICAgICBjb21tYUV4cHJl c3Npb24tPnNldFR5cGUoV1RGTW92ZSh0eXBlKSk7CiAgICAgY29tbWFFeHByZXNzaW9uLT5zZXRU eXBlQW5ub3RhdGlvbihBU1Q6OlJpZ2h0VmFsdWUoKSk7CiAKQEAgLTYxMiwxMCArNjAzLDcgQEAg Ym9vbCBQcm9wZXJ0eVJlc29sdmVyOjpzaW1wbGlmeVJpZ2h0VmFsdQogICAgICAgICAgICAgY2Fs bEV4cHJlc3Npb24tPnNldFR5cGVBbm5vdGF0aW9uKEFTVDo6UmlnaHRWYWx1ZSgpKTsKICAgICAg ICAgICAgIGNhbGxFeHByZXNzaW9uLT5zZXRGdW5jdGlvbigqYW5kZXJGdW5jdGlvbik7CiAKLSAg ICAgICAgICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKEFTVDo6RGVyZWZlcmVuY2VFeHByZXNzaW9u KSA8PSBzaXplb2YoQVNUOjpEb3RFeHByZXNzaW9uKSwgIkRvdCBleHByZXNzaW9ucyBuZWVkIHRv IGJlIGFibGUgdG8gYmVjb21lIGRlcmVmZXJlbmNlIGV4cHJlc3Npb25zIHdpdGhvdXQgdXBkYXRp bmcgYmFja3JlZmVyZW5jZXMiKTsKLSAgICAgICAgICAgIHZvaWQqIGxvY2F0aW9uID0gJmRvdEV4 cHJlc3Npb247Ci0gICAgICAgICAgICBkb3RFeHByZXNzaW9uLn5Eb3RFeHByZXNzaW9uKCk7Ci0g ICAgICAgICAgICBhdXRvKiBkZXJlZmVyZW5jZUV4cHJlc3Npb24gPSBuZXcgKGxvY2F0aW9uKSBB U1Q6OkRlcmVmZXJlbmNlRXhwcmVzc2lvbihXVEZNb3ZlKG9yaWdpbiksIFdURk1vdmUoY2FsbEV4 cHJlc3Npb24pKTsKKyAgICAgICAgICAgIGF1dG8qIGRlcmVmZXJlbmNlRXhwcmVzc2lvbiA9IEFT VDo6cmVwbGFjZVdpdGg8QVNUOjpEZXJlZmVyZW5jZUV4cHJlc3Npb24+KGRvdEV4cHJlc3Npb24s IFdURk1vdmUob3JpZ2luKSwgV1RGTW92ZShjYWxsRXhwcmVzc2lvbikpOwogICAgICAgICAgICAg ZGVyZWZlcmVuY2VFeHByZXNzaW9uLT5zZXRUeXBlKGRvd25jYXN0PEFTVDo6UG9pbnRlclR5cGU+ KGFuZGVyRnVuY3Rpb24tPnR5cGUoKSkuZWxlbWVudFR5cGUoKS5jbG9uZSgpKTsKICAgICAgICAg ICAgIGRlcmVmZXJlbmNlRXhwcmVzc2lvbi0+c2V0VHlwZUFubm90YXRpb24oQVNUOjpMZWZ0VmFs dWUgeyBkb3duY2FzdDxBU1Q6OlBvaW50ZXJUeXBlPihhbmRlckZ1bmN0aW9uLT50eXBlKCkpLmFk ZHJlc3NTcGFjZSgpIH0pOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC02NTUsMTMgKzY0 MywxMCBAQCBib29sIFByb3BlcnR5UmVzb2x2ZXI6OnNpbXBsaWZ5UmlnaHRWYWx1CiAgICAgICAg IGRlcmVmZXJlbmNlRXhwcmVzc2lvbi0+c2V0VHlwZShkb3duY2FzdDxBU1Q6OlBvaW50ZXJUeXBl PihhbmRlckZ1bmN0aW9uLT50eXBlKCkpLmVsZW1lbnRUeXBlKCkuY2xvbmUoKSk7CiAgICAgICAg IGRlcmVmZXJlbmNlRXhwcmVzc2lvbi0+c2V0VHlwZUFubm90YXRpb24oQVNUOjpMZWZ0VmFsdWUg eyBBU1Q6OkFkZHJlc3NTcGFjZTo6VGhyZWFkIH0pOwogCi0gICAgICAgIHN0YXRpY19hc3NlcnQo c2l6ZW9mKEFTVDo6Q29tbWFFeHByZXNzaW9uKSA8PSBzaXplb2YoQVNUOjpEb3RFeHByZXNzaW9u KSwgIkRvdCBleHByZXNzaW9ucyBuZWVkIHRvIGJlIGFibGUgdG8gYmVjb21lIGNvbW1hIGV4cHJl c3Npb25zIHdpdGhvdXQgdXBkYXRpbmcgYmFja3JlZmVyZW5jZXMiKTsKLSAgICAgICAgdm9pZCog bG9jYXRpb24gPSAmZG90RXhwcmVzc2lvbjsKLSAgICAgICAgZG90RXhwcmVzc2lvbi5+RG90RXhw cmVzc2lvbigpOwogICAgICAgICBWZWN0b3I8VW5pcXVlUmVmPEFTVDo6RXhwcmVzc2lvbj4+IGV4 cHJlc3Npb25zOwogICAgICAgICBleHByZXNzaW9ucy5hcHBlbmQoV1RGTW92ZShhc3NpZ25tZW50 RXhwcmVzc2lvbikpOwogICAgICAgICBleHByZXNzaW9ucy5hcHBlbmQoV1RGTW92ZShkZXJlZmVy ZW5jZUV4cHJlc3Npb24pKTsKLSAgICAgICAgYXV0byogY29tbWFFeHByZXNzaW9uID0gbmV3IChs b2NhdGlvbikgQVNUOjpDb21tYUV4cHJlc3Npb24oV1RGTW92ZShvcmlnaW4pLCBXVEZNb3ZlKGV4 cHJlc3Npb25zKSk7CisgICAgICAgIGF1dG8qIGNvbW1hRXhwcmVzc2lvbiA9IEFTVDo6cmVwbGFj ZVdpdGg8QVNUOjpDb21tYUV4cHJlc3Npb24+KGRvdEV4cHJlc3Npb24sIFdURk1vdmUob3JpZ2lu KSwgV1RGTW92ZShleHByZXNzaW9ucykpOwogICAgICAgICBjb21tYUV4cHJlc3Npb24tPnNldFR5 cGUoZG93bmNhc3Q8QVNUOjpQb2ludGVyVHlwZT4oYW5kZXJGdW5jdGlvbi0+dHlwZSgpKS5lbGVt ZW50VHlwZSgpLmNsb25lKCkpOwogICAgICAgICBjb21tYUV4cHJlc3Npb24tPnNldFR5cGVBbm5v dGF0aW9uKEFTVDo6TGVmdFZhbHVlIHsgQVNUOjpBZGRyZXNzU3BhY2U6OlRocmVhZCB9KTsKIApA QCAtNjY5LDE0ICs2NTQsMTEgQEAgYm9vbCBQcm9wZXJ0eVJlc29sdmVyOjpzaW1wbGlmeVJpZ2h0 VmFsdQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKLSAgICBzdGF0aWNfYXNzZXJ0KHNp emVvZihBU1Q6OkNhbGxFeHByZXNzaW9uKSA8PSBzaXplb2YoQVNUOjpEb3RFeHByZXNzaW9uKSwg IkRvdCBleHByZXNzaW9ucyBuZWVkIHRvIGJlIGFibGUgdG8gYmVjb21lIGNhbGwgZXhwcmVzc2lv bnMgd2l0aG91dCB1cGRhdGluZyBiYWNrcmVmZXJlbmNlcyIpOwogICAgIEFTU0VSVChkb3RFeHBy ZXNzaW9uLmdldHRlckZ1bmN0aW9uKCkpOwogICAgIGF1dG8mIGdldHRlckZ1bmN0aW9uID0gKmRv dEV4cHJlc3Npb24uZ2V0dGVyRnVuY3Rpb24oKTsKICAgICBWZWN0b3I8VW5pcXVlUmVmPEFTVDo6 RXhwcmVzc2lvbj4+IGFyZ3VtZW50czsKICAgICBhcmd1bWVudHMuYXBwZW5kKGRvdEV4cHJlc3Np b24udGFrZUJhc2UoKSk7Ci0gICAgdm9pZCogbG9jYXRpb24gPSAmZG90RXhwcmVzc2lvbjsKLSAg ICBkb3RFeHByZXNzaW9uLn5Eb3RFeHByZXNzaW9uKCk7Ci0gICAgYXV0byogY2FsbEV4cHJlc3Np b24gPSBuZXcgKGxvY2F0aW9uKSBBU1Q6OkNhbGxFeHByZXNzaW9uKFdURk1vdmUob3JpZ2luKSwg U3RyaW5nKGdldHRlckZ1bmN0aW9uLm5hbWUoKSksIFdURk1vdmUoYXJndW1lbnRzKSk7CisgICAg YXV0byogY2FsbEV4cHJlc3Npb24gPSBBU1Q6OnJlcGxhY2VXaXRoPEFTVDo6Q2FsbEV4cHJlc3Np b24+KGRvdEV4cHJlc3Npb24sIFdURk1vdmUob3JpZ2luKSwgU3RyaW5nKGdldHRlckZ1bmN0aW9u Lm5hbWUoKSksIFdURk1vdmUoYXJndW1lbnRzKSk7CiAgICAgY2FsbEV4cHJlc3Npb24tPnNldEZ1 bmN0aW9uKGdldHRlckZ1bmN0aW9uKTsKICAgICBjYWxsRXhwcmVzc2lvbi0+c2V0VHlwZShnZXR0 ZXJGdW5jdGlvbi50eXBlKCkuY2xvbmUoKSk7CiAgICAgY2FsbEV4cHJlc3Npb24tPnNldFR5cGVB bm5vdGF0aW9uKEFTVDo6UmlnaHRWYWx1ZSgpKTsKQEAgLTcxMiwxMCArNjk0LDcgQEAgdm9pZCBM ZWZ0VmFsdWVTaW1wbGlmaWVyOjp2aXNpdChBU1Q6OkRvdAogICAgIGNhbGxFeHByZXNzaW9uLT5z ZXRUeXBlQW5ub3RhdGlvbihBU1Q6OlJpZ2h0VmFsdWUoKSk7CiAgICAgY2FsbEV4cHJlc3Npb24t PnNldEZ1bmN0aW9uKCphbmRlckZ1bmN0aW9uKTsKIAotICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9m KEFTVDo6RGVyZWZlcmVuY2VFeHByZXNzaW9uKSA8PSBzaXplb2YoQVNUOjpEb3RFeHByZXNzaW9u KSwgIkRvdCBleHByZXNzaW9ucyBuZWVkIHRvIGJlIGFibGUgdG8gYmVjb21lIGRlcmVmZXJlbmNl IGV4cHJlc3Npb25zIHdpdGhvdXQgdXBkYXRpbmcgYmFja3JlZmVyZW5jZXMiKTsKLSAgICB2b2lk KiBsb2NhdGlvbiA9ICZkb3RFeHByZXNzaW9uOwotICAgIGRvdEV4cHJlc3Npb24ufkRvdEV4cHJl c3Npb24oKTsKLSAgICBhdXRvKiBkZXJlZmVyZW5jZUV4cHJlc3Npb24gPSBuZXcgKGxvY2F0aW9u KSBBU1Q6OkRlcmVmZXJlbmNlRXhwcmVzc2lvbihXVEZNb3ZlKG9yaWdpbiksIFdURk1vdmUoY2Fs bEV4cHJlc3Npb24pKTsKKyAgICBhdXRvKiBkZXJlZmVyZW5jZUV4cHJlc3Npb24gPSBBU1Q6OnJl cGxhY2VXaXRoPEFTVDo6RGVyZWZlcmVuY2VFeHByZXNzaW9uPihkb3RFeHByZXNzaW9uLCBXVEZN b3ZlKG9yaWdpbiksIFdURk1vdmUoY2FsbEV4cHJlc3Npb24pKTsKICAgICBkZXJlZmVyZW5jZUV4 cHJlc3Npb24tPnNldFR5cGUoZG93bmNhc3Q8QVNUOjpQb2ludGVyVHlwZT4oYW5kZXJGdW5jdGlv bi0+dHlwZSgpKS5lbGVtZW50VHlwZSgpLmNsb25lKCkpOwogICAgIGRlcmVmZXJlbmNlRXhwcmVz c2lvbi0+c2V0VHlwZUFubm90YXRpb24oQVNUOjpMZWZ0VmFsdWUgeyBkb3duY2FzdDxBU1Q6OlBv aW50ZXJUeXBlPihhbmRlckZ1bmN0aW9uLT50eXBlKCkpLmFkZHJlc3NTcGFjZSgpIH0pOwogfQpJ bmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMTm9kZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9X SExTTE5vZGUuaAkocmV2aXNpb24gMjQ1NjkyKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJncHUvV0hMU0wvQVNUL1dITFNMTm9kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCwx NCBAQCBwdWJsaWM6CiBwcml2YXRlOgogfTsKIAordGVtcGxhdGUgPHR5cGVuYW1lIE5ldywgdHlw ZW5hbWUgT2xkLCB0eXBlbmFtZSAuLi5BcmdzPgorQUxXQVlTX0lOTElORSBOZXcqIHJlcGxhY2VX aXRoKE9sZCYgb2xkLCBBcmdzJiYuLi4gYXJncykKK3sKKyAgICBzdGF0aWNfYXNzZXJ0KHNpemVv ZihOZXcpIDw9IHNpemVvZihPbGQpLCAiVGhpcyBpcyBuZWVkZWQgZm9yIHRoZSBwbGFjZW1lbnQg bmV3IGJlbG93IHRvIG5vdCBvdmVyd3JpdGUgdW5vd25lZCBtZW1vcnkuIik7CisgICAgb2xkLn5P bGQoKTsKKyAgICByZXR1cm4gbmV3ICgmb2xkKSBOZXcoc3RkOjpmb3J3YXJkPEFyZ3M+KGFyZ3Mp Li4uKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgQVNUCiAKIH0K 370512 2019-05-23 11:40:04 -0700 2019-05-23 12:55:00 -0700 patch for landing b-backup.diff text/plain 11240 saam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0NTY5OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDE5LTA1LTIzICBTYWFtIGJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFtXSExTTF0gQWRkIGEgaGVscGVy IGZvciBpbi1wbGFjZSBBU1QgbXV0YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE5ODE3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE15bGVzIE1h eGZpZWxkLgorCisgICAgICAgIFRoaXMgbWFrZXMgV0hMU0wgQVNUIG11dGF0aW9uIGNvZGUgYSBi aXQgZWFzaWVyIHRvIHJlYWQgYW5kIHdyaXRlLgorICAgICAgICAKKyAgICAgICAgQ29kZSB0aGF0 IGxvb2tlZCBsaWtlOgorICAgICAgICBgYGAKKyAgICAgICAgc3RhdGljX2Fzc2VydChzaXplb2Yo QVNUOjpEZXJlZmVyZW5jZUV4cHJlc3Npb24pIDw9IHNpemVvZihBU1Q6OkRvdEV4cHJlc3Npb24p LCAiRG90IGV4cHJlc3Npb25zIG5lZWQgdG8gYmUgYWJsZSB0byBiZWNvbWUgZGVyZWZlcmVuY2Ug ZXhwcmVzc2lvbnMgd2l0aG91dCB1cGRhdGluZyBiYWNrcmVmZXJlbmNlcyIpOworICAgICAgICB2 b2lkKiBsb2NhdGlvbiA9ICZkb3RFeHByZXNzaW9uOworICAgICAgICBkb3RFeHByZXNzaW9uLn5E b3RFeHByZXNzaW9uKCk7CisgICAgICAgIGF1dG8qIGRlcmVmZXJlbmNlRXhwcmVzc2lvbiA9IG5l dyAobG9jYXRpb24pIEFTVDo6RGVyZWZlcmVuY2VFeHByZXNzaW9uKFdURk1vdmUob3JpZ2luKSwg V1RGTW92ZShjYWxsRXhwcmVzc2lvbikpOworICAgICAgICBgYGAKKyAgICAgICAgCisgICAgICAg IENhbiBub3cgYmU6CisgICAgICAgIGBgYAorICAgICAgICBhdXRvKiBkZXJlZmVyZW5jZUV4cHJl c3Npb24gPSBBU1Q6OnJlcGxhY2VXaXRoPEFTVDo6RGVyZWZlcmVuY2VFeHByZXNzaW9uPihkb3RF eHByZXNzaW9uLCBXVEZNb3ZlKG9yaWdpbiksIFdURk1vdmUoY2FsbEV4cHJlc3Npb24pKTsKKyAg ICAgICAgYGBgCisKKyAgICAgICAgKiBNb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xOb2Rl Lmg6CisgICAgICAgIChXZWJDb3JlOjpXSExTTDo6QVNUOjpyZXBsYWNlV2l0aCk6CisgICAgICAg ICogTW9kdWxlcy93ZWJncHUvV0hMU0wvV0hMU0xOYW1lUmVzb2x2ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6V0hMU0w6Ok5hbWVSZXNvbHZlcjo6dmlzaXQpOgorICAgICAgICAqIE1vZHVsZXMv d2ViZ3B1L1dITFNML1dITFNMUHJvcGVydHlSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpXSExTTDo6UHJvcGVydHlSZXNvbHZlcjo6dmlzaXQpOgorICAgICAgICAoV2ViQ29yZTo6V0hM U0w6OlByb3BlcnR5UmVzb2x2ZXI6OnNpbXBsaWZ5UmlnaHRWYWx1ZSk6CisgICAgICAgIChXZWJD b3JlOjpXSExTTDo6TGVmdFZhbHVlU2ltcGxpZmllcjo6dmlzaXQpOgorCiAyMDE5LTA1LTIzICBB bnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW1BvaW50ZXIgRXZl bnRzXSBDb21wYXRpYmlsaXR5IG1vdXNlIGV2ZW50cyBjYW4gb25seSBiZSBwcmV2ZW50ZWQgd2hp bGUgdGhlIHBvaW50ZXIgaXMgcHJlc3NlZApJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJncHUvV0hMU0wvV0hMU0xOYW1lUmVzb2x2ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMTmFtZVJlc29sdmVyLmNwcAkocmV2aXNp b24gMjQ1NjkyKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvV0hMU0xO YW1lUmVzb2x2ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTQsMTIgKzE5NCw5IEBAIHZvaWQg TmFtZVJlc29sdmVyOjp2aXNpdChBU1Q6OkRvdEV4cHJlc3MKICAgICAgICAgICAgICAgICBBU1Q6 OkVudW1lcmF0aW9uRGVmaW5pdGlvbiYgZW51bWVyYXRpb25EZWZpbml0aW9uID0gZG93bmNhc3Q8 QVNUOjpFbnVtZXJhdGlvbkRlZmluaXRpb24+KHR5cGUpOwogICAgICAgICAgICAgICAgIGF1dG8g bWVtYmVyTmFtZSA9IGRvdEV4cHJlc3Npb24uZmllbGROYW1lKCk7CiAgICAgICAgICAgICAgICAg aWYgKGF1dG8qIG1lbWJlciA9IGVudW1lcmF0aW9uRGVmaW5pdGlvbi5tZW1iZXJCeU5hbWUobWVt YmVyTmFtZSkpIHsKLSAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Fzc2VydChzaXplb2YoQVNU OjpFbnVtZXJhdGlvbk1lbWJlckxpdGVyYWwpIDw9IHNpemVvZihBU1Q6OkRvdEV4cHJlc3Npb24p LCAiRG90IGV4cHJlc3Npb25zIG5lZWQgdG8gYmUgYWJsZSB0byBiZWNvbWUgRW51bWVyYXRpb25N ZW1iZXJMaXRlcmFscyB3aXRob3V0IHVwZGF0aW5nIGJhY2tyZWZlcmVuY2VzIik7CiAgICAgICAg ICAgICAgICAgICAgIExleGVyOjpUb2tlbiBvcmlnaW4gPSBkb3RFeHByZXNzaW9uLm9yaWdpbigp OwotICAgICAgICAgICAgICAgICAgICB2b2lkKiBsb2NhdGlvbiA9ICZkb3RFeHByZXNzaW9uOwot ICAgICAgICAgICAgICAgICAgICBkb3RFeHByZXNzaW9uLn5Eb3RFeHByZXNzaW9uKCk7CiAgICAg ICAgICAgICAgICAgICAgIGF1dG8gZW51bWVyYXRpb25NZW1iZXJMaXRlcmFsID0gQVNUOjpFbnVt ZXJhdGlvbk1lbWJlckxpdGVyYWw6OndyYXAoV1RGTW92ZShvcmlnaW4pLCBXVEZNb3ZlKGJhc2VO YW1lKSwgV1RGTW92ZShtZW1iZXJOYW1lKSwgZW51bWVyYXRpb25EZWZpbml0aW9uLCAqbWVtYmVy KTsKLSAgICAgICAgICAgICAgICAgICAgbmV3IChsb2NhdGlvbikgQVNUOjpFbnVtZXJhdGlvbk1l bWJlckxpdGVyYWwoV1RGTW92ZShlbnVtZXJhdGlvbk1lbWJlckxpdGVyYWwpKTsKKyAgICAgICAg ICAgICAgICAgICAgQVNUOjpyZXBsYWNlV2l0aDxBU1Q6OkVudW1lcmF0aW9uTWVtYmVyTGl0ZXJh bD4oZG90RXhwcmVzc2lvbiwgV1RGTW92ZShlbnVtZXJhdGlvbk1lbWJlckxpdGVyYWwpKTsKICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg ICAgICBzZXRFcnJvcigpOwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hM U0wvV0hMU0xQcm9wZXJ0eVJlc29sdmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9XSExTTFByb3BlcnR5UmVzb2x2ZXIuY3BwCShyZXZpc2lv biAyNDU2OTIpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9XSExTTFBy b3BlcnR5UmVzb2x2ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MDQsMTEgKzQwNCw4IEBAIHZv aWQgUHJvcGVydHlSZXNvbHZlcjo6dmlzaXQoQVNUOjpBc3NpZ24KICAgICB9CiAgICAgc2ltcGxp ZnlMZWZ0VmFsdWUobW9kaWZ5UmVzdWx0LT5pbm5lckxlZnRWYWx1ZSk7CiAKLSAgICBzdGF0aWNf YXNzZXJ0KHNpemVvZihBU1Q6OkNvbW1hRXhwcmVzc2lvbikgPD0gc2l6ZW9mKEFTVDo6QXNzaWdu bWVudEV4cHJlc3Npb24pLCAiQXNzaWdubWVudCBleHByZXNzaW9ucyBuZWVkIHRvIGJlIGFibGUg dG8gYmVjb21lIGNvbW1hIGV4cHJlc3Npb25zIHdpdGhvdXQgdXBkYXRpbmcgYmFja3JlZmVyZW5j ZXMiKTsKICAgICBMZXhlcjo6VG9rZW4gb3JpZ2luID0gYXNzaWdubWVudEV4cHJlc3Npb24ub3Jp Z2luKCk7Ci0gICAgdm9pZCogbG9jYXRpb24gPSAmYXNzaWdubWVudEV4cHJlc3Npb247Ci0gICAg YXNzaWdubWVudEV4cHJlc3Npb24ufkFzc2lnbm1lbnRFeHByZXNzaW9uKCk7Ci0gICAgYXV0byog Y29tbWFFeHByZXNzaW9uID0gbmV3IChsb2NhdGlvbikgQVNUOjpDb21tYUV4cHJlc3Npb24oV1RG TW92ZShvcmlnaW4pLCBXVEZNb3ZlKG1vZGlmeVJlc3VsdC0+ZXhwcmVzc2lvbnMpKTsKKyAgICBh dXRvKiBjb21tYUV4cHJlc3Npb24gPSBBU1Q6OnJlcGxhY2VXaXRoPEFTVDo6Q29tbWFFeHByZXNz aW9uPihhc3NpZ25tZW50RXhwcmVzc2lvbiwgV1RGTW92ZShvcmlnaW4pLCBXVEZNb3ZlKG1vZGlm eVJlc3VsdC0+ZXhwcmVzc2lvbnMpKTsKICAgICBjb21tYUV4cHJlc3Npb24tPnNldFR5cGUoV1RG TW92ZSh0eXBlKSk7CiAgICAgY29tbWFFeHByZXNzaW9uLT5zZXRUeXBlQW5ub3RhdGlvbihBU1Q6 OlJpZ2h0VmFsdWUoKSk7CiAKQEAgLTUxMywxMSArNTEwLDggQEAgdm9pZCBQcm9wZXJ0eVJlc29s dmVyOjp2aXNpdChBU1Q6OlJlYWRNbwogICAgICAgICBVbmlxdWVSZWY8QVNUOjpWYXJpYWJsZURl Y2xhcmF0aW9uPiBvbGRWYXJpYWJsZURlY2xhcmF0aW9uID0gcmVhZE1vZGlmeVdyaXRlRXhwcmVz c2lvbi50YWtlT2xkVmFsdWUoKTsKICAgICAgICAgVW5pcXVlUmVmPEFTVDo6VmFyaWFibGVEZWNs YXJhdGlvbj4gbmV3VmFyaWFibGVEZWNsYXJhdGlvbiA9IHJlYWRNb2RpZnlXcml0ZUV4cHJlc3Np b24udGFrZU5ld1ZhbHVlKCk7CiAKLSAgICAgICAgc3RhdGljX2Fzc2VydChzaXplb2YoQVNUOjpD b21tYUV4cHJlc3Npb24pIDw9IHNpemVvZihBU1Q6OlJlYWRNb2RpZnlXcml0ZUV4cHJlc3Npb24p LCAiUmVhZE1vZGlmeVdyaXRlIGV4cHJlc3Npb25zIG5lZWQgdG8gYmUgYWJsZSB0byBiZWNvbWUg Y29tbWEgZXhwcmVzc2lvbnMgd2l0aG91dCB1cGRhdGluZyBiYWNrcmVmZXJlbmNlcyIpOwogICAg ICAgICBMZXhlcjo6VG9rZW4gb3JpZ2luID0gcmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lvbi5vcmln aW4oKTsKLSAgICAgICAgdm9pZCogbG9jYXRpb24gPSAmcmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lv bjsKLSAgICAgICAgcmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lvbi5+UmVhZE1vZGlmeVdyaXRlRXhw cmVzc2lvbigpOwotICAgICAgICBhdXRvKiBjb21tYUV4cHJlc3Npb24gPSBuZXcgKGxvY2F0aW9u KSBBU1Q6OkNvbW1hRXhwcmVzc2lvbihXVEZNb3ZlKG9yaWdpbiksIFdURk1vdmUoZXhwcmVzc2lv bnMpKTsKKyAgICAgICAgYXV0byogY29tbWFFeHByZXNzaW9uID0gQVNUOjpyZXBsYWNlV2l0aDxB U1Q6OkNvbW1hRXhwcmVzc2lvbj4ocmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lvbiwgV1RGTW92ZShv cmlnaW4pLCBXVEZNb3ZlKGV4cHJlc3Npb25zKSk7CiAgICAgICAgIGNvbW1hRXhwcmVzc2lvbi0+ c2V0VHlwZShXVEZNb3ZlKHR5cGUpKTsKICAgICAgICAgY29tbWFFeHByZXNzaW9uLT5zZXRUeXBl QW5ub3RhdGlvbihBU1Q6OlJpZ2h0VmFsdWUoKSk7CiAKQEAgLTU4MCwxMSArNTc0LDggQEAgdm9p ZCBQcm9wZXJ0eVJlc29sdmVyOjp2aXNpdChBU1Q6OlJlYWRNbwogICAgIFVuaXF1ZVJlZjxBU1Q6 OlZhcmlhYmxlRGVjbGFyYXRpb24+IG9sZFZhcmlhYmxlRGVjbGFyYXRpb24gPSByZWFkTW9kaWZ5 V3JpdGVFeHByZXNzaW9uLnRha2VPbGRWYWx1ZSgpOwogICAgIFVuaXF1ZVJlZjxBU1Q6OlZhcmlh YmxlRGVjbGFyYXRpb24+IG5ld1ZhcmlhYmxlRGVjbGFyYXRpb24gPSByZWFkTW9kaWZ5V3JpdGVF eHByZXNzaW9uLnRha2VOZXdWYWx1ZSgpOwogCi0gICAgc3RhdGljX2Fzc2VydChzaXplb2YoQVNU OjpDb21tYUV4cHJlc3Npb24pIDw9IHNpemVvZihBU1Q6OlJlYWRNb2RpZnlXcml0ZUV4cHJlc3Np b24pLCAiUmVhZE1vZGlmeVdyaXRlIGV4cHJlc3Npb25zIG5lZWQgdG8gYmUgYWJsZSB0byBiZWNv bWUgY29tbWEgZXhwcmVzc2lvbnMgd2l0aG91dCB1cGRhdGluZyBiYWNrcmVmZXJlbmNlcyIpOwog ICAgIExleGVyOjpUb2tlbiBvcmlnaW4gPSByZWFkTW9kaWZ5V3JpdGVFeHByZXNzaW9uLm9yaWdp bigpOwotICAgIHZvaWQqIGxvY2F0aW9uID0gJnJlYWRNb2RpZnlXcml0ZUV4cHJlc3Npb247Ci0g ICAgcmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lvbi5+UmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lvbigp OwotICAgIGF1dG8qIGNvbW1hRXhwcmVzc2lvbiA9IG5ldyAobG9jYXRpb24pIEFTVDo6Q29tbWFF eHByZXNzaW9uKFdURk1vdmUob3JpZ2luKSwgV1RGTW92ZShtb2RpZnlSZXN1bHQtPmV4cHJlc3Np b25zKSk7CisgICAgYXV0byogY29tbWFFeHByZXNzaW9uID0gQVNUOjpyZXBsYWNlV2l0aDxBU1Q6 OkNvbW1hRXhwcmVzc2lvbj4ocmVhZE1vZGlmeVdyaXRlRXhwcmVzc2lvbiwgV1RGTW92ZShvcmln aW4pLCBXVEZNb3ZlKG1vZGlmeVJlc3VsdC0+ZXhwcmVzc2lvbnMpKTsKICAgICBjb21tYUV4cHJl c3Npb24tPnNldFR5cGUoV1RGTW92ZSh0eXBlKSk7CiAgICAgY29tbWFFeHByZXNzaW9uLT5zZXRU eXBlQW5ub3RhdGlvbihBU1Q6OlJpZ2h0VmFsdWUoKSk7CiAKQEAgLTYxMiwxMCArNjAzLDcgQEAg Ym9vbCBQcm9wZXJ0eVJlc29sdmVyOjpzaW1wbGlmeVJpZ2h0VmFsdQogICAgICAgICAgICAgY2Fs bEV4cHJlc3Npb24tPnNldFR5cGVBbm5vdGF0aW9uKEFTVDo6UmlnaHRWYWx1ZSgpKTsKICAgICAg ICAgICAgIGNhbGxFeHByZXNzaW9uLT5zZXRGdW5jdGlvbigqYW5kZXJGdW5jdGlvbik7CiAKLSAg ICAgICAgICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKEFTVDo6RGVyZWZlcmVuY2VFeHByZXNzaW9u KSA8PSBzaXplb2YoQVNUOjpEb3RFeHByZXNzaW9uKSwgIkRvdCBleHByZXNzaW9ucyBuZWVkIHRv IGJlIGFibGUgdG8gYmVjb21lIGRlcmVmZXJlbmNlIGV4cHJlc3Npb25zIHdpdGhvdXQgdXBkYXRp bmcgYmFja3JlZmVyZW5jZXMiKTsKLSAgICAgICAgICAgIHZvaWQqIGxvY2F0aW9uID0gJmRvdEV4 cHJlc3Npb247Ci0gICAgICAgICAgICBkb3RFeHByZXNzaW9uLn5Eb3RFeHByZXNzaW9uKCk7Ci0g ICAgICAgICAgICBhdXRvKiBkZXJlZmVyZW5jZUV4cHJlc3Npb24gPSBuZXcgKGxvY2F0aW9uKSBB U1Q6OkRlcmVmZXJlbmNlRXhwcmVzc2lvbihXVEZNb3ZlKG9yaWdpbiksIFdURk1vdmUoY2FsbEV4 cHJlc3Npb24pKTsKKyAgICAgICAgICAgIGF1dG8qIGRlcmVmZXJlbmNlRXhwcmVzc2lvbiA9IEFT VDo6cmVwbGFjZVdpdGg8QVNUOjpEZXJlZmVyZW5jZUV4cHJlc3Npb24+KGRvdEV4cHJlc3Npb24s IFdURk1vdmUob3JpZ2luKSwgV1RGTW92ZShjYWxsRXhwcmVzc2lvbikpOwogICAgICAgICAgICAg ZGVyZWZlcmVuY2VFeHByZXNzaW9uLT5zZXRUeXBlKGRvd25jYXN0PEFTVDo6UG9pbnRlclR5cGU+ KGFuZGVyRnVuY3Rpb24tPnR5cGUoKSkuZWxlbWVudFR5cGUoKS5jbG9uZSgpKTsKICAgICAgICAg ICAgIGRlcmVmZXJlbmNlRXhwcmVzc2lvbi0+c2V0VHlwZUFubm90YXRpb24oQVNUOjpMZWZ0VmFs dWUgeyBkb3duY2FzdDxBU1Q6OlBvaW50ZXJUeXBlPihhbmRlckZ1bmN0aW9uLT50eXBlKCkpLmFk ZHJlc3NTcGFjZSgpIH0pOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC02NTUsMTMgKzY0 MywxMCBAQCBib29sIFByb3BlcnR5UmVzb2x2ZXI6OnNpbXBsaWZ5UmlnaHRWYWx1CiAgICAgICAg IGRlcmVmZXJlbmNlRXhwcmVzc2lvbi0+c2V0VHlwZShkb3duY2FzdDxBU1Q6OlBvaW50ZXJUeXBl PihhbmRlckZ1bmN0aW9uLT50eXBlKCkpLmVsZW1lbnRUeXBlKCkuY2xvbmUoKSk7CiAgICAgICAg IGRlcmVmZXJlbmNlRXhwcmVzc2lvbi0+c2V0VHlwZUFubm90YXRpb24oQVNUOjpMZWZ0VmFsdWUg eyBBU1Q6OkFkZHJlc3NTcGFjZTo6VGhyZWFkIH0pOwogCi0gICAgICAgIHN0YXRpY19hc3NlcnQo c2l6ZW9mKEFTVDo6Q29tbWFFeHByZXNzaW9uKSA8PSBzaXplb2YoQVNUOjpEb3RFeHByZXNzaW9u KSwgIkRvdCBleHByZXNzaW9ucyBuZWVkIHRvIGJlIGFibGUgdG8gYmVjb21lIGNvbW1hIGV4cHJl c3Npb25zIHdpdGhvdXQgdXBkYXRpbmcgYmFja3JlZmVyZW5jZXMiKTsKLSAgICAgICAgdm9pZCog bG9jYXRpb24gPSAmZG90RXhwcmVzc2lvbjsKLSAgICAgICAgZG90RXhwcmVzc2lvbi5+RG90RXhw cmVzc2lvbigpOwogICAgICAgICBWZWN0b3I8VW5pcXVlUmVmPEFTVDo6RXhwcmVzc2lvbj4+IGV4 cHJlc3Npb25zOwogICAgICAgICBleHByZXNzaW9ucy5hcHBlbmQoV1RGTW92ZShhc3NpZ25tZW50 RXhwcmVzc2lvbikpOwogICAgICAgICBleHByZXNzaW9ucy5hcHBlbmQoV1RGTW92ZShkZXJlZmVy ZW5jZUV4cHJlc3Npb24pKTsKLSAgICAgICAgYXV0byogY29tbWFFeHByZXNzaW9uID0gbmV3IChs b2NhdGlvbikgQVNUOjpDb21tYUV4cHJlc3Npb24oV1RGTW92ZShvcmlnaW4pLCBXVEZNb3ZlKGV4 cHJlc3Npb25zKSk7CisgICAgICAgIGF1dG8qIGNvbW1hRXhwcmVzc2lvbiA9IEFTVDo6cmVwbGFj ZVdpdGg8QVNUOjpDb21tYUV4cHJlc3Npb24+KGRvdEV4cHJlc3Npb24sIFdURk1vdmUob3JpZ2lu KSwgV1RGTW92ZShleHByZXNzaW9ucykpOwogICAgICAgICBjb21tYUV4cHJlc3Npb24tPnNldFR5 cGUoZG93bmNhc3Q8QVNUOjpQb2ludGVyVHlwZT4oYW5kZXJGdW5jdGlvbi0+dHlwZSgpKS5lbGVt ZW50VHlwZSgpLmNsb25lKCkpOwogICAgICAgICBjb21tYUV4cHJlc3Npb24tPnNldFR5cGVBbm5v dGF0aW9uKEFTVDo6TGVmdFZhbHVlIHsgQVNUOjpBZGRyZXNzU3BhY2U6OlRocmVhZCB9KTsKIApA QCAtNjY5LDE0ICs2NTQsMTEgQEAgYm9vbCBQcm9wZXJ0eVJlc29sdmVyOjpzaW1wbGlmeVJpZ2h0 VmFsdQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKLSAgICBzdGF0aWNfYXNzZXJ0KHNp emVvZihBU1Q6OkNhbGxFeHByZXNzaW9uKSA8PSBzaXplb2YoQVNUOjpEb3RFeHByZXNzaW9uKSwg IkRvdCBleHByZXNzaW9ucyBuZWVkIHRvIGJlIGFibGUgdG8gYmVjb21lIGNhbGwgZXhwcmVzc2lv bnMgd2l0aG91dCB1cGRhdGluZyBiYWNrcmVmZXJlbmNlcyIpOwogICAgIEFTU0VSVChkb3RFeHBy ZXNzaW9uLmdldHRlckZ1bmN0aW9uKCkpOwogICAgIGF1dG8mIGdldHRlckZ1bmN0aW9uID0gKmRv dEV4cHJlc3Npb24uZ2V0dGVyRnVuY3Rpb24oKTsKICAgICBWZWN0b3I8VW5pcXVlUmVmPEFTVDo6 RXhwcmVzc2lvbj4+IGFyZ3VtZW50czsKICAgICBhcmd1bWVudHMuYXBwZW5kKGRvdEV4cHJlc3Np b24udGFrZUJhc2UoKSk7Ci0gICAgdm9pZCogbG9jYXRpb24gPSAmZG90RXhwcmVzc2lvbjsKLSAg ICBkb3RFeHByZXNzaW9uLn5Eb3RFeHByZXNzaW9uKCk7Ci0gICAgYXV0byogY2FsbEV4cHJlc3Np b24gPSBuZXcgKGxvY2F0aW9uKSBBU1Q6OkNhbGxFeHByZXNzaW9uKFdURk1vdmUob3JpZ2luKSwg U3RyaW5nKGdldHRlckZ1bmN0aW9uLm5hbWUoKSksIFdURk1vdmUoYXJndW1lbnRzKSk7CisgICAg YXV0byogY2FsbEV4cHJlc3Npb24gPSBBU1Q6OnJlcGxhY2VXaXRoPEFTVDo6Q2FsbEV4cHJlc3Np b24+KGRvdEV4cHJlc3Npb24sIFdURk1vdmUob3JpZ2luKSwgU3RyaW5nKGdldHRlckZ1bmN0aW9u Lm5hbWUoKSksIFdURk1vdmUoYXJndW1lbnRzKSk7CiAgICAgY2FsbEV4cHJlc3Npb24tPnNldEZ1 bmN0aW9uKGdldHRlckZ1bmN0aW9uKTsKICAgICBjYWxsRXhwcmVzc2lvbi0+c2V0VHlwZShnZXR0 ZXJGdW5jdGlvbi50eXBlKCkuY2xvbmUoKSk7CiAgICAgY2FsbEV4cHJlc3Npb24tPnNldFR5cGVB bm5vdGF0aW9uKEFTVDo6UmlnaHRWYWx1ZSgpKTsKQEAgLTcxMiwxMCArNjk0LDcgQEAgdm9pZCBM ZWZ0VmFsdWVTaW1wbGlmaWVyOjp2aXNpdChBU1Q6OkRvdAogICAgIGNhbGxFeHByZXNzaW9uLT5z ZXRUeXBlQW5ub3RhdGlvbihBU1Q6OlJpZ2h0VmFsdWUoKSk7CiAgICAgY2FsbEV4cHJlc3Npb24t PnNldEZ1bmN0aW9uKCphbmRlckZ1bmN0aW9uKTsKIAotICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9m KEFTVDo6RGVyZWZlcmVuY2VFeHByZXNzaW9uKSA8PSBzaXplb2YoQVNUOjpEb3RFeHByZXNzaW9u KSwgIkRvdCBleHByZXNzaW9ucyBuZWVkIHRvIGJlIGFibGUgdG8gYmVjb21lIGRlcmVmZXJlbmNl IGV4cHJlc3Npb25zIHdpdGhvdXQgdXBkYXRpbmcgYmFja3JlZmVyZW5jZXMiKTsKLSAgICB2b2lk KiBsb2NhdGlvbiA9ICZkb3RFeHByZXNzaW9uOwotICAgIGRvdEV4cHJlc3Npb24ufkRvdEV4cHJl c3Npb24oKTsKLSAgICBhdXRvKiBkZXJlZmVyZW5jZUV4cHJlc3Npb24gPSBuZXcgKGxvY2F0aW9u KSBBU1Q6OkRlcmVmZXJlbmNlRXhwcmVzc2lvbihXVEZNb3ZlKG9yaWdpbiksIFdURk1vdmUoY2Fs bEV4cHJlc3Npb24pKTsKKyAgICBhdXRvKiBkZXJlZmVyZW5jZUV4cHJlc3Npb24gPSBBU1Q6OnJl cGxhY2VXaXRoPEFTVDo6RGVyZWZlcmVuY2VFeHByZXNzaW9uPihkb3RFeHByZXNzaW9uLCBXVEZN b3ZlKG9yaWdpbiksIFdURk1vdmUoY2FsbEV4cHJlc3Npb24pKTsKICAgICBkZXJlZmVyZW5jZUV4 cHJlc3Npb24tPnNldFR5cGUoZG93bmNhc3Q8QVNUOjpQb2ludGVyVHlwZT4oYW5kZXJGdW5jdGlv bi0+dHlwZSgpKS5lbGVtZW50VHlwZSgpLmNsb25lKCkpOwogICAgIGRlcmVmZXJlbmNlRXhwcmVz c2lvbi0+c2V0VHlwZUFubm90YXRpb24oQVNUOjpMZWZ0VmFsdWUgeyBkb3duY2FzdDxBU1Q6OlBv aW50ZXJUeXBlPihhbmRlckZ1bmN0aW9uLT50eXBlKCkpLmFkZHJlc3NTcGFjZSgpIH0pOwogfQpJ bmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMTm9kZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9X SExTTE5vZGUuaAkocmV2aXNpb24gMjQ1NjkyKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJncHUvV0hMU0wvQVNUL1dITFNMTm9kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCwx NSBAQCBwdWJsaWM6CiBwcml2YXRlOgogfTsKIAordGVtcGxhdGUgPHR5cGVuYW1lIE5ldywgdHlw ZW5hbWUgT2xkLCB0eXBlbmFtZSAuLi5BcmdzPgorQUxXQVlTX0lOTElORSBOZXcqIHJlcGxhY2VX aXRoKE9sZCYgb2xkLCBBcmdzJiYuLi4gYXJncykKK3sKKyAgICBzdGF0aWNfYXNzZXJ0KHNpemVv ZihOZXcpIDw9IHNpemVvZihPbGQpLCAiVGhpcyBpcyBuZWVkZWQgZm9yIHRoZSBwbGFjZW1lbnQg bmV3IGJlbG93IHRvIG5vdCBvdmVyd3JpdGUgdW5vd25lZCBtZW1vcnkuIik7CisgICAgdm9pZCog bG9jYXRpb24gPSAmb2xkOworICAgIG9sZC5+T2xkKCk7CisgICAgcmV0dXJuIG5ldyAobG9jYXRp b24pIE5ldyhzdGQ6OmZvcndhcmQ8QXJncz4oYXJncykuLi4pOworfQorCiB9IC8vIG5hbWVzcGFj ZSBBU1QKIAogfQo=