200188 2019-07-26 19:04:49 -0700 [WHLSL] Remove UnnamedType copy/move constructors and mark classes as final 2019-07-31 17:04:44 -0700 1 1 1 Unclassified WebKit WebGPU WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam darin dino ews-watchlist fpizlo jonlee justin_fan mmaxfield rmorisset webkit-bug-importer oldest_to_newest 1556324 0 saam 2019-07-26 19:04:49 -0700 They don't make any sense anymore since UnnamedType is now ref counted. You should just take a ref to the thing instead. 1556328 1 375009 saam 2019-07-26 19:27:19 -0700 Created attachment 375009 patch 1556330 2 ews-watchlist 2019-07-26 19:30:22 -0700 Attachment 375009 did not pass style-queue: ERROR: Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLPointerType.h:33: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLUnnamedType.h:33: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLArrayType.h:34: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLTypeReference.h:35: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLArrayReferenceType.h:33: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 5 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1556409 3 saam 2019-07-27 18:32:13 -0700 landed in: https://trac.webkit.org/changeset/247893/webkit 1556410 4 webkit-bug-importer 2019-07-27 18:33:16 -0700 <rdar://problem/53628171> 1556622 5 375009 darin 2019-07-29 11:26:41 -0700 Comment on attachment 375009 patch View in context: https://bugs.webkit.org/attachment.cgi?id=375009&action=review > Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLArrayReferenceType.h:47 > + WTF_MAKE_NONCOPYABLE(ArrayReferenceType); > + WTF_MAKE_NONMOVABLE(ArrayReferenceType); Doesn’t make sense to me that you would ever need both of these. I don’t think that’s how C++ works. If you delete the copy constructor I don’t think you normally have to explicitly delete the move constructor too, for example. 1557366 6 saam 2019-07-31 14:17:42 -0700 (In reply to Darin Adler from comment #5) > Comment on attachment 375009 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=375009&action=review > > > Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLArrayReferenceType.h:47 > > + WTF_MAKE_NONCOPYABLE(ArrayReferenceType); > > + WTF_MAKE_NONMOVABLE(ArrayReferenceType); > > Doesn’t make sense to me that you would ever need both of these. I don’t > think that’s how C++ works. If you delete the copy constructor I don’t think > you normally have to explicitly delete the move constructor too, for example. Yeah good point. I was employing full paranoia without remembering that explicitly defining (a deleted or not) copy constructor removes the move constructor. 1557368 7 saam 2019-07-31 14:21:29 -0700 I can prep a patch in a few minutes 1557406 8 375258 saam 2019-07-31 15:06:05 -0700 Created attachment 375258 followup patch 1557407 9 375259 saam 2019-07-31 15:07:26 -0700 Created attachment 375259 followup patch 1557451 10 saam 2019-07-31 17:04:44 -0700 landed followup in https://trac.webkit.org/changeset/248083/webkit 375009 2019-07-26 19:27:19 -0700 2019-07-26 20:02:26 -0700 patch b-backup.diff text/plain 9019 saam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0Nzg4NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE5LTA3LTI2ICBTYWFtIEJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFtXSExTTF0gUmVtb3ZlIFVubmFt ZWRUeXBlIGNvcHkvbW92ZSBjb25zdHJ1Y3RvcnMgYW5kIG1hcmsgY2xhc3NlcyBhcyBmaW5hbAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwMTg4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2luY2UgdGhl eSBhcmUgcmVmIGNvdW50ZWQsIHlvdSBzaG91bGQgbWFrZSB0YWtpbmcgYSByZWYgdG8gdGhlbQor ICAgICAgICBpbnN0ZWFkIG9mIG1vdmluZyBvciBjb3B5aW5nIHRoZW0uIFRoaXMgcGF0Y2ggZW5j b2RlcyB0aGF0IGJ5IGRlbGV0aW5nCisgICAgICAgIHRoZSByZWxldmFudCBjb3B5L21vdmUgY29u c3RydWN0b3JzIGFuZCBhc3NpZ25tZW50IG9wZXJhdG9ycy4KKworICAgICAgICAqIE1vZHVsZXMv d2ViZ3B1L1dITFNML0FTVC9XSExTTEFycmF5UmVmZXJlbmNlVHlwZS5oOgorICAgICAgICAqIE1v ZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTEFycmF5VHlwZS5oOgorICAgICAgICAoV2ViQ29y ZTo6V0hMU0w6OkFTVDo6QXJyYXlUeXBlOjpBcnJheVR5cGUpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6V0hMU0w6OkFTVDo6QXJyYXlUeXBlOjpjcmVhdGUpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6V0hMU0w6OkFTVDo6QXJyYXlUeXBlOjp0eXBlIGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OldITFNMOjpBU1Q6OkFycmF5VHlwZTo6dHlwZSk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpXSExTTDo6QVNUOjpBcnJheVR5cGU6Om51bUVsZW1lbnRzIGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBNb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xQ b2ludGVyVHlwZS5oOgorICAgICAgICAoV2ViQ29yZTo6V0hMU0w6OkFTVDo6UG9pbnRlclR5cGU6 OlBvaW50ZXJUeXBlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OldITFNMOjpBU1Q6OlBv aW50ZXJUeXBlOjpjcmVhdGUpOiBEZWxldGVkLgorICAgICAgICAqIE1vZHVsZXMvd2ViZ3B1L1dI TFNML0FTVC9XSExTTFJlZmVyZW5jZVR5cGUuaDoKKyAgICAgICAgKiBNb2R1bGVzL3dlYmdwdS9X SExTTC9BU1QvV0hMU0xUeXBlUmVmZXJlbmNlLmg6CisgICAgICAgIChXZWJDb3JlOjpXSExTTDo6 QVNUOjpUeXBlUmVmZXJlbmNlOjpUeXBlUmVmZXJlbmNlKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OldITFNMOjpBU1Q6OlR5cGVSZWZlcmVuY2U6OmNyZWF0ZSk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpXSExTTDo6QVNUOjpUeXBlUmVmZXJlbmNlOjpuYW1lKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OldITFNMOjpBU1Q6OlR5cGVSZWZlcmVuY2U6OnR5cGVBcmd1bWVu dHMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6V0hMU0w6OkFTVDo6VHlwZVJlZmVyZW5j ZTo6bWF5YmVSZXNvbHZlZFR5cGUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 V0hMU0w6OkFTVDo6VHlwZVJlZmVyZW5jZTo6cmVzb2x2ZWRUeXBlIGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OldITFNMOjpBU1Q6OlR5cGVSZWZlcmVuY2U6OnNldFJlc29sdmVk VHlwZSk6IERlbGV0ZWQuCisgICAgICAgICogTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNM VW5uYW1lZFR5cGUuaDoKKwogMjAxOS0wNy0yNiAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxl LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBSZW1vdmUgaW52YWxpZCBhc3NlcnRpb24gYWZ0 ZXIgcjI0Nzg3OC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FT VC9XSExTTEFycmF5UmVmZXJlbmNlVHlwZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTEFycmF5UmVmZXJlbmNlVHlwZS5oCShyZXZp c2lvbiAyNDc4ODYpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1Qv V0hMU0xBcnJheVJlZmVyZW5jZVR5cGUuaAkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsOCBA QAogI2luY2x1ZGUgIldITFNMQ29kZUxvY2F0aW9uLmgiCiAjaW5jbHVkZSAiV0hMU0xSZWZlcmVu Y2VUeXBlLmgiCiAjaW5jbHVkZSA8d3RmL0Zhc3RNYWxsb2MuaD4KKyNpbmNsdWRlIDx3dGYvTm9u bW92YWJsZS5oPgorI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9V bmlxdWVSZWYuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAtNDEsNiAr NDMsOCBAQCBuYW1lc3BhY2UgQVNUIHsKIAogY2xhc3MgQXJyYXlSZWZlcmVuY2VUeXBlIDogcHVi bGljIFJlZmVyZW5jZVR5cGUgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOworICAgIFdU Rl9NQUtFX05PTkNPUFlBQkxFKEFycmF5UmVmZXJlbmNlVHlwZSk7CisgICAgV1RGX01BS0VfTk9O TU9WQUJMRShBcnJheVJlZmVyZW5jZVR5cGUpOwogICAgIHVzaW5nIEJhc2UgPSBSZWZlcmVuY2VU eXBlOwogCiAgICAgQXJyYXlSZWZlcmVuY2VUeXBlKENvZGVMb2NhdGlvbiBsb2NhdGlvbiwgQWRk cmVzc1NwYWNlIGFkZHJlc3NTcGFjZSwgUmVmPFVubmFtZWRUeXBlPiBlbGVtZW50VHlwZSkKQEAg LTU1LDkgKzU5LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB+QXJyYXlSZWZlcmVuY2VUeXBl KCkgPSBkZWZhdWx0OwogCi0gICAgQXJyYXlSZWZlcmVuY2VUeXBlKGNvbnN0IEFycmF5UmVmZXJl bmNlVHlwZSYpID0gZGVsZXRlOwotICAgIEFycmF5UmVmZXJlbmNlVHlwZShBcnJheVJlZmVyZW5j ZVR5cGUmJikgPSBkZWZhdWx0OwotCiAgICAgYm9vbCBpc0FycmF5UmVmZXJlbmNlVHlwZSgpIGNv bnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0KIAogICAgIHVuc2lnbmVkIGhhc2goKSBjb25z dCBvdmVycmlkZQpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNU L1dITFNMQXJyYXlUeXBlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJncHUvV0hMU0wvQVNUL1dITFNMQXJyYXlUeXBlLmgJKHJldmlzaW9uIDI0Nzg4NikKKysrIFNv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTEFycmF5VHlwZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw4IEBACiAjaW5jbHVkZSAiV0hMU0xUeXBlQXJndW1l bnQuaCIKICNpbmNsdWRlICJXSExTTFVubmFtZWRUeXBlLmgiCiAjaW5jbHVkZSA8d3RmL0Zhc3RN YWxsb2MuaD4KKyNpbmNsdWRlIDx3dGYvTm9ubW92YWJsZS5oPgorI2luY2x1ZGUgPHd0Zi9Ob25j b3B5YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9VbmlxdWVSZWYuaD4KICNpbmNsdWRlIDx3dGYvdGV4 dC9XVEZTdHJpbmcuaD4KIApAQCAtNDAsOCArNDIsMTAgQEAgbmFtZXNwYWNlIFdITFNMIHsKIAog bmFtZXNwYWNlIEFTVCB7CiAKLWNsYXNzIEFycmF5VHlwZSA6IHB1YmxpYyBVbm5hbWVkVHlwZSB7 CitjbGFzcyBBcnJheVR5cGUgZmluYWwgOiBwdWJsaWMgVW5uYW1lZFR5cGUgewogICAgIFdURl9N QUtFX0ZBU1RfQUxMT0NBVEVEOworICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEFycmF5VHlwZSk7 CisgICAgV1RGX01BS0VfTk9OTU9WQUJMRShBcnJheVR5cGUpOwogICAgIEFycmF5VHlwZShDb2Rl TG9jYXRpb24gbG9jYXRpb24sIFJlZjxVbm5hbWVkVHlwZT4gZWxlbWVudFR5cGUsIHVuc2lnbmVk IG51bUVsZW1lbnRzKQogICAgICAgICA6IFVubmFtZWRUeXBlKGxvY2F0aW9uKQogICAgICAgICAs IG1fZWxlbWVudFR5cGUoV1RGTW92ZShlbGVtZW50VHlwZSkpCkBAIC01Nyw5ICs2MSw2IEBAIHB1 YmxpYzoKIAogICAgIHZpcnR1YWwgfkFycmF5VHlwZSgpID0gZGVmYXVsdDsKIAotICAgIEFycmF5 VHlwZShjb25zdCBBcnJheVR5cGUmKSA9IGRlbGV0ZTsKLSAgICBBcnJheVR5cGUoQXJyYXlUeXBl JiYpID0gZGVmYXVsdDsKLQogICAgIGJvb2wgaXNBcnJheVR5cGUoKSBjb25zdCBvdmVycmlkZSB7 IHJldHVybiB0cnVlOyB9CiAKICAgICBjb25zdCBVbm5hbWVkVHlwZSYgdHlwZSgpIGNvbnN0IHsg cmV0dXJuIG1fZWxlbWVudFR5cGU7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vi Z3B1L1dITFNML0FTVC9XSExTTFBvaW50ZXJUeXBlLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMUG9pbnRlclR5cGUuaAkocmV2aXNp b24gMjQ3ODg2KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dI TFNMUG9pbnRlclR5cGUuaAkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsOCBAQAogI2luY2x1 ZGUgIldITFNMQ29kZUxvY2F0aW9uLmgiCiAjaW5jbHVkZSAiV0hMU0xSZWZlcmVuY2VUeXBlLmgi CiAjaW5jbHVkZSA8d3RmL0Zhc3RNYWxsb2MuaD4KKyNpbmNsdWRlIDx3dGYvTm9ubW92YWJsZS5o PgorI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9VbmlxdWVSZWYu aD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAtMzksOCArNDEsMTAgQEAg bmFtZXNwYWNlIFdITFNMIHsKIAogbmFtZXNwYWNlIEFTVCB7CiAKLWNsYXNzIFBvaW50ZXJUeXBl IDogcHVibGljIFJlZmVyZW5jZVR5cGUgeworY2xhc3MgUG9pbnRlclR5cGUgZmluYWwgOiBwdWJs aWMgUmVmZXJlbmNlVHlwZSB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CisgICAgV1RG X01BS0VfTk9OQ09QWUFCTEUoUG9pbnRlclR5cGUpOworICAgIFdURl9NQUtFX05PTk1PVkFCTEUo UG9pbnRlclR5cGUpOwogICAgIHVzaW5nIEJhc2UgPSBSZWZlcmVuY2VUeXBlOwogCiAgICAgUG9p bnRlclR5cGUoQ29kZUxvY2F0aW9uIGxvY2F0aW9uLCBBZGRyZXNzU3BhY2UgYWRkcmVzc1NwYWNl LCBSZWY8VW5uYW1lZFR5cGU+IGVsZW1lbnRUeXBlKQpAQCAtNTYsOSArNjAsNiBAQCBwdWJsaWM6 CiAKICAgICB2aXJ0dWFsIH5Qb2ludGVyVHlwZSgpID0gZGVmYXVsdDsKIAotICAgIFBvaW50ZXJU eXBlKGNvbnN0IFBvaW50ZXJUeXBlJikgPSBkZWxldGU7Ci0gICAgUG9pbnRlclR5cGUoUG9pbnRl clR5cGUmJikgPSBkZWZhdWx0OwotCiAgICAgYm9vbCBpc1BvaW50ZXJUeXBlKCkgY29uc3Qgb3Zl cnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgdW5zaWduZWQgaGFzaCgpIGNvbnN0IG92ZXJy aWRlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xS ZWZlcmVuY2VUeXBlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJn cHUvV0hMU0wvQVNUL1dITFNMUmVmZXJlbmNlVHlwZS5oCShyZXZpc2lvbiAyNDc4ODYpCisrKyBT b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xSZWZlcmVuY2VUeXBl LmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDYgKzQyLDggQEAgbmFtZXNwYWNlIEFTVCB7CiAKIGNs YXNzIFJlZmVyZW5jZVR5cGUgOiBwdWJsaWMgVW5uYW1lZFR5cGUgewogICAgIFdURl9NQUtFX0ZB U1RfQUxMT0NBVEVEOworICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFJlZmVyZW5jZVR5cGUpOwor ICAgIFdURl9NQUtFX05PTk1PVkFCTEUoUmVmZXJlbmNlVHlwZSk7CiBwcm90ZWN0ZWQ6CiAgICAg UmVmZXJlbmNlVHlwZShDb2RlTG9jYXRpb24gbG9jYXRpb24sIEFkZHJlc3NTcGFjZSBhZGRyZXNz U3BhY2UsIFJlZjxVbm5hbWVkVHlwZT4gZWxlbWVudFR5cGUpCiAgICAgICAgIDogVW5uYW1lZFR5 cGUobG9jYXRpb24pCkBAIC01Myw5ICs1NSw2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgflJl ZmVyZW5jZVR5cGUoKSA9IGRlZmF1bHQ7CiAKLSAgICBSZWZlcmVuY2VUeXBlKGNvbnN0IFJlZmVy ZW5jZVR5cGUmKSA9IGRlbGV0ZTsKLSAgICBSZWZlcmVuY2VUeXBlKFJlZmVyZW5jZVR5cGUmJikg PSBkZWZhdWx0OwotCiAgICAgYm9vbCBpc1JlZmVyZW5jZVR5cGUoKSBjb25zdCBvdmVycmlkZSB7 IHJldHVybiB0cnVlOyB9CiAKICAgICBBZGRyZXNzU3BhY2UgYWRkcmVzc1NwYWNlKCkgY29uc3Qg eyByZXR1cm4gbV9hZGRyZXNzU3BhY2U7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMv d2ViZ3B1L1dITFNML0FTVC9XSExTTFR5cGVSZWZlcmVuY2UuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xUeXBlUmVmZXJlbmNlLmgJ KHJldmlzaW9uIDI0Nzg4NikKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNM L0FTVC9XSExTTFR5cGVSZWZlcmVuY2UuaAkod29ya2luZyBjb3B5KQpAQCAtMzIsNiArMzIsOCBA QAogI2luY2x1ZGUgIldITFNMVHlwZUFyZ3VtZW50LmgiCiAjaW5jbHVkZSAiV0hMU0xVbm5hbWVk VHlwZS5oIgogI2luY2x1ZGUgPHd0Zi9GYXN0TWFsbG9jLmg+CisjaW5jbHVkZSA8d3RmL05vbm1v dmFibGUuaD4KKyNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KICNpbmNsdWRlIDx3dGYvVW5p cXVlUmVmLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTQzLDggKzQ1 LDEwIEBAIG5hbWVzcGFjZSBBU1QgewogCiBjbGFzcyBOYW1lZFR5cGU7CiAKLWNsYXNzIFR5cGVS ZWZlcmVuY2UgOiBwdWJsaWMgVW5uYW1lZFR5cGUgeworY2xhc3MgVHlwZVJlZmVyZW5jZSBmaW5h bCA6IHB1YmxpYyBVbm5hbWVkVHlwZSB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7Cisg ICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoVHlwZVJlZmVyZW5jZSk7CisgICAgV1RGX01BS0VfTk9O TU9WQUJMRShUeXBlUmVmZXJlbmNlKTsKICAgICBUeXBlUmVmZXJlbmNlKENvZGVMb2NhdGlvbiBs b2NhdGlvbiwgU3RyaW5nJiYgbmFtZSwgVHlwZUFyZ3VtZW50cyYmIHR5cGVBcmd1bWVudHMpCiAg ICAgICAgIDogVW5uYW1lZFR5cGUobG9jYXRpb24pCiAgICAgICAgICwgbV9uYW1lKFdURk1vdmUo bmFtZSkpCkBAIC01OSw5ICs2Myw2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgflR5cGVSZWZl cmVuY2UoKSA9IGRlZmF1bHQ7CiAKLSAgICBUeXBlUmVmZXJlbmNlKGNvbnN0IFR5cGVSZWZlcmVu Y2UmKSA9IGRlbGV0ZTsKLSAgICBUeXBlUmVmZXJlbmNlKFR5cGVSZWZlcmVuY2UmJikgPSBkZWZh dWx0OwotCiAgICAgc3RhdGljIFJlZjxUeXBlUmVmZXJlbmNlPiB3cmFwKENvZGVMb2NhdGlvbiwg TmFtZWRUeXBlJiByZXNvbHZlZFR5cGUpOwogCiAgICAgYm9vbCBpc1R5cGVSZWZlcmVuY2UoKSBj b25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xVbm5hbWVkVHlwZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTFVubmFtZWRUeXBlLmgJ KHJldmlzaW9uIDI0Nzg4NikKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNM L0FTVC9XSExTTFVubmFtZWRUeXBlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDggQEAK ICNpbmNsdWRlICJXSExTTENvZGVMb2NhdGlvbi5oIgogI2luY2x1ZGUgIldITFNMVHlwZS5oIgog I2luY2x1ZGUgPHd0Zi9GYXN0TWFsbG9jLmg+CisjaW5jbHVkZSA8d3RmL05vbm1vdmFibGUuaD4K KyNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5o PgogI2luY2x1ZGUgPHd0Zi9VbmlxdWVSZWYuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJp bmcuaD4KQEAgLTQyLDYgKzQ0LDggQEAgbmFtZXNwYWNlIEFTVCB7CiAKIGNsYXNzIFVubmFtZWRU eXBlIDogcHVibGljIFR5cGUsIHB1YmxpYyBSZWZDb3VudGVkPFVubmFtZWRUeXBlPiB7CiAgICAg V1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CisgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoVW5uYW1l ZFR5cGUpOworICAgIFdURl9NQUtFX05PTk1PVkFCTEUoVW5uYW1lZFR5cGUpOwogcHVibGljOgog ICAgIFVubmFtZWRUeXBlKENvZGVMb2NhdGlvbiBsb2NhdGlvbikKICAgICAgICAgOiBtX2NvZGVM b2NhdGlvbihsb2NhdGlvbikKQEAgLTUwLDkgKzU0LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVh bCB+VW5uYW1lZFR5cGUoKSA9IGRlZmF1bHQ7CiAKLSAgICBVbm5hbWVkVHlwZShjb25zdCBVbm5h bWVkVHlwZSYpID0gZGVsZXRlOwotICAgIFVubmFtZWRUeXBlKFVubmFtZWRUeXBlJiYpID0gZGVm YXVsdDsKLQogICAgIGJvb2wgaXNVbm5hbWVkVHlwZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJu IHRydWU7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNUeXBlUmVmZXJlbmNlKCkgY29uc3QgeyByZXR1 cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNQb2ludGVyVHlwZSgpIGNvbnN0IHsgcmV0 dXJuIGZhbHNlOyB9Cg== 375258 2019-07-31 15:06:05 -0700 2019-07-31 15:07:26 -0700 followup patch c-backup.diff text/plain 6116 saam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0ODA3NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA3LTMxICBTYWFtIEJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFtXSExTTF0gUmVtb3ZlIFVubmFt ZWRUeXBlIGNvcHkvbW92ZSBjb25zdHJ1Y3RvcnMgYW5kIG1hcmsgY2xhc3NlcyBhcyBmaW5hbAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwMTg4Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MzYyODE3MT4KKworICAgICAgIFVucmV2aWV3ZWQgZm9s bG93dXAuCisJICAgCisgICAgICAgQXMgRGFyaW4gcG9pbnRlZCBvdXQgaW4gdGhlIGJ1Z3ppbGxh IGNvbW1lbnRzLCB3aGVuIGRlZmluaW5nIGEgY29weQorICAgICAgIGNvbnN0cnVjdG9yIGluIEMr KyAoZWl0aGVyIGRlbGV0ZWQgb3IgYW4gaW1wbGVtZW50YXRpb24pLCB0aGUgbW92ZQorICAgICAg IGNvbnN0cnVjdG9yIGlzIGltcGxpY2l0bHkgZGVsZXRlZC4gVGhpcyBtYXRjaCByZW1vdmVzIHRo ZSBleGNlc3NpdmUKKyAgICAgICB1c2Ugb2YgV1RGX01BS0VfTk9OTU9WQUJMRSB3aGVuIHdlJ3Jl IGFscmVhZHkgdXNpbmcgV1RGX01BS0VfTk9OQ09QWUFCTEUuCisKKyAgICAgICAgKiBNb2R1bGVz L3dlYmdwdS9XSExTTC9BU1QvV0hMU0xBcnJheVJlZmVyZW5jZVR5cGUuaDoKKyAgICAgICAgKiBN b2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xBcnJheVR5cGUuaDoKKyAgICAgICAgKiBNb2R1 bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xQb2ludGVyVHlwZS5oOgorICAgICAgICAqIE1vZHVs ZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTFJlZmVyZW5jZVR5cGUuaDoKKyAgICAgICAgKiBNb2R1 bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xUeXBlUmVmZXJlbmNlLmg6CisgICAgICAgICogTW9k dWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMVW5uYW1lZFR5cGUuaDoKKwogMjAxOS0wNy0zMSAg WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIENURm9udENy ZWF0ZUZvckNoYXJhY3RlcnNXaXRoTGFuZ3VhZ2VBbmRPcHRpb24gaWYgYXZhaWxhYmxlIGluc3Rl YWQgb2YgQ1RGb250Q3JlYXRlRm9yQ2hhcmFjdGVyc1dpdGhMYW5ndWFnZQpJbmRleDogU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMQXJyYXlSZWZlcmVuY2VUeXBl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNU L1dITFNMQXJyYXlSZWZlcmVuY2VUeXBlLmgJKHJldmlzaW9uIDI0ODA3NSkKKysrIFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTEFycmF5UmVmZXJlbmNlVHlwZS5o CSh3b3JraW5nIGNvcHkpCkBAIC0zMSw3ICszMSw2IEBACiAjaW5jbHVkZSAiV0hMU0xSZWZlcmVu Y2VUeXBlLmgiCiAjaW5jbHVkZSA8d3RmL0Zhc3RNYWxsb2MuaD4KICNpbmNsdWRlIDx3dGYvTm9u Y29weWFibGUuaD4KLSNpbmNsdWRlIDx3dGYvTm9ubW92YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9V bmlxdWVSZWYuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAtNDQsNyAr NDMsNiBAQCBuYW1lc3BhY2UgQVNUIHsKIGNsYXNzIEFycmF5UmVmZXJlbmNlVHlwZSA6IHB1Ymxp YyBSZWZlcmVuY2VUeXBlIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKICAgICBXVEZf TUFLRV9OT05DT1BZQUJMRShBcnJheVJlZmVyZW5jZVR5cGUpOwotICAgIFdURl9NQUtFX05PTk1P VkFCTEUoQXJyYXlSZWZlcmVuY2VUeXBlKTsKICAgICB1c2luZyBCYXNlID0gUmVmZXJlbmNlVHlw ZTsKIAogICAgIEFycmF5UmVmZXJlbmNlVHlwZShDb2RlTG9jYXRpb24gbG9jYXRpb24sIEFkZHJl c3NTcGFjZSBhZGRyZXNzU3BhY2UsIFJlZjxVbm5hbWVkVHlwZT4gZWxlbWVudFR5cGUpCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xBcnJheVR5cGUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1Qv V0hMU0xBcnJheVR5cGUuaAkocmV2aXNpb24gMjQ4MDc1KQorKysgU291cmNlL1dlYkNvcmUvTW9k dWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMQXJyYXlUeXBlLmgJKHdvcmtpbmcgY29weSkKQEAg LTMyLDcgKzMyLDYgQEAKICNpbmNsdWRlICJXSExTTFVubmFtZWRUeXBlLmgiCiAjaW5jbHVkZSA8 d3RmL0Zhc3RNYWxsb2MuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KLSNpbmNsdWRl IDx3dGYvTm9ubW92YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9VbmlxdWVSZWYuaD4KICNpbmNsdWRl IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAtNDUsNyArNDQsNiBAQCBuYW1lc3BhY2UgQVNU IHsKIGNsYXNzIEFycmF5VHlwZSBmaW5hbCA6IHB1YmxpYyBVbm5hbWVkVHlwZSB7CiAgICAgV1RG X01BS0VfRkFTVF9BTExPQ0FURUQ7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoQXJyYXlUeXBl KTsKLSAgICBXVEZfTUFLRV9OT05NT1ZBQkxFKEFycmF5VHlwZSk7CiAgICAgQXJyYXlUeXBlKENv ZGVMb2NhdGlvbiBsb2NhdGlvbiwgUmVmPFVubmFtZWRUeXBlPiBlbGVtZW50VHlwZSwgdW5zaWdu ZWQgbnVtRWxlbWVudHMpCiAgICAgICAgIDogVW5uYW1lZFR5cGUobG9jYXRpb24pCiAgICAgICAg ICwgbV9lbGVtZW50VHlwZShXVEZNb3ZlKGVsZW1lbnRUeXBlKSkKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTFBvaW50ZXJUeXBlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMUG9pbnRl clR5cGUuaAkocmV2aXNpb24gMjQ4MDc1KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJn cHUvV0hMU0wvQVNUL1dITFNMUG9pbnRlclR5cGUuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNyAr MzEsNiBAQAogI2luY2x1ZGUgIldITFNMUmVmZXJlbmNlVHlwZS5oIgogI2luY2x1ZGUgPHd0Zi9G YXN0TWFsbG9jLmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+Ci0jaW5jbHVkZSA8d3Rm L05vbm1vdmFibGUuaD4KICNpbmNsdWRlIDx3dGYvVW5pcXVlUmVmLmg+CiAjaW5jbHVkZSA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTQ0LDcgKzQzLDYgQEAgbmFtZXNwYWNlIEFTVCB7CiBj bGFzcyBQb2ludGVyVHlwZSBmaW5hbCA6IHB1YmxpYyBSZWZlcmVuY2VUeXBlIHsKICAgICBXVEZf TUFLRV9GQVNUX0FMTE9DQVRFRDsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShQb2ludGVyVHlw ZSk7Ci0gICAgV1RGX01BS0VfTk9OTU9WQUJMRShQb2ludGVyVHlwZSk7CiAgICAgdXNpbmcgQmFz ZSA9IFJlZmVyZW5jZVR5cGU7CiAKICAgICBQb2ludGVyVHlwZShDb2RlTG9jYXRpb24gbG9jYXRp b24sIEFkZHJlc3NTcGFjZSBhZGRyZXNzU3BhY2UsIFJlZjxVbm5hbWVkVHlwZT4gZWxlbWVudFR5 cGUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xS ZWZlcmVuY2VUeXBlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJn cHUvV0hMU0wvQVNUL1dITFNMUmVmZXJlbmNlVHlwZS5oCShyZXZpc2lvbiAyNDgwNzUpCisrKyBT b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xSZWZlcmVuY2VUeXBl LmgJKHdvcmtpbmcgY29weSkKQEAgLTQzLDcgKzQzLDYgQEAgbmFtZXNwYWNlIEFTVCB7CiBjbGFz cyBSZWZlcmVuY2VUeXBlIDogcHVibGljIFVubmFtZWRUeXBlIHsKICAgICBXVEZfTUFLRV9GQVNU X0FMTE9DQVRFRDsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShSZWZlcmVuY2VUeXBlKTsKLSAg ICBXVEZfTUFLRV9OT05NT1ZBQkxFKFJlZmVyZW5jZVR5cGUpOwogcHJvdGVjdGVkOgogICAgIFJl ZmVyZW5jZVR5cGUoQ29kZUxvY2F0aW9uIGxvY2F0aW9uLCBBZGRyZXNzU3BhY2UgYWRkcmVzc1Nw YWNlLCBSZWY8VW5uYW1lZFR5cGU+IGVsZW1lbnRUeXBlKQogICAgICAgICA6IFVubmFtZWRUeXBl KGxvY2F0aW9uKQpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNU L1dITFNMVHlwZVJlZmVyZW5jZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTFR5cGVSZWZlcmVuY2UuaAkocmV2aXNpb24gMjQ4MDc1 KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMVHlwZVJl ZmVyZW5jZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw3ICszMyw2IEBACiAjaW5jbHVkZSAiV0hM U0xVbm5hbWVkVHlwZS5oIgogI2luY2x1ZGUgPHd0Zi9GYXN0TWFsbG9jLmg+CiAjaW5jbHVkZSA8 d3RmL05vbmNvcHlhYmxlLmg+Ci0jaW5jbHVkZSA8d3RmL05vbm1vdmFibGUuaD4KICNpbmNsdWRl IDx3dGYvVW5pcXVlUmVmLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAg LTQ4LDcgKzQ3LDYgQEAgY2xhc3MgTmFtZWRUeXBlOwogY2xhc3MgVHlwZVJlZmVyZW5jZSBmaW5h bCA6IHB1YmxpYyBVbm5hbWVkVHlwZSB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiAg ICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoVHlwZVJlZmVyZW5jZSk7Ci0gICAgV1RGX01BS0VfTk9O TU9WQUJMRShUeXBlUmVmZXJlbmNlKTsKICAgICBUeXBlUmVmZXJlbmNlKENvZGVMb2NhdGlvbiBs b2NhdGlvbiwgU3RyaW5nJiYgbmFtZSwgVHlwZUFyZ3VtZW50cyYmIHR5cGVBcmd1bWVudHMpCiAg ICAgICAgIDogVW5uYW1lZFR5cGUobG9jYXRpb24pCiAgICAgICAgICwgbV9uYW1lKFdURk1vdmUo bmFtZSkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hM U0xVbm5hbWVkVHlwZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vi Z3B1L1dITFNML0FTVC9XSExTTFVubmFtZWRUeXBlLmgJKHJldmlzaW9uIDI0ODA3NSkKKysrIFNv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTFVubmFtZWRUeXBlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTMxLDcgKzMxLDYgQEAKICNpbmNsdWRlICJXSExTTFR5cGUuaCIK ICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5o PgotI2luY2x1ZGUgPHd0Zi9Ob25tb3ZhYmxlLmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQu aD4KICNpbmNsdWRlIDx3dGYvVW5pcXVlUmVmLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3Ry aW5nLmg+CkBAIC00NSw3ICs0NCw2IEBAIG5hbWVzcGFjZSBBU1QgewogY2xhc3MgVW5uYW1lZFR5 cGUgOiBwdWJsaWMgVHlwZSwgcHVibGljIFJlZkNvdW50ZWQ8VW5uYW1lZFR5cGU+IHsKICAgICBX VEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShVbm5hbWVk VHlwZSk7Ci0gICAgV1RGX01BS0VfTk9OTU9WQUJMRShVbm5hbWVkVHlwZSk7CiBwdWJsaWM6CiAg ICAgVW5uYW1lZFR5cGUoQ29kZUxvY2F0aW9uIGxvY2F0aW9uKQogICAgICAgICA6IG1fY29kZUxv Y2F0aW9uKGxvY2F0aW9uKQo= 375259 2019-07-31 15:07:26 -0700 2019-07-31 16:59:31 -0700 followup patch c-backup.diff text/plain 6121 saam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0ODA3NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA3LTMxICBTYWFtIEJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFtXSExTTF0gUmVtb3ZlIFVubmFt ZWRUeXBlIGNvcHkvbW92ZSBjb25zdHJ1Y3RvcnMgYW5kIG1hcmsgY2xhc3NlcyBhcyBmaW5hbAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwMTg4Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MzYyODE3MT4KKworICAgICAgICBVbnJldmlld2VkIGZv bGxvd3VwLgorCSAgIAorICAgICAgICBBcyBEYXJpbiBwb2ludGVkIG91dCBpbiB0aGUgYnVnemls bGEgY29tbWVudHMsIHdoZW4gZGVmaW5pbmcgYSBjb3B5CisgICAgICAgIGNvbnN0cnVjdG9yIGlu IEMrKyAoZWl0aGVyIGRlbGV0ZWQgb3IgYW4gaW1wbGVtZW50YXRpb24pLCB0aGUgbW92ZQorICAg ICAgICBjb25zdHJ1Y3RvciBpcyBpbXBsaWNpdGx5IGRlbGV0ZWQuIFRoaXMgbWF0Y2ggcmVtb3Zl cyB0aGUgZXhjZXNzaXZlCisgICAgICAgIHVzZSBvZiBXVEZfTUFLRV9OT05NT1ZBQkxFIHdoZW4g d2UncmUgYWxyZWFkeSB1c2luZyBXVEZfTUFLRV9OT05DT1BZQUJMRS4KKworICAgICAgICAqIE1v ZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTEFycmF5UmVmZXJlbmNlVHlwZS5oOgorICAgICAg ICAqIE1vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTEFycmF5VHlwZS5oOgorICAgICAgICAq IE1vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTFBvaW50ZXJUeXBlLmg6CisgICAgICAgICog TW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMUmVmZXJlbmNlVHlwZS5oOgorICAgICAgICAq IE1vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTFR5cGVSZWZlcmVuY2UuaDoKKyAgICAgICAg KiBNb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xVbm5hbWVkVHlwZS5oOgorCiAyMDE5LTA3 LTMxICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgQ1RG b250Q3JlYXRlRm9yQ2hhcmFjdGVyc1dpdGhMYW5ndWFnZUFuZE9wdGlvbiBpZiBhdmFpbGFibGUg aW5zdGVhZCBvZiBDVEZvbnRDcmVhdGVGb3JDaGFyYWN0ZXJzV2l0aExhbmd1YWdlCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xBcnJheVJlZmVyZW5j ZVR5cGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExT TC9BU1QvV0hMU0xBcnJheVJlZmVyZW5jZVR5cGUuaAkocmV2aXNpb24gMjQ4MDc1KQorKysgU291 cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMQXJyYXlSZWZlcmVuY2VU eXBlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMxLDcgKzMxLDYgQEAKICNpbmNsdWRlICJXSExTTFJl ZmVyZW5jZVR5cGUuaCIKICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogI2luY2x1ZGUgPHd0 Zi9Ob25jb3B5YWJsZS5oPgotI2luY2x1ZGUgPHd0Zi9Ob25tb3ZhYmxlLmg+CiAjaW5jbHVkZSA8 d3RmL1VuaXF1ZVJlZi5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCkBAIC00 NCw3ICs0Myw2IEBAIG5hbWVzcGFjZSBBU1QgewogY2xhc3MgQXJyYXlSZWZlcmVuY2VUeXBlIDog cHVibGljIFJlZmVyZW5jZVR5cGUgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogICAg IFdURl9NQUtFX05PTkNPUFlBQkxFKEFycmF5UmVmZXJlbmNlVHlwZSk7Ci0gICAgV1RGX01BS0Vf Tk9OTU9WQUJMRShBcnJheVJlZmVyZW5jZVR5cGUpOwogICAgIHVzaW5nIEJhc2UgPSBSZWZlcmVu Y2VUeXBlOwogCiAgICAgQXJyYXlSZWZlcmVuY2VUeXBlKENvZGVMb2NhdGlvbiBsb2NhdGlvbiwg QWRkcmVzc1NwYWNlIGFkZHJlc3NTcGFjZSwgUmVmPFVubmFtZWRUeXBlPiBlbGVtZW50VHlwZSkK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTEFycmF5 VHlwZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNM L0FTVC9XSExTTEFycmF5VHlwZS5oCShyZXZpc2lvbiAyNDgwNzUpCisrKyBTb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xBcnJheVR5cGUuaAkod29ya2luZyBjb3B5 KQpAQCAtMzIsNyArMzIsNiBAQAogI2luY2x1ZGUgIldITFNMVW5uYW1lZFR5cGUuaCIKICNpbmNs dWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgotI2lu Y2x1ZGUgPHd0Zi9Ob25tb3ZhYmxlLmg+CiAjaW5jbHVkZSA8d3RmL1VuaXF1ZVJlZi5oPgogI2lu Y2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCkBAIC00NSw3ICs0NCw2IEBAIG5hbWVzcGFj ZSBBU1QgewogY2xhc3MgQXJyYXlUeXBlIGZpbmFsIDogcHVibGljIFVubmFtZWRUeXBlIHsKICAg ICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShBcnJh eVR5cGUpOwotICAgIFdURl9NQUtFX05PTk1PVkFCTEUoQXJyYXlUeXBlKTsKICAgICBBcnJheVR5 cGUoQ29kZUxvY2F0aW9uIGxvY2F0aW9uLCBSZWY8VW5uYW1lZFR5cGU+IGVsZW1lbnRUeXBlLCB1 bnNpZ25lZCBudW1FbGVtZW50cykKICAgICAgICAgOiBVbm5hbWVkVHlwZShsb2NhdGlvbikKICAg ICAgICAgLCBtX2VsZW1lbnRUeXBlKFdURk1vdmUoZWxlbWVudFR5cGUpKQpJbmRleDogU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMUG9pbnRlclR5cGUuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xQ b2ludGVyVHlwZS5oCShyZXZpc2lvbiAyNDgwNzUpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L3dlYmdwdS9XSExTTC9BU1QvV0hMU0xQb2ludGVyVHlwZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0z MSw3ICszMSw2IEBACiAjaW5jbHVkZSAiV0hMU0xSZWZlcmVuY2VUeXBlLmgiCiAjaW5jbHVkZSA8 d3RmL0Zhc3RNYWxsb2MuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KLSNpbmNsdWRl IDx3dGYvTm9ubW92YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9VbmlxdWVSZWYuaD4KICNpbmNsdWRl IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAtNDQsNyArNDMsNiBAQCBuYW1lc3BhY2UgQVNU IHsKIGNsYXNzIFBvaW50ZXJUeXBlIGZpbmFsIDogcHVibGljIFJlZmVyZW5jZVR5cGUgewogICAg IFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFBvaW50 ZXJUeXBlKTsKLSAgICBXVEZfTUFLRV9OT05NT1ZBQkxFKFBvaW50ZXJUeXBlKTsKICAgICB1c2lu ZyBCYXNlID0gUmVmZXJlbmNlVHlwZTsKIAogICAgIFBvaW50ZXJUeXBlKENvZGVMb2NhdGlvbiBs b2NhdGlvbiwgQWRkcmVzc1NwYWNlIGFkZHJlc3NTcGFjZSwgUmVmPFVubmFtZWRUeXBlPiBlbGVt ZW50VHlwZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9X SExTTFJlZmVyZW5jZVR5cGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L3dlYmdwdS9XSExTTC9BU1QvV0hMU0xSZWZlcmVuY2VUeXBlLmgJKHJldmlzaW9uIDI0ODA3NSkK KysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTFJlZmVyZW5j ZVR5cGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNiBAQCBuYW1lc3BhY2UgQVNUIHsK IGNsYXNzIFJlZmVyZW5jZVR5cGUgOiBwdWJsaWMgVW5uYW1lZFR5cGUgewogICAgIFdURl9NQUtF X0ZBU1RfQUxMT0NBVEVEOwogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFJlZmVyZW5jZVR5cGUp OwotICAgIFdURl9NQUtFX05PTk1PVkFCTEUoUmVmZXJlbmNlVHlwZSk7CiBwcm90ZWN0ZWQ6CiAg ICAgUmVmZXJlbmNlVHlwZShDb2RlTG9jYXRpb24gbG9jYXRpb24sIEFkZHJlc3NTcGFjZSBhZGRy ZXNzU3BhY2UsIFJlZjxVbm5hbWVkVHlwZT4gZWxlbWVudFR5cGUpCiAgICAgICAgIDogVW5uYW1l ZFR5cGUobG9jYXRpb24pCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExT TC9BU1QvV0hMU0xUeXBlUmVmZXJlbmNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv TW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMVHlwZVJlZmVyZW5jZS5oCShyZXZpc2lvbiAy NDgwNzUpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xU eXBlUmVmZXJlbmNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMzLDcgKzMzLDYgQEAKICNpbmNsdWRl ICJXSExTTFVubmFtZWRUeXBlLmgiCiAjaW5jbHVkZSA8d3RmL0Zhc3RNYWxsb2MuaD4KICNpbmNs dWRlIDx3dGYvTm9uY29weWFibGUuaD4KLSNpbmNsdWRlIDx3dGYvTm9ubW92YWJsZS5oPgogI2lu Y2x1ZGUgPHd0Zi9VbmlxdWVSZWYuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4K IApAQCAtNDgsNyArNDcsNiBAQCBjbGFzcyBOYW1lZFR5cGU7CiBjbGFzcyBUeXBlUmVmZXJlbmNl IGZpbmFsIDogcHVibGljIFVubmFtZWRUeXBlIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRF RDsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShUeXBlUmVmZXJlbmNlKTsKLSAgICBXVEZfTUFL RV9OT05NT1ZBQkxFKFR5cGVSZWZlcmVuY2UpOwogICAgIFR5cGVSZWZlcmVuY2UoQ29kZUxvY2F0 aW9uIGxvY2F0aW9uLCBTdHJpbmcmJiBuYW1lLCBUeXBlQXJndW1lbnRzJiYgdHlwZUFyZ3VtZW50 cykKICAgICAgICAgOiBVbm5hbWVkVHlwZShsb2NhdGlvbikKICAgICAgICAgLCBtX25hbWUoV1RG TW92ZShuYW1lKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FT VC9XSExTTFVubmFtZWRUeXBlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxl cy93ZWJncHUvV0hMU0wvQVNUL1dITFNMVW5uYW1lZFR5cGUuaAkocmV2aXNpb24gMjQ4MDc1KQor KysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMVW5uYW1lZFR5 cGUuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNyArMzEsNiBAQAogI2luY2x1ZGUgIldITFNMVHlw ZS5oIgogI2luY2x1ZGUgPHd0Zi9GYXN0TWFsbG9jLmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlh YmxlLmg+Ci0jaW5jbHVkZSA8d3RmL05vbm1vdmFibGUuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291 bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9VbmlxdWVSZWYuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9X VEZTdHJpbmcuaD4KQEAgLTQ1LDcgKzQ0LDYgQEAgbmFtZXNwYWNlIEFTVCB7CiBjbGFzcyBVbm5h bWVkVHlwZSA6IHB1YmxpYyBUeXBlLCBwdWJsaWMgUmVmQ291bnRlZDxVbm5hbWVkVHlwZT4gewog ICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFVu bmFtZWRUeXBlKTsKLSAgICBXVEZfTUFLRV9OT05NT1ZBQkxFKFVubmFtZWRUeXBlKTsKIHB1Ymxp YzoKICAgICBVbm5hbWVkVHlwZShDb2RlTG9jYXRpb24gbG9jYXRpb24pCiAgICAgICAgIDogbV9j b2RlTG9jYXRpb24obG9jYXRpb24pCg==