201568 2019-09-06 16:39:49 -0700 [WHLSL] Slim down WSLMatrix and inline constructors in native code 2019-09-12 14:48:21 -0700 1 1 1 Unclassified WebKit WebGPU WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam commit-queue dino fpizlo jonlee justin_fan mmaxfield rmorisset sam webkit-bug-importer oldest_to_newest 1568767 0 saam 2019-09-06 16:39:49 -0700 Don't call the C++ constructor. Instead, manually initialize the vector. This will allow us to remove a lot of template code which hurts compile times in boids. 1570362 1 378676 saam 2019-09-12 13:38:51 -0700 Created attachment 378676 patch 1570364 2 378677 saam 2019-09-12 13:53:46 -0700 Created attachment 378677 patch 1570365 3 378677 rmorisset 2019-09-12 13:54:41 -0700 Comment on attachment 378677 patch r=me 1570379 4 378677 commit-queue 2019-09-12 14:47:31 -0700 Comment on attachment 378677 patch Clearing flags on attachment: 378677 Committed r249816: <https://trac.webkit.org/changeset/249816> 1570380 5 commit-queue 2019-09-12 14:47:33 -0700 All reviewed patches have been landed. Closing bug. 1570381 6 webkit-bug-importer 2019-09-12 14:48:21 -0700 <rdar://problem/55318258> 1570382 7 webkit-bug-importer 2019-09-12 14:48:21 -0700 <rdar://problem/55318259> 378676 2019-09-12 13:38:51 -0700 2019-09-12 13:53:46 -0700 patch a-backup.diff text/plain 11462 saam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0OTgxNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE5LTA5LTEyICBTYWFtIEJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFtXSExTTF0gU2xpbSBkb3duIFdT TE1hdHJpeCBhbmQgaW5saW5lIGNvbnN0cnVjdG9ycyBpbiBuYXRpdmUgY29kZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNTY4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmVmb3JlLCBvdXIgV1NMIE1h dHJpeCBpbiBNU0wgaGFkIHRlbXBsYXRlcyB0byBmaWd1cmUgb3V0IGhvdyB3ZSdyZSAKKyAgICAg ICAgY29uc3RydWN0aW5nIGl0LiBGb3IgZXhhbXBsZSwgd2l0aCBhIGxpc3Qgb2YgZWxlbWVudHMs IG9yIGEgbGlzdCBvZgorICAgICAgICBjb2x1bW5zLiBIb3dldmVyLCB3ZSBjYW4gcmVtb3ZlIHRo aXMgdGVtcGxhdGUgY29kZSBzaW5jZSB3aGVuIHdlJ3JlCisgICAgICAgIGVtaXR0aW5nIE1ldGFs IGNvZGUsIHdlIGtub3cgZXhhY3RseSBob3cgd2UncmUgY29uc3RydWN0aW5nIHRoZSBXU0wKKyAg ICAgICAgbWF0cml4LiBTbyB0aGUgTmF0aXZlRnVuY3Rpb25Xcml0ZXIgbm93IGlubGluZXMgdGhl IHByb3BlciBzdG9yZXMKKyAgICAgICAgaW50byB0aGUgV1NMTWF0cml4IGVsZW1lbnRzLgorICAg ICAgICAKKyAgICAgICAgVGhpcyBwYXRjaCBzcGVlZHMgdXAgTWV0YWwgY29tcGlsZSB0aW1lcyBp biBib2lkcyBieSB+NG1zICgxNiUpIHdpdGgKKyAgICAgICAgYSBwLXZhbHVlIG9mIDAuMDAwMS4K KworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogTW9kdWxl cy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xNZXRhbENvZGVHZW5lcmF0b3IuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6V0hMU0w6Ok1ldGFsOjptZXRhbENvZGVQcm9sb2d1ZSk6CisgICAgICAgICog TW9kdWxlcy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xOYXRpdmVGdW5jdGlvbldyaXRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpXSExTTDo6TWV0YWw6OmlubGluZU5hdGl2ZUZ1bmN0aW9uKToK KyAgICAgICAgKiBTb3VyY2VzLnR4dDoKKwogMjAxOS0wOS0xMiAgV2Vuc29uIEhzaWVoICA8d2Vu c29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFRleHQgaW5kaWNhdG9yIGZv ciBhbiBpbWFnZSBsaW5rIG9uIHRoZSBmcm9udCBwYWdlIG9mIGFwcGxlLmNvbSBsb29rcyB3cm9u ZwpJbmRleDogU291cmNlL1dlYkNvcmUvU291cmNlcy50eHQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvU291cmNlcy50eHQJKHJldmlzaW9uIDI0OTc0OSkKKysrIFNvdXJjZS9XZWJDb3Jl L1NvdXJjZXMudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0zMTMsNiArMzEzLDcgQEAgTW9kdWxlcy93 ZWJncHUvV0hMU0wvV0hMU0xMZXhlci5jcHAKIE1vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMUGFy c2VyLmNwcAogTW9kdWxlcy93ZWJncHUvV0hMU0wvV0hMU0xQcnVuZVVucmVhY2hhYmxlU3RhbmRh cmRMaWJyYXJ5RnVuY3Rpb25zLmNwcAogTW9kdWxlcy93ZWJncHUvV0hMU0wvV0hMU0xDaGVja1Rl eHR1cmVSZWZlcmVuY2VzLmNwcAorTW9kdWxlcy93ZWJncHUvV0hMU0wvV0hMU0xDaGVja1JlZmVy ZW5jZVR5cGVzLmNwcAogTW9kdWxlcy93ZWJncHUvV0hMU0wvV0hMU0xDaGVja2VyLmNwcAogTW9k dWxlcy93ZWJncHUvV0hMU0wvV0hMU0xHYXRoZXJFbnRyeVBvaW50SXRlbXMuY3BwCiBNb2R1bGVz L3dlYmdwdS9XSExTTC9XSExTTENoZWNrRHVwbGljYXRlRnVuY3Rpb25zLmNwcApJbmRleDogU291 cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xNZXRhbENvZGVHZW5l cmF0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dI TFNML01ldGFsL1dITFNMTWV0YWxDb2RlR2VuZXJhdG9yLmNwcAkocmV2aXNpb24gMjQ5ODEyKQor KysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xNZXRhbENv ZGVHZW5lcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OCwxMzIgKzU4LDE3IEBAIHN0YXRp YyBTdHJpbmdWaWV3IG1ldGFsQ29kZVByb2xvZ3VlKCkKICAgICAgICAgIntcbiIKICAgICAgICAg IiAgICB2ZWM8VCwgUm93cz4gY29sdW1uc1tDb2xzXTtcbiIKICAgICAgICAgIiAgICBwcml2YXRl OlxuIgotICAgICAgICAiICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVLCBpbnQuLi4gUj5cbiIKLSAg ICAgICAgIiAgICBzdGF0aWMgdmVjPFQsIFJvd3M+IGJ1aWxkX2NvbChpbml0aWFsaXplcl9saXN0 PFU+IGNvbCwgX2ludGVnZXJfc2VxdWVuY2U8aW50LCBSLi4uPilcbiIKLSAgICAgICAgIiAgICB7 XG4iCi0gICAgICAgICIgICAgICAgIHJldHVybiB7KFIgPCBjb2wuc2l6ZSgpID8gKihjb2wuYmVn aW4oKSArIFIpIDogVSgpKS4uLn07XG4iCi0gICAgICAgICIgICAgfVxuIgotICAgICAgICAiICAg IHRlbXBsYXRlIDxpbnQuLi4gUj5cbiIKLSAgICAgICAgIiAgICBzdGF0aWMgdmVjPFQsIFJvd3M+ IGJ1aWxkX2Z1bGxfY29sKGludCBjLCBpbml0aWFsaXplcl9saXN0PFQ+IGVsZW1zLCBfaW50ZWdl cl9zZXF1ZW5jZTxpbnQsIFIuLi4+KVxuIgotICAgICAgICAiICAgIHtcbiIKLSAgICAgICAgIiAg ICAgICAgcmV0dXJuIHsqKGVsZW1zLmJlZ2luKCkgKyBjICogUm93cyArIFIpLi4ufTtcbiIKLSAg ICAgICAgIiAgICB9XG4iCi0gICAgICAgICIgICAgc3RydWN0IGNvbHNfaW5pdF90YWcgeyB9O1xu IgotICAgICAgICAiICAgIHN0cnVjdCBjb2xzX2FsbF90YWcgeyB9O1xuIgotICAgICAgICAiICAg IHN0cnVjdCBlbGVtc19hbGxfdGFnIHsgfTtcbiIKLSAgICAgICAgIiAgICB0ZW1wbGF0ZSA8aW50 Li4uIEM+XG4iCi0gICAgICAgICIgICAgaW5saW5lIGV4cGxpY2l0IFdTTE1hdHJpeChjb2xzX2lu aXRfdGFnLCBpbml0aWFsaXplcl9saXN0PHZlYzxULCBSb3dzPj4gY29scywgX2ludGVnZXJfc2Vx dWVuY2U8aW50LCBDLi4uPikgdGhyZWFkXG4iCi0gICAgICAgICIgICAgICAgIDogY29sdW1uc3so QyA8IGNvbHMuc2l6ZSgpID8gKihjb2xzLmJlZ2luKCkgKyBDKSA6IHZlYzxULCBSb3dzPigpKS4u Ln1cbiIKLSAgICAgICAgIiAgICB7XG4iCi0gICAgICAgICIgICAgfVxuIgotICAgICAgICAiICAg IHRlbXBsYXRlIDx0eXBlbmFtZS4uLiBVPlxuIgotICAgICAgICAiICAgIGlubGluZSBleHBsaWNp dCBXU0xNYXRyaXgoY29sc19hbGxfdGFnLCBVLi4uIGNvbHMpIHRocmVhZFxuIgotICAgICAgICAi ICAgICAgICA6IGNvbHVtbnN7IGNvbHMuLi4gfVxuIgotICAgICAgICAiICAgIHtcbiIKLSAgICAg ICAgIiAgICB9XG4iCi0gICAgICAgICIgICAgdGVtcGxhdGUgPHR5cGVuYW1lLi4uIFU+XG4iCi0g ICAgICAgICIgICAgaW5saW5lIGV4cGxpY2l0IFdTTE1hdHJpeChlbGVtc19hbGxfdGFnLCBVLi4u IGVsZW1zKSB0aHJlYWRcbiIKLSAgICAgICAgIiAgICAgICAgOiBXU0xNYXRyaXgoe1QoZWxlbXMp Li4ufSwgX21ha2VfaW50ZWdlcl9zZXF1ZW5jZTxpbnQsIENvbHM+KCkpXG4iCi0gICAgICAgICIg ICAgICAgIHtcbiIKLSAgICAgICAgIiAgICAgICAgfVxuIgotICAgICAgICAiICAgIHRlbXBsYXRl IDxpbnQuLi4gQz5cbiIKLSAgICAgICAgIiAgICBpbmxpbmUgZXhwbGljaXQgV1NMTWF0cml4KGlu aXRpYWxpemVyX2xpc3Q8VD4gZWxlbXMsIF9pbnRlZ2VyX3NlcXVlbmNlPGludCwgQy4uLj4pIHRo cmVhZFxuIgotICAgICAgICAiICAgICAgICA6IGNvbHVtbnN7YnVpbGRfZnVsbF9jb2woQywgZWxl bXMsIF9tYWtlX2ludGVnZXJfc2VxdWVuY2U8aW50LCBSb3dzPigpKS4uLn1cbiIKLSAgICAgICAg IiAgICB7XG4iCi0gICAgICAgICIgICAgfVxuIgotICAgICAgICAiICAgIHRlbXBsYXRlIDxpbnQu Li4gQz5cbiIKLSAgICAgICAgIiAgICBpbmxpbmUgZXhwbGljaXQgV1NMTWF0cml4KGNvbHNfaW5p dF90YWcsIGluaXRpYWxpemVyX2xpc3Q8dmVjPFQsIFJvd3M+PiBjb2xzLCBfaW50ZWdlcl9zZXF1 ZW5jZTxpbnQsIEMuLi4+KSBjb25zdGFudFxuIgotICAgICAgICAiICAgICAgICA6IGNvbHVtbnN7 KEMgPCBjb2xzLnNpemUoKSA/ICooY29scy5iZWdpbigpICsgQykgOiB2ZWM8VCwgUm93cz4oKSku Li59XG4iCi0gICAgICAgICIgICAge1xuIgotICAgICAgICAiICAgIH1cbiIKLSAgICAgICAgIiAg ICB0ZW1wbGF0ZSA8dHlwZW5hbWUuLi4gVT5cbiIKLSAgICAgICAgIiAgICBpbmxpbmUgZXhwbGlj aXQgV1NMTWF0cml4KGNvbHNfYWxsX3RhZywgVS4uLiBjb2xzKSBjb25zdGFudFxuIgotICAgICAg ICAiICAgICAgICA6IGNvbHVtbnN7IGNvbHMuLi4gfVxuIgotICAgICAgICAiICAgIHtcbiIKLSAg ICAgICAgIiAgICB9XG4iCi0gICAgICAgICIgICAgdGVtcGxhdGUgPHR5cGVuYW1lLi4uIFU+XG4i Ci0gICAgICAgICIgICAgaW5saW5lIGV4cGxpY2l0IFdTTE1hdHJpeChlbGVtc19hbGxfdGFnLCBV Li4uIGVsZW1zKSBjb25zdGFudFxuIgotICAgICAgICAiICAgICAgICA6IFdTTE1hdHJpeCh7VChl bGVtcykuLi59LCBfbWFrZV9pbnRlZ2VyX3NlcXVlbmNlPGludCwgQ29scz4oKSlcbiIKLSAgICAg ICAgIiAgICAgICAge1xuIgotICAgICAgICAiICAgICAgICB9XG4iCi0gICAgICAgICIgICAgdGVt cGxhdGUgPGludC4uLiBDPlxuIgotICAgICAgICAiICAgIGlubGluZSBleHBsaWNpdCBXU0xNYXRy aXgoaW5pdGlhbGl6ZXJfbGlzdDxUPiBlbGVtcywgX2ludGVnZXJfc2VxdWVuY2U8aW50LCBDLi4u PikgY29uc3RhbnRcbiIKLSAgICAgICAgIiAgICAgICAgOiBjb2x1bW5ze2J1aWxkX2Z1bGxfY29s KEMsIGVsZW1zLCBfbWFrZV9pbnRlZ2VyX3NlcXVlbmNlPGludCwgUm93cz4oKSkuLi59XG4iCi0g ICAgICAgICIgICAge1xuIgotICAgICAgICAiICAgIH1cbiIKICAgICAgICAgIiAgICBwdWJsaWM6 XG4iCiAgICAgICAgICIgICAgaW5saW5lIFdTTE1hdHJpeCgpIHRocmVhZCA9IGRlZmF1bHQ7XG4i Ci0gICAgICAgICIgICAgaW5saW5lIFdTTE1hdHJpeChpbml0aWFsaXplcl9saXN0PHZlYzxULCBS b3dzPj4gY29scykgdGhyZWFkXG4iCi0gICAgICAgICIgICAgICAgIDogV1NMTWF0cml4KGNvbHNf aW5pdF90YWcoKSwgY29scywgX21ha2VfaW50ZWdlcl9zZXF1ZW5jZTxpbnQsIENvbHM+KCkpXG4i Ci0gICAgICAgICIgICAge1xuIgotICAgICAgICAiICAgIH1cbiIKLSAgICAgICAgIiAgICB0ZW1w bGF0ZSA8dHlwZW5hbWUuLi4gVT5cbiIKLSAgICAgICAgIiAgICBpbmxpbmUgZXhwbGljaXQgV1NM TWF0cml4KFUuLi4gdmFscykgdGhyZWFkXG4iCi0gICAgICAgICIgICAgICAgIDogV1NMTWF0cml4 KGNvbmRpdGlvbmFsX3Q8c2l6ZW9mLi4uKFUpID09IENvbHMsIGNvbHNfYWxsX3RhZywgZWxlbXNf YWxsX3RhZz4oKSwgdmFscy4uLilcbiIKLSAgICAgICAgIiAgICB7XG4iCi0gICAgICAgICIgICAg fVxuIgogICAgICAgICAiICAgIGlubGluZSBXU0xNYXRyaXgoKSBjb25zdGFudCA9IGRlZmF1bHQ7 XG4iCi0gICAgICAgICIgICAgaW5saW5lIFdTTE1hdHJpeChpbml0aWFsaXplcl9saXN0PHZlYzxU LCBSb3dzPj4gY29scykgY29uc3RhbnRcbiIKLSAgICAgICAgIiAgICAgICAgOiBXU0xNYXRyaXgo Y29sc19pbml0X3RhZygpLCBjb2xzLCBfbWFrZV9pbnRlZ2VyX3NlcXVlbmNlPGludCwgQ29scz4o KSlcbiIKLSAgICAgICAgIiAgICB7XG4iCi0gICAgICAgICIgICAgfVxuIgotICAgICAgICAiICAg IGlubGluZSBleHBsaWNpdCBXU0xNYXRyaXgoVCB2YWwpIGNvbnN0YW50XG4iCi0gICAgICAgICIg ICAgICAgIDogV1NMTWF0cml4KHZhbCwgX21ha2VfaW50ZWdlcl9zZXF1ZW5jZTxpbnQsIENvbHM+ KCkpXG4iCi0gICAgICAgICIgICAge1xuIgotICAgICAgICAiICAgIH1cbiIKLSAgICAgICAgIiAg ICB0ZW1wbGF0ZSA8dHlwZW5hbWUuLi4gVT5cbiIKLSAgICAgICAgIiAgICBpbmxpbmUgZXhwbGlj aXQgV1NMTWF0cml4KFUuLi4gdmFscykgY29uc3RhbnRcbiIKLSAgICAgICAgIiAgICAgICAgOiBX U0xNYXRyaXgoY29uZGl0aW9uYWxfdDxzaXplb2YuLi4oVSkgPT0gQ29scywgY29sc19hbGxfdGFn LCBlbGVtc19hbGxfdGFnPigpLCB2YWxzLi4uKVxuIgotICAgICAgICAiICAgIHtcbiIKLSAgICAg ICAgIiAgICB9XG4iCiAgICAgICAgICIgICAgaW5saW5lIFdTTE1hdHJpeChjb25zdCB0aHJlYWQg V1NMTWF0cml4PFQsIENvbHMsIFJvd3M+ICZ0aGF0KSB0aHJlYWQgPSBkZWZhdWx0O1xuIgotICAg ICAgICAiICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVPlxuIgotICAgICAgICAiICAgIGlubGluZSBl eHBsaWNpdCBXU0xNYXRyaXgoY29uc3QgdGhyZWFkIFdTTE1hdHJpeDxVLCBDb2xzLCBSb3dzPiAm dGhhdCkgdGhyZWFkXG4iCi0gICAgICAgICIgICAgICAgIDogV1NMTWF0cml4KHRoYXQsIF9tYWtl X2ludGVnZXJfc2VxdWVuY2U8aW50LCBDb2xzPigpKVxuIgotICAgICAgICAiICAgIHtcbiIKLSAg ICAgICAgIiAgICB9XG4iCiAgICAgICAgICIgICAgaW5saW5lIFdTTE1hdHJpeChjb25zdCBkZXZp Y2UgV1NMTWF0cml4PFQsIENvbHMsIFJvd3M+ICZ0aGF0KSB0aHJlYWQgPSBkZWZhdWx0O1xuIgot ICAgICAgICAiICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVPlxuIgotICAgICAgICAiICAgIGlubGlu ZSBleHBsaWNpdCBXU0xNYXRyaXgoY29uc3QgZGV2aWNlIFdTTE1hdHJpeDxVLCBDb2xzLCBSb3dz PiAmdGhhdCkgdGhyZWFkXG4iCi0gICAgICAgICIgICAgICAgIDogV1NMTWF0cml4KHRoYXQsIF9t YWtlX2ludGVnZXJfc2VxdWVuY2U8aW50LCBDb2xzPigpKVxuIgotICAgICAgICAiICAgIHtcbiIK LSAgICAgICAgIiAgICB9XG4iCiAgICAgICAgICIgICAgaW5saW5lIFdTTE1hdHJpeChjb25zdCBj b25zdGFudCBXU0xNYXRyaXg8VCwgQ29scywgUm93cz4gJnRoYXQpIHRocmVhZCA9IGRlZmF1bHQ7 XG4iCi0gICAgICAgICIgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+XG4iCi0gICAgICAgICIgICAg aW5saW5lIGV4cGxpY2l0IFdTTE1hdHJpeChjb25zdCBjb25zdGFudCBXU0xNYXRyaXg8VSwgQ29s cywgUm93cz4gJnRoYXQpIHRocmVhZFxuIgotICAgICAgICAiICAgICAgICA6IFdTTE1hdHJpeCh0 aGF0LCBfbWFrZV9pbnRlZ2VyX3NlcXVlbmNlPGludCwgQ29scz4oKSlcbiIKLSAgICAgICAgIiAg ICB7XG4iCi0gICAgICAgICIgICAgfVxuIgogICAgICAgICAiICAgIGlubGluZSBXU0xNYXRyaXgo Y29uc3QgdGhyZWFkZ3JvdXAgV1NMTWF0cml4PFQsIENvbHMsIFJvd3M+ICZ0aGF0KSB0aHJlYWQg PSBkZWZhdWx0O1xuIgotICAgICAgICAiICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVPlxuIgotICAg ICAgICAiICAgIGlubGluZSBleHBsaWNpdCBXU0xNYXRyaXgoY29uc3QgdGhyZWFkZ3JvdXAgV1NM TWF0cml4PFUsIENvbHMsIFJvd3M+ICZ0aGF0KSB0aHJlYWRcbiIKLSAgICAgICAgIiAgICAgICAg OiBXU0xNYXRyaXgodGhhdCwgX21ha2VfaW50ZWdlcl9zZXF1ZW5jZTxpbnQsIENvbHM+KCkpXG4i Ci0gICAgICAgICIgICAge1xuIgotICAgICAgICAiICAgIH1cbiIKICAgICAgICAgIiAgICBpbmxp bmUgV1NMTWF0cml4KGNvbnN0IHRocmVhZCBXU0xNYXRyaXg8VCwgQ29scywgUm93cz4gJnRoYXQp IGNvbnN0YW50ID0gZGVmYXVsdDtcbiIKLSAgICAgICAgIiAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUg VT5cbiIKLSAgICAgICAgIiAgICBpbmxpbmUgZXhwbGljaXQgV1NMTWF0cml4KGNvbnN0IHRocmVh ZCBXU0xNYXRyaXg8VSwgQ29scywgUm93cz4gJnRoYXQpIGNvbnN0YW50XG4iCi0gICAgICAgICIg ICAgICAgIDogV1NMTWF0cml4KHRoYXQsIF9tYWtlX2ludGVnZXJfc2VxdWVuY2U8aW50LCBDb2xz PigpKVxuIgotICAgICAgICAiICAgIHtcbiIKLSAgICAgICAgIiAgICB9XG4iCiAgICAgICAgICIg ICAgaW5saW5lIFdTTE1hdHJpeChjb25zdCBkZXZpY2UgV1NMTWF0cml4PFQsIENvbHMsIFJvd3M+ ICZ0aGF0KSBjb25zdGFudCA9IGRlZmF1bHQ7XG4iCi0gICAgICAgICIgICAgdGVtcGxhdGUgPHR5 cGVuYW1lIFU+XG4iCi0gICAgICAgICIgICAgaW5saW5lIGV4cGxpY2l0IFdTTE1hdHJpeChjb25z dCBkZXZpY2UgV1NMTWF0cml4PFUsIENvbHMsIFJvd3M+ICZ0aGF0KSBjb25zdGFudFxuIgotICAg ICAgICAiICAgICAgICA6IFdTTE1hdHJpeCh0aGF0LCBfbWFrZV9pbnRlZ2VyX3NlcXVlbmNlPGlu dCwgQ29scz4oKSlcbiIKLSAgICAgICAgIiAgICB7XG4iCi0gICAgICAgICIgICAgfVxuIgogICAg ICAgICAiICAgIGlubGluZSBXU0xNYXRyaXgoY29uc3QgY29uc3RhbnQgV1NMTWF0cml4PFQsIENv bHMsIFJvd3M+ICZ0aGF0KSBjb25zdGFudCA9IGRlZmF1bHQ7XG4iCi0gICAgICAgICIgICAgdGVt cGxhdGUgPHR5cGVuYW1lIFU+XG4iCi0gICAgICAgICIgICAgaW5saW5lIGV4cGxpY2l0IFdTTE1h dHJpeChjb25zdCBjb25zdGFudCBXU0xNYXRyaXg8VSwgQ29scywgUm93cz4gJnRoYXQpIGNvbnN0 YW50XG4iCi0gICAgICAgICIgICAgICAgIDogV1NMTWF0cml4KHRoYXQsIF9tYWtlX2ludGVnZXJf c2VxdWVuY2U8aW50LCBDb2xzPigpKVxuIgotICAgICAgICAiICAgIHtcbiIKLSAgICAgICAgIiAg ICB9XG4iCiAgICAgICAgICIgICAgaW5saW5lIFdTTE1hdHJpeChjb25zdCB0aHJlYWRncm91cCBX U0xNYXRyaXg8VCwgQ29scywgUm93cz4gJnRoYXQpIGNvbnN0YW50ID0gZGVmYXVsdDtcbiIKLSAg ICAgICAgIiAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVT5cbiIKLSAgICAgICAgIiAgICBpbmxpbmUg ZXhwbGljaXQgV1NMTWF0cml4KGNvbnN0IHRocmVhZGdyb3VwIFdTTE1hdHJpeDxVLCBDb2xzLCBS b3dzPiAmdGhhdCkgY29uc3RhbnRcbiIKLSAgICAgICAgIiAgICAgICAgOiBXU0xNYXRyaXgodGhh dCwgX21ha2VfaW50ZWdlcl9zZXF1ZW5jZTxpbnQsIENvbHM+KCkpXG4iCi0gICAgICAgICIgICAg e1xuIgotICAgICAgICAiICAgIH1cbiIKICAgICAgICAgIiAgICBwdWJsaWM6XG4iCiAgICAgICAg ICIgICAgaW5saW5lIHRocmVhZCB2ZWM8VCwgUm93cz4gJm9wZXJhdG9yW10oaW50IHIpIHRocmVh ZFxuIgogICAgICAgICAiICAgIHtcbiIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vi Z3B1L1dITFNML01ldGFsL1dITFNMTmF0aXZlRnVuY3Rpb25Xcml0ZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMTmF0aXZl RnVuY3Rpb25Xcml0ZXIuY3BwCShyZXZpc2lvbiAyNDk4MTIpCisrKyBTb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3dlYmdwdS9XSExTTC9NZXRhbC9XSExTTE5hdGl2ZUZ1bmN0aW9uV3JpdGVyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTgyLDEzICsxODIsMzMgQEAgdm9pZCBpbmxpbmVOYXRpdmVGdW5j dGlvbihTdHJpbmdCdWlsZGVyJgogICAgICAgICB9CiAKICAgICAgICAgaWYgKGF1dG8qIG1hdHJp eFR5cGUgPSBhc01hdHJpeFR5cGUocmV0dXJuVHlwZSkpIHsKLSAgICAgICAgICAgIHN0cmluZ0J1 aWxkZXIuYXBwZW5kKG1ldGFsUmV0dXJuVHlwZU5hbWUsICcoJyk7Ci0gICAgICAgICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IGFyZ3Muc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgICAgICAgICBp ZiAoaSkKLSAgICAgICAgICAgICAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmQoIiwgIik7Ci0g ICAgICAgICAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmQoYXJnc1tpXSk7CisgICAgICAgICAg ICAvLyBXZSdyZSBlaXRoZXIgY29uc3RydWN0aW5nIHdpdGggYWxsIGluZGl2aWR1YWwgZWxlbWVu dHMsIG9yIHdpdGgKKyAgICAgICAgICAgIC8vIHZlY3RvcnMgZm9yIGVhY2ggY29sdW1uLgorCisg ICAgICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgnKCcpOworICAgICAgICAgICAgaWYgKGFy Z3Muc2l6ZSgpID09IG1hdHJpeFR5cGUtPm51bWJlck9mTWF0cml4Q29sdW1ucygpKSB7CisgICAg ICAgICAgICAgICAgLy8gQ29uc3RydWN0aW5nIHdpdGggdmVjdG9ycyBmb3IgZWFjaCBjb2x1bW4u CisgICAgICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhcmdzLnNpemUoKTsgKytp KSB7CisgICAgICAgICAgICAgICAgICAgIGlmIChpKQorICAgICAgICAgICAgICAgICAgICAgICAg c3RyaW5nQnVpbGRlci5hcHBlbmQoIiwgIik7CisgICAgICAgICAgICAgICAgICAgIHN0cmluZ0J1 aWxkZXIuYXBwZW5kKHJlc3VsdE5hbWUsICIuY29sdW1uc1siLCBpLCAiXSA9ICIsIGFyZ3NbaV0p OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAg ICAgLy8gQ29uc3RydWN0aW5nIHdpdGggYWxsIGVsZW1lbnRzLgorICAgICAgICAgICAgICAgIFJF TEVBU0VfQVNTRVJUKGFyZ3Muc2l6ZSgpID09IG1hdHJpeFR5cGUtPm51bWJlck9mTWF0cml4Q29s dW1ucygpICogbWF0cml4VHlwZS0+bnVtYmVyT2ZNYXRyaXhSb3dzKCkpOworCisgICAgICAgICAg ICAgICAgc2l6ZV90IGFyZ051bWJlciA9IDA7CisgICAgICAgICAgICAgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBtYXRyaXhUeXBlLT5udW1iZXJPZk1hdHJpeENvbHVtbnMoKTsgKytpKSB7Cisg ICAgICAgICAgICAgICAgICAgIGZvciAoc2l6ZV90IGogPSAwOyBqIDwgbWF0cml4VHlwZS0+bnVt YmVyT2ZNYXRyaXhSb3dzKCk7ICsraikgeworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGFy Z051bWJlcikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVu ZCgiLCAiKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kKHJl c3VsdE5hbWUsICIuY29sdW1uc1siLCBpLCAiXVsiLCBqLCAiXSA9ICIsIGFyZ3NbYXJnTnVtYmVy XSk7CisgICAgICAgICAgICAgICAgICAgICAgICArK2FyZ051bWJlcjsKKyAgICAgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHN0 cmluZ0J1aWxkZXIuYXBwZW5kKCcpJyk7CisKKyAgICAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBw ZW5kKCIsICIsIHJlc3VsdE5hbWUsICcpJyk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KIAo= 378677 2019-09-12 13:53:46 -0700 2019-09-12 14:47:31 -0700 patch a-backup.diff text/plain 10823 saam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0OTgxNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA5LTEyICBTYWFtIEJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFtXSExTTF0gU2xpbSBkb3duIFdT TE1hdHJpeCBhbmQgaW5saW5lIGNvbnN0cnVjdG9ycyBpbiBuYXRpdmUgY29kZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNTY4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmVmb3JlLCBvdXIgV1NMIE1h dHJpeCBpbiBNU0wgaGFkIHRlbXBsYXRlcyB0byBmaWd1cmUgb3V0IGhvdyB3ZSdyZSAKKyAgICAg ICAgY29uc3RydWN0aW5nIGl0LiBGb3IgZXhhbXBsZSwgd2l0aCBhIGxpc3Qgb2YgZWxlbWVudHMs IG9yIGEgbGlzdCBvZgorICAgICAgICBjb2x1bW5zLiBIb3dldmVyLCB3ZSBjYW4gcmVtb3ZlIHRo aXMgdGVtcGxhdGUgY29kZSBzaW5jZSB3aGVuIHdlJ3JlCisgICAgICAgIGVtaXR0aW5nIE1ldGFs IGNvZGUsIHdlIGtub3cgZXhhY3RseSBob3cgd2UncmUgY29uc3RydWN0aW5nIHRoZSBXU0wKKyAg ICAgICAgbWF0cml4LiBTbyB0aGUgTmF0aXZlRnVuY3Rpb25Xcml0ZXIgbm93IGlubGluZXMgdGhl IHByb3BlciBzdG9yZXMKKyAgICAgICAgaW50byB0aGUgV1NMTWF0cml4IGVsZW1lbnRzLgorICAg ICAgICAKKyAgICAgICAgVGhpcyBwYXRjaCBzcGVlZHMgdXAgTWV0YWwgY29tcGlsZSB0aW1lcyBp biBib2lkcyBieSB+NG1zICgxNiUpIHdpdGgKKyAgICAgICAgYSBwLXZhbHVlIG9mIDAuMDAwMS4K KworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogTW9kdWxl cy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xNZXRhbENvZGVHZW5lcmF0b3IuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6V0hMU0w6Ok1ldGFsOjptZXRhbENvZGVQcm9sb2d1ZSk6CisgICAgICAgICog TW9kdWxlcy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xOYXRpdmVGdW5jdGlvbldyaXRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpXSExTTDo6TWV0YWw6OmlubGluZU5hdGl2ZUZ1bmN0aW9uKToK KwogMjAxOS0wOS0xMiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAog ICAgICAgICBbQ29jb2FdIFRleHQgaW5kaWNhdG9yIGZvciBhbiBpbWFnZSBsaW5rIG9uIHRoZSBm cm9udCBwYWdlIG9mIGFwcGxlLmNvbSBsb29rcyB3cm9uZwpJbmRleDogU291cmNlL1dlYkNvcmUv TW9kdWxlcy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xNZXRhbENvZGVHZW5lcmF0b3IuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dI TFNMTWV0YWxDb2RlR2VuZXJhdG9yLmNwcAkocmV2aXNpb24gMjQ5ODEyKQorKysgU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xNZXRhbENvZGVHZW5lcmF0b3Iu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OCwxMzIgKzU4LDE3IEBAIHN0YXRpYyBTdHJpbmdWaWV3 IG1ldGFsQ29kZVByb2xvZ3VlKCkKICAgICAgICAgIntcbiIKICAgICAgICAgIiAgICB2ZWM8VCwg Um93cz4gY29sdW1uc1tDb2xzXTtcbiIKICAgICAgICAgIiAgICBwcml2YXRlOlxuIgotICAgICAg ICAiICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVLCBpbnQuLi4gUj5cbiIKLSAgICAgICAgIiAgICBz dGF0aWMgdmVjPFQsIFJvd3M+IGJ1aWxkX2NvbChpbml0aWFsaXplcl9saXN0PFU+IGNvbCwgX2lu dGVnZXJfc2VxdWVuY2U8aW50LCBSLi4uPilcbiIKLSAgICAgICAgIiAgICB7XG4iCi0gICAgICAg ICIgICAgICAgIHJldHVybiB7KFIgPCBjb2wuc2l6ZSgpID8gKihjb2wuYmVnaW4oKSArIFIpIDog VSgpKS4uLn07XG4iCi0gICAgICAgICIgICAgfVxuIgotICAgICAgICAiICAgIHRlbXBsYXRlIDxp bnQuLi4gUj5cbiIKLSAgICAgICAgIiAgICBzdGF0aWMgdmVjPFQsIFJvd3M+IGJ1aWxkX2Z1bGxf Y29sKGludCBjLCBpbml0aWFsaXplcl9saXN0PFQ+IGVsZW1zLCBfaW50ZWdlcl9zZXF1ZW5jZTxp bnQsIFIuLi4+KVxuIgotICAgICAgICAiICAgIHtcbiIKLSAgICAgICAgIiAgICAgICAgcmV0dXJu IHsqKGVsZW1zLmJlZ2luKCkgKyBjICogUm93cyArIFIpLi4ufTtcbiIKLSAgICAgICAgIiAgICB9 XG4iCi0gICAgICAgICIgICAgc3RydWN0IGNvbHNfaW5pdF90YWcgeyB9O1xuIgotICAgICAgICAi ICAgIHN0cnVjdCBjb2xzX2FsbF90YWcgeyB9O1xuIgotICAgICAgICAiICAgIHN0cnVjdCBlbGVt c19hbGxfdGFnIHsgfTtcbiIKLSAgICAgICAgIiAgICB0ZW1wbGF0ZSA8aW50Li4uIEM+XG4iCi0g ICAgICAgICIgICAgaW5saW5lIGV4cGxpY2l0IFdTTE1hdHJpeChjb2xzX2luaXRfdGFnLCBpbml0 aWFsaXplcl9saXN0PHZlYzxULCBSb3dzPj4gY29scywgX2ludGVnZXJfc2VxdWVuY2U8aW50LCBD Li4uPikgdGhyZWFkXG4iCi0gICAgICAgICIgICAgICAgIDogY29sdW1uc3soQyA8IGNvbHMuc2l6 ZSgpID8gKihjb2xzLmJlZ2luKCkgKyBDKSA6IHZlYzxULCBSb3dzPigpKS4uLn1cbiIKLSAgICAg ICAgIiAgICB7XG4iCi0gICAgICAgICIgICAgfVxuIgotICAgICAgICAiICAgIHRlbXBsYXRlIDx0 eXBlbmFtZS4uLiBVPlxuIgotICAgICAgICAiICAgIGlubGluZSBleHBsaWNpdCBXU0xNYXRyaXgo Y29sc19hbGxfdGFnLCBVLi4uIGNvbHMpIHRocmVhZFxuIgotICAgICAgICAiICAgICAgICA6IGNv bHVtbnN7IGNvbHMuLi4gfVxuIgotICAgICAgICAiICAgIHtcbiIKLSAgICAgICAgIiAgICB9XG4i Ci0gICAgICAgICIgICAgdGVtcGxhdGUgPHR5cGVuYW1lLi4uIFU+XG4iCi0gICAgICAgICIgICAg aW5saW5lIGV4cGxpY2l0IFdTTE1hdHJpeChlbGVtc19hbGxfdGFnLCBVLi4uIGVsZW1zKSB0aHJl YWRcbiIKLSAgICAgICAgIiAgICAgICAgOiBXU0xNYXRyaXgoe1QoZWxlbXMpLi4ufSwgX21ha2Vf aW50ZWdlcl9zZXF1ZW5jZTxpbnQsIENvbHM+KCkpXG4iCi0gICAgICAgICIgICAgICAgIHtcbiIK LSAgICAgICAgIiAgICAgICAgfVxuIgotICAgICAgICAiICAgIHRlbXBsYXRlIDxpbnQuLi4gQz5c biIKLSAgICAgICAgIiAgICBpbmxpbmUgZXhwbGljaXQgV1NMTWF0cml4KGluaXRpYWxpemVyX2xp c3Q8VD4gZWxlbXMsIF9pbnRlZ2VyX3NlcXVlbmNlPGludCwgQy4uLj4pIHRocmVhZFxuIgotICAg ICAgICAiICAgICAgICA6IGNvbHVtbnN7YnVpbGRfZnVsbF9jb2woQywgZWxlbXMsIF9tYWtlX2lu dGVnZXJfc2VxdWVuY2U8aW50LCBSb3dzPigpKS4uLn1cbiIKLSAgICAgICAgIiAgICB7XG4iCi0g ICAgICAgICIgICAgfVxuIgotICAgICAgICAiICAgIHRlbXBsYXRlIDxpbnQuLi4gQz5cbiIKLSAg ICAgICAgIiAgICBpbmxpbmUgZXhwbGljaXQgV1NMTWF0cml4KGNvbHNfaW5pdF90YWcsIGluaXRp YWxpemVyX2xpc3Q8dmVjPFQsIFJvd3M+PiBjb2xzLCBfaW50ZWdlcl9zZXF1ZW5jZTxpbnQsIEMu Li4+KSBjb25zdGFudFxuIgotICAgICAgICAiICAgICAgICA6IGNvbHVtbnN7KEMgPCBjb2xzLnNp emUoKSA/ICooY29scy5iZWdpbigpICsgQykgOiB2ZWM8VCwgUm93cz4oKSkuLi59XG4iCi0gICAg ICAgICIgICAge1xuIgotICAgICAgICAiICAgIH1cbiIKLSAgICAgICAgIiAgICB0ZW1wbGF0ZSA8 dHlwZW5hbWUuLi4gVT5cbiIKLSAgICAgICAgIiAgICBpbmxpbmUgZXhwbGljaXQgV1NMTWF0cml4 KGNvbHNfYWxsX3RhZywgVS4uLiBjb2xzKSBjb25zdGFudFxuIgotICAgICAgICAiICAgICAgICA6 IGNvbHVtbnN7IGNvbHMuLi4gfVxuIgotICAgICAgICAiICAgIHtcbiIKLSAgICAgICAgIiAgICB9 XG4iCi0gICAgICAgICIgICAgdGVtcGxhdGUgPHR5cGVuYW1lLi4uIFU+XG4iCi0gICAgICAgICIg ICAgaW5saW5lIGV4cGxpY2l0IFdTTE1hdHJpeChlbGVtc19hbGxfdGFnLCBVLi4uIGVsZW1zKSBj b25zdGFudFxuIgotICAgICAgICAiICAgICAgICA6IFdTTE1hdHJpeCh7VChlbGVtcykuLi59LCBf bWFrZV9pbnRlZ2VyX3NlcXVlbmNlPGludCwgQ29scz4oKSlcbiIKLSAgICAgICAgIiAgICAgICAg e1xuIgotICAgICAgICAiICAgICAgICB9XG4iCi0gICAgICAgICIgICAgdGVtcGxhdGUgPGludC4u LiBDPlxuIgotICAgICAgICAiICAgIGlubGluZSBleHBsaWNpdCBXU0xNYXRyaXgoaW5pdGlhbGl6 ZXJfbGlzdDxUPiBlbGVtcywgX2ludGVnZXJfc2VxdWVuY2U8aW50LCBDLi4uPikgY29uc3RhbnRc biIKLSAgICAgICAgIiAgICAgICAgOiBjb2x1bW5ze2J1aWxkX2Z1bGxfY29sKEMsIGVsZW1zLCBf bWFrZV9pbnRlZ2VyX3NlcXVlbmNlPGludCwgUm93cz4oKSkuLi59XG4iCi0gICAgICAgICIgICAg e1xuIgotICAgICAgICAiICAgIH1cbiIKICAgICAgICAgIiAgICBwdWJsaWM6XG4iCiAgICAgICAg ICIgICAgaW5saW5lIFdTTE1hdHJpeCgpIHRocmVhZCA9IGRlZmF1bHQ7XG4iCi0gICAgICAgICIg ICAgaW5saW5lIFdTTE1hdHJpeChpbml0aWFsaXplcl9saXN0PHZlYzxULCBSb3dzPj4gY29scykg dGhyZWFkXG4iCi0gICAgICAgICIgICAgICAgIDogV1NMTWF0cml4KGNvbHNfaW5pdF90YWcoKSwg Y29scywgX21ha2VfaW50ZWdlcl9zZXF1ZW5jZTxpbnQsIENvbHM+KCkpXG4iCi0gICAgICAgICIg ICAge1xuIgotICAgICAgICAiICAgIH1cbiIKLSAgICAgICAgIiAgICB0ZW1wbGF0ZSA8dHlwZW5h bWUuLi4gVT5cbiIKLSAgICAgICAgIiAgICBpbmxpbmUgZXhwbGljaXQgV1NMTWF0cml4KFUuLi4g dmFscykgdGhyZWFkXG4iCi0gICAgICAgICIgICAgICAgIDogV1NMTWF0cml4KGNvbmRpdGlvbmFs X3Q8c2l6ZW9mLi4uKFUpID09IENvbHMsIGNvbHNfYWxsX3RhZywgZWxlbXNfYWxsX3RhZz4oKSwg dmFscy4uLilcbiIKLSAgICAgICAgIiAgICB7XG4iCi0gICAgICAgICIgICAgfVxuIgogICAgICAg ICAiICAgIGlubGluZSBXU0xNYXRyaXgoKSBjb25zdGFudCA9IGRlZmF1bHQ7XG4iCi0gICAgICAg ICIgICAgaW5saW5lIFdTTE1hdHJpeChpbml0aWFsaXplcl9saXN0PHZlYzxULCBSb3dzPj4gY29s cykgY29uc3RhbnRcbiIKLSAgICAgICAgIiAgICAgICAgOiBXU0xNYXRyaXgoY29sc19pbml0X3Rh ZygpLCBjb2xzLCBfbWFrZV9pbnRlZ2VyX3NlcXVlbmNlPGludCwgQ29scz4oKSlcbiIKLSAgICAg ICAgIiAgICB7XG4iCi0gICAgICAgICIgICAgfVxuIgotICAgICAgICAiICAgIGlubGluZSBleHBs aWNpdCBXU0xNYXRyaXgoVCB2YWwpIGNvbnN0YW50XG4iCi0gICAgICAgICIgICAgICAgIDogV1NM TWF0cml4KHZhbCwgX21ha2VfaW50ZWdlcl9zZXF1ZW5jZTxpbnQsIENvbHM+KCkpXG4iCi0gICAg ICAgICIgICAge1xuIgotICAgICAgICAiICAgIH1cbiIKLSAgICAgICAgIiAgICB0ZW1wbGF0ZSA8 dHlwZW5hbWUuLi4gVT5cbiIKLSAgICAgICAgIiAgICBpbmxpbmUgZXhwbGljaXQgV1NMTWF0cml4 KFUuLi4gdmFscykgY29uc3RhbnRcbiIKLSAgICAgICAgIiAgICAgICAgOiBXU0xNYXRyaXgoY29u ZGl0aW9uYWxfdDxzaXplb2YuLi4oVSkgPT0gQ29scywgY29sc19hbGxfdGFnLCBlbGVtc19hbGxf dGFnPigpLCB2YWxzLi4uKVxuIgotICAgICAgICAiICAgIHtcbiIKLSAgICAgICAgIiAgICB9XG4i CiAgICAgICAgICIgICAgaW5saW5lIFdTTE1hdHJpeChjb25zdCB0aHJlYWQgV1NMTWF0cml4PFQs IENvbHMsIFJvd3M+ICZ0aGF0KSB0aHJlYWQgPSBkZWZhdWx0O1xuIgotICAgICAgICAiICAgIHRl bXBsYXRlIDx0eXBlbmFtZSBVPlxuIgotICAgICAgICAiICAgIGlubGluZSBleHBsaWNpdCBXU0xN YXRyaXgoY29uc3QgdGhyZWFkIFdTTE1hdHJpeDxVLCBDb2xzLCBSb3dzPiAmdGhhdCkgdGhyZWFk XG4iCi0gICAgICAgICIgICAgICAgIDogV1NMTWF0cml4KHRoYXQsIF9tYWtlX2ludGVnZXJfc2Vx dWVuY2U8aW50LCBDb2xzPigpKVxuIgotICAgICAgICAiICAgIHtcbiIKLSAgICAgICAgIiAgICB9 XG4iCiAgICAgICAgICIgICAgaW5saW5lIFdTTE1hdHJpeChjb25zdCBkZXZpY2UgV1NMTWF0cml4 PFQsIENvbHMsIFJvd3M+ICZ0aGF0KSB0aHJlYWQgPSBkZWZhdWx0O1xuIgotICAgICAgICAiICAg IHRlbXBsYXRlIDx0eXBlbmFtZSBVPlxuIgotICAgICAgICAiICAgIGlubGluZSBleHBsaWNpdCBX U0xNYXRyaXgoY29uc3QgZGV2aWNlIFdTTE1hdHJpeDxVLCBDb2xzLCBSb3dzPiAmdGhhdCkgdGhy ZWFkXG4iCi0gICAgICAgICIgICAgICAgIDogV1NMTWF0cml4KHRoYXQsIF9tYWtlX2ludGVnZXJf c2VxdWVuY2U8aW50LCBDb2xzPigpKVxuIgotICAgICAgICAiICAgIHtcbiIKLSAgICAgICAgIiAg ICB9XG4iCiAgICAgICAgICIgICAgaW5saW5lIFdTTE1hdHJpeChjb25zdCBjb25zdGFudCBXU0xN YXRyaXg8VCwgQ29scywgUm93cz4gJnRoYXQpIHRocmVhZCA9IGRlZmF1bHQ7XG4iCi0gICAgICAg ICIgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+XG4iCi0gICAgICAgICIgICAgaW5saW5lIGV4cGxp Y2l0IFdTTE1hdHJpeChjb25zdCBjb25zdGFudCBXU0xNYXRyaXg8VSwgQ29scywgUm93cz4gJnRo YXQpIHRocmVhZFxuIgotICAgICAgICAiICAgICAgICA6IFdTTE1hdHJpeCh0aGF0LCBfbWFrZV9p bnRlZ2VyX3NlcXVlbmNlPGludCwgQ29scz4oKSlcbiIKLSAgICAgICAgIiAgICB7XG4iCi0gICAg ICAgICIgICAgfVxuIgogICAgICAgICAiICAgIGlubGluZSBXU0xNYXRyaXgoY29uc3QgdGhyZWFk Z3JvdXAgV1NMTWF0cml4PFQsIENvbHMsIFJvd3M+ICZ0aGF0KSB0aHJlYWQgPSBkZWZhdWx0O1xu IgotICAgICAgICAiICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVPlxuIgotICAgICAgICAiICAgIGlu bGluZSBleHBsaWNpdCBXU0xNYXRyaXgoY29uc3QgdGhyZWFkZ3JvdXAgV1NMTWF0cml4PFUsIENv bHMsIFJvd3M+ICZ0aGF0KSB0aHJlYWRcbiIKLSAgICAgICAgIiAgICAgICAgOiBXU0xNYXRyaXgo dGhhdCwgX21ha2VfaW50ZWdlcl9zZXF1ZW5jZTxpbnQsIENvbHM+KCkpXG4iCi0gICAgICAgICIg ICAge1xuIgotICAgICAgICAiICAgIH1cbiIKICAgICAgICAgIiAgICBpbmxpbmUgV1NMTWF0cml4 KGNvbnN0IHRocmVhZCBXU0xNYXRyaXg8VCwgQ29scywgUm93cz4gJnRoYXQpIGNvbnN0YW50ID0g ZGVmYXVsdDtcbiIKLSAgICAgICAgIiAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVT5cbiIKLSAgICAg ICAgIiAgICBpbmxpbmUgZXhwbGljaXQgV1NMTWF0cml4KGNvbnN0IHRocmVhZCBXU0xNYXRyaXg8 VSwgQ29scywgUm93cz4gJnRoYXQpIGNvbnN0YW50XG4iCi0gICAgICAgICIgICAgICAgIDogV1NM TWF0cml4KHRoYXQsIF9tYWtlX2ludGVnZXJfc2VxdWVuY2U8aW50LCBDb2xzPigpKVxuIgotICAg ICAgICAiICAgIHtcbiIKLSAgICAgICAgIiAgICB9XG4iCiAgICAgICAgICIgICAgaW5saW5lIFdT TE1hdHJpeChjb25zdCBkZXZpY2UgV1NMTWF0cml4PFQsIENvbHMsIFJvd3M+ICZ0aGF0KSBjb25z dGFudCA9IGRlZmF1bHQ7XG4iCi0gICAgICAgICIgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+XG4i Ci0gICAgICAgICIgICAgaW5saW5lIGV4cGxpY2l0IFdTTE1hdHJpeChjb25zdCBkZXZpY2UgV1NM TWF0cml4PFUsIENvbHMsIFJvd3M+ICZ0aGF0KSBjb25zdGFudFxuIgotICAgICAgICAiICAgICAg ICA6IFdTTE1hdHJpeCh0aGF0LCBfbWFrZV9pbnRlZ2VyX3NlcXVlbmNlPGludCwgQ29scz4oKSlc biIKLSAgICAgICAgIiAgICB7XG4iCi0gICAgICAgICIgICAgfVxuIgogICAgICAgICAiICAgIGlu bGluZSBXU0xNYXRyaXgoY29uc3QgY29uc3RhbnQgV1NMTWF0cml4PFQsIENvbHMsIFJvd3M+ICZ0 aGF0KSBjb25zdGFudCA9IGRlZmF1bHQ7XG4iCi0gICAgICAgICIgICAgdGVtcGxhdGUgPHR5cGVu YW1lIFU+XG4iCi0gICAgICAgICIgICAgaW5saW5lIGV4cGxpY2l0IFdTTE1hdHJpeChjb25zdCBj b25zdGFudCBXU0xNYXRyaXg8VSwgQ29scywgUm93cz4gJnRoYXQpIGNvbnN0YW50XG4iCi0gICAg ICAgICIgICAgICAgIDogV1NMTWF0cml4KHRoYXQsIF9tYWtlX2ludGVnZXJfc2VxdWVuY2U8aW50 LCBDb2xzPigpKVxuIgotICAgICAgICAiICAgIHtcbiIKLSAgICAgICAgIiAgICB9XG4iCiAgICAg ICAgICIgICAgaW5saW5lIFdTTE1hdHJpeChjb25zdCB0aHJlYWRncm91cCBXU0xNYXRyaXg8VCwg Q29scywgUm93cz4gJnRoYXQpIGNvbnN0YW50ID0gZGVmYXVsdDtcbiIKLSAgICAgICAgIiAgICB0 ZW1wbGF0ZSA8dHlwZW5hbWUgVT5cbiIKLSAgICAgICAgIiAgICBpbmxpbmUgZXhwbGljaXQgV1NM TWF0cml4KGNvbnN0IHRocmVhZGdyb3VwIFdTTE1hdHJpeDxVLCBDb2xzLCBSb3dzPiAmdGhhdCkg Y29uc3RhbnRcbiIKLSAgICAgICAgIiAgICAgICAgOiBXU0xNYXRyaXgodGhhdCwgX21ha2VfaW50 ZWdlcl9zZXF1ZW5jZTxpbnQsIENvbHM+KCkpXG4iCi0gICAgICAgICIgICAge1xuIgotICAgICAg ICAiICAgIH1cbiIKICAgICAgICAgIiAgICBwdWJsaWM6XG4iCiAgICAgICAgICIgICAgaW5saW5l IHRocmVhZCB2ZWM8VCwgUm93cz4gJm9wZXJhdG9yW10oaW50IHIpIHRocmVhZFxuIgogICAgICAg ICAiICAgIHtcbiIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML01l dGFsL1dITFNMTmF0aXZlRnVuY3Rpb25Xcml0ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMTmF0aXZlRnVuY3Rpb25Xcml0 ZXIuY3BwCShyZXZpc2lvbiAyNDk4MTIpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdw dS9XSExTTC9NZXRhbC9XSExTTE5hdGl2ZUZ1bmN0aW9uV3JpdGVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTgyLDEzICsxODIsMzMgQEAgdm9pZCBpbmxpbmVOYXRpdmVGdW5jdGlvbihTdHJpbmdC dWlsZGVyJgogICAgICAgICB9CiAKICAgICAgICAgaWYgKGF1dG8qIG1hdHJpeFR5cGUgPSBhc01h dHJpeFR5cGUocmV0dXJuVHlwZSkpIHsKLSAgICAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5k KG1ldGFsUmV0dXJuVHlwZU5hbWUsICcoJyk7Ci0gICAgICAgICAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IGFyZ3Muc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgICAgICAgICBpZiAoaSkKLSAgICAg ICAgICAgICAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmQoIiwgIik7Ci0gICAgICAgICAgICAg ICAgc3RyaW5nQnVpbGRlci5hcHBlbmQoYXJnc1tpXSk7CisgICAgICAgICAgICAvLyBXZSdyZSBl aXRoZXIgY29uc3RydWN0aW5nIHdpdGggYWxsIGluZGl2aWR1YWwgZWxlbWVudHMsIG9yIHdpdGgK KyAgICAgICAgICAgIC8vIHZlY3RvcnMgZm9yIGVhY2ggY29sdW1uLgorCisgICAgICAgICAgICBz dHJpbmdCdWlsZGVyLmFwcGVuZCgnKCcpOworICAgICAgICAgICAgaWYgKGFyZ3Muc2l6ZSgpID09 IG1hdHJpeFR5cGUtPm51bWJlck9mTWF0cml4Q29sdW1ucygpKSB7CisgICAgICAgICAgICAgICAg Ly8gQ29uc3RydWN0aW5nIHdpdGggdmVjdG9ycyBmb3IgZWFjaCBjb2x1bW4uCisgICAgICAgICAg ICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhcmdzLnNpemUoKTsgKytpKSB7CisgICAgICAg ICAgICAgICAgICAgIGlmIChpKQorICAgICAgICAgICAgICAgICAgICAgICAgc3RyaW5nQnVpbGRl ci5hcHBlbmQoIiwgIik7CisgICAgICAgICAgICAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5k KHJlc3VsdE5hbWUsICIuY29sdW1uc1siLCBpLCAiXSA9ICIsIGFyZ3NbaV0pOworICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgLy8gQ29uc3Ry dWN0aW5nIHdpdGggYWxsIGVsZW1lbnRzLgorICAgICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJU KGFyZ3Muc2l6ZSgpID09IG1hdHJpeFR5cGUtPm51bWJlck9mTWF0cml4Q29sdW1ucygpICogbWF0 cml4VHlwZS0+bnVtYmVyT2ZNYXRyaXhSb3dzKCkpOworCisgICAgICAgICAgICAgICAgc2l6ZV90 IGFyZ051bWJlciA9IDA7CisgICAgICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBt YXRyaXhUeXBlLT5udW1iZXJPZk1hdHJpeENvbHVtbnMoKTsgKytpKSB7CisgICAgICAgICAgICAg ICAgICAgIGZvciAoc2l6ZV90IGogPSAwOyBqIDwgbWF0cml4VHlwZS0+bnVtYmVyT2ZNYXRyaXhS b3dzKCk7ICsraikgeworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGFyZ051bWJlcikKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgiLCAiKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kKHJlc3VsdE5hbWUsICIu Y29sdW1uc1siLCBpLCAiXVsiLCBqLCAiXSA9ICIsIGFyZ3NbYXJnTnVtYmVyXSk7CisgICAgICAg ICAgICAgICAgICAgICAgICArK2FyZ051bWJlcjsKKyAgICAgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHN0cmluZ0J1aWxkZXIu YXBwZW5kKCcpJyk7CisKKyAgICAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kKCIsICIsIHJl c3VsdE5hbWUsICcpJyk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAo=