223626 2021-03-22 23:28:30 -0700 [JSC] Use ErrorInstance for AggregateError 2021-03-23 12:58:41 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki darin ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1742688 0 ysuzuki 2021-03-22 23:28:30 -0700 [JSC] Use ErrorInstance for AggregateError 1742689 1 423990 ysuzuki 2021-03-22 23:31:21 -0700 Created attachment 423990 Patch 1742878 2 423990 darin 2021-03-23 10:03:03 -0700 Comment on attachment 423990 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423990&action=review > Source/JavaScriptCore/runtime/AggregateError.cpp:54 > + auto* array = constructArray(globalObject, static_cast<ArrayAllocationProfile*>(nullptr), errorsList); Surprised that we need the ArrayAllocationProfile cast. I don’t see so much overloading for constructArray that I would have expected ambiguity. > Source/JavaScriptCore/runtime/AggregateError.cpp:58 > + error->putDirect(vm, vm.propertyNames->errors, array, static_cast<unsigned>(PropertyAttribute::DontEnum)); We should consider moving from unsigned to OptionSet for property attributes. Not sure how people who regularly work on JavaScriptCore feel about that, but I would love it. 1742960 3 423990 ysuzuki 2021-03-23 12:49:31 -0700 Comment on attachment 423990 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423990&action=review >> Source/JavaScriptCore/runtime/AggregateError.cpp:54 >> + auto* array = constructArray(globalObject, static_cast<ArrayAllocationProfile*>(nullptr), errorsList); > > Surprised that we need the ArrayAllocationProfile cast. I don’t see so much overloading for constructArray that I would have expected ambiguity. This static_cast is necessary since there is `JS_EXPORT_PRIVATE JSArray* constructArray(JSGlobalObject*, Structure*, const ArgList& values);`. >> Source/JavaScriptCore/runtime/AggregateError.cpp:58 >> + error->putDirect(vm, vm.propertyNames->errors, array, static_cast<unsigned>(PropertyAttribute::DontEnum)); > > We should consider moving from unsigned to OptionSet for property attributes. Not sure how people who regularly work on JavaScriptCore feel about that, but I would love it. We should consider this option at some point. 1742962 4 ews-feeder 2021-03-23 12:57:58 -0700 Committed r274893: <https://commits.webkit.org/r274893> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423990. 1742963 5 webkit-bug-importer 2021-03-23 12:58:41 -0700 <rdar://problem/75750983> 423990 2021-03-22 23:31:21 -0700 2021-03-23 12:57:59 -0700 Patch bug-223626-20210322233120.patch text/plain 8893 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0ODIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx NjA4OTJmNzUwZGEyMmViZTBhYjA4OWQ2OWNlZmUzZjcyNjMzYTllLi44NTVlZDJkN2YyZDhjYzIw YTllYWY5MmQzZmQ1MzVjYWZkNTFmNmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAyMS0wMy0yMiAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFVzZSBFcnJvckluc3RhbmNlIGZvciBBZ2dyZWdhdGVFcnJvcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNjI2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnJvbSByMjc0 NjA5LCBXZWJBc3NlbWJseSBlcnJvcnMgc3RhcnQgdXNpbmcgbm9ybWFsIEVycm9ySW5zdGFuY2Uu IFdlIGFwcGx5IHRoZSBzYW1lIHRoaW5nIHRvIEFnZ3JlZ2F0ZUVycm9yIHRvby4KKyAgICAgICAg VGhpcyBwYXRjaCByZW1vdmVzIEFnZ3JlZ2F0ZUVycm9yIGNsYXNzLCBhbmQganVzdCBnZW5lcmF0 aW5nIEVycm9ySW5zdGFuY2UuCisKKyAgICAgICAgKiBydW50aW1lL0FnZ3JlZ2F0ZUVycm9yLmNw cDoKKyAgICAgICAgKEpTQzo6Y3JlYXRlQWdncmVnYXRlRXJyb3IpOgorICAgICAgICAoSlNDOjpB Z2dyZWdhdGVFcnJvcjo6QWdncmVnYXRlRXJyb3IpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpB Z2dyZWdhdGVFcnJvcjo6ZmluaXNoQ3JlYXRpb24pOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpB Z2dyZWdhdGVFcnJvcjo6Y3JlYXRlKTogRGVsZXRlZC4KKyAgICAgICAgKiBydW50aW1lL0FnZ3Jl Z2F0ZUVycm9yLmg6CisgICAgICAgICgpOiBEZWxldGVkLgorICAgICAgICAqIHJ1bnRpbWUvQWdn cmVnYXRlRXJyb3JDb25zdHJ1Y3Rvci5jcHA6CisgICAgICAgIChKU0M6OkpTQ19ERUZJTkVfSE9T VF9GVU5DVElPTik6CisgICAgICAgICogcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHA6CisgICAg ICAgIChKU0M6OkpTR2xvYmFsT2JqZWN0Ojppbml0aWFsaXplQWdncmVnYXRlRXJyb3JDb25zdHJ1 Y3Rvcik6CisKIDIwMjEtMDMtMjIgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4K IAogICAgICAgICBbSlNDXSBKU0N1c3RvbUdldHRlckZ1bmN0aW9uL0pTQ3VzdG9tU2V0dGVyRnVu Y3Rpb24gc2hvdWxkIHVzZSBJZGVudGlmaWVyIGZvciB0aGVpciBmaWVsZApkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQWdncmVnYXRlRXJyb3IuY3BwIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQWdncmVnYXRlRXJyb3IuY3BwCmluZGV4IGI3ZmVhNzE4 ZDQzZTRlODRiMmJhNTZhZWEzN2NlYzZiMDYzNDBmNDAuLmQ4YzEzYjc2NzE5Yjc5YTAxMmQzZWVi MmNmYTdiOWYyYjlhMWQyZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0FnZ3JlZ2F0ZUVycm9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9BZ2dyZWdhdGVFcnJvci5jcHAKQEAgLTMzLDI0ICszMyw3IEBACiAKIG5hbWVzcGFjZSBKU0Mg ewogCi1jb25zdCBDbGFzc0luZm8gQWdncmVnYXRlRXJyb3I6OnNfaW5mbyA9IHsgIkFnZ3JlZ2F0 ZUVycm9yIiwgJkJhc2U6OnNfaW5mbywgbnVsbHB0ciwgbnVsbHB0ciwgQ1JFQVRFX01FVEhPRF9U QUJMRShBZ2dyZWdhdGVFcnJvcikgfTsKLQotQWdncmVnYXRlRXJyb3I6OkFnZ3JlZ2F0ZUVycm9y KFZNJiB2bSwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUpCi0gICAgOiBCYXNlKHZtLCBzdHJ1Y3R1cmUs IEVycm9yVHlwZTo6QWdncmVnYXRlRXJyb3IpCi17Ci19Ci0KLXZvaWQgQWdncmVnYXRlRXJyb3I6 OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgY29u c3QgTWFya2VkQXJndW1lbnRCdWZmZXImIGVycm9ycywgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBK U1ZhbHVlIGNhdXNlLCBTb3VyY2VBcHBlbmRlciBhcHBlbmRlciwgUnVudGltZVR5cGUgdHlwZSwg Ym9vbCB1c2VDdXJyZW50RnJhbWUpCi17Ci0gICAgQmFzZTo6ZmluaXNoQ3JlYXRpb24odm0sIGds b2JhbE9iamVjdCwgbWVzc2FnZSwgY2F1c2UsIGFwcGVuZGVyLCB0eXBlLCB1c2VDdXJyZW50RnJh bWUpOwotICAgIEFTU0VSVChpbmhlcml0cyh2bSwgaW5mbygpKSk7Ci0KLSAgICBhdXRvIHNjb3Bl ID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7Ci0gICAgcHV0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0 eU5hbWVzLT5lcnJvcnMsIGNvbnN0cnVjdEFycmF5KGdsb2JhbE9iamVjdCwgc3RhdGljX2Nhc3Q8 QXJyYXlBbGxvY2F0aW9uUHJvZmlsZSo+KG51bGxwdHIpLCBlcnJvcnMpLCBzdGF0aWNfY2FzdDx1 bnNpZ25lZD4oUHJvcGVydHlBdHRyaWJ1dGU6OkRvbnRFbnVtKSk7Ci0gICAgUkVUVVJOX0lGX0VY Q0VQVElPTihzY29wZSwgdm9pZCgpKTsKLX0KLQotQWdncmVnYXRlRXJyb3IqIEFnZ3JlZ2F0ZUVy cm9yOjpjcmVhdGUoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgVk0mIHZtLCBTdHJ1Y3R1 cmUqIHN0cnVjdHVyZSwgSlNWYWx1ZSBlcnJvcnMsIEpTVmFsdWUgbWVzc2FnZSwgSlNWYWx1ZSBv cHRpb25zLCBTb3VyY2VBcHBlbmRlciBhcHBlbmRlciwgUnVudGltZVR5cGUgdHlwZSwgYm9vbCB1 c2VDdXJyZW50RnJhbWUpCitFcnJvckluc3RhbmNlKiBjcmVhdGVBZ2dyZWdhdGVFcnJvcihKU0ds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBWTSYgdm0sIFN0cnVjdHVyZSogc3RydWN0dXJlLCBK U1ZhbHVlIGVycm9ycywgSlNWYWx1ZSBtZXNzYWdlLCBKU1ZhbHVlIG9wdGlvbnMsIEVycm9ySW5z dGFuY2U6OlNvdXJjZUFwcGVuZGVyIGFwcGVuZGVyLCBSdW50aW1lVHlwZSB0eXBlLCBib29sIHVz ZUN1cnJlbnRGcmFtZSkKIHsKICAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2 bSk7CiAKQEAgLTY4LDcgKzUxLDEyIEBAIEFnZ3JlZ2F0ZUVycm9yKiBBZ2dyZWdhdGVFcnJvcjo6 Y3JlYXRlKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFZNJiB2bSwgU3RyCiAgICAgfSk7 CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgbnVsbHB0cik7CiAKLSAgICBSRUxFQVNF X0FORF9SRVRVUk4oc2NvcGUsIGNyZWF0ZShnbG9iYWxPYmplY3QsIHZtLCBzdHJ1Y3R1cmUsIGVy cm9yc0xpc3QsIG1lc3NhZ2VTdHJpbmcsIGNhdXNlLCBhcHBlbmRlciwgdHlwZSwgdXNlQ3VycmVu dEZyYW1lKSk7CisgICAgYXV0byogYXJyYXkgPSBjb25zdHJ1Y3RBcnJheShnbG9iYWxPYmplY3Qs IHN0YXRpY19jYXN0PEFycmF5QWxsb2NhdGlvblByb2ZpbGUqPihudWxscHRyKSwgZXJyb3JzTGlz dCk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgbnVsbHB0cik7CisKKyAgICBhdXRv KiBlcnJvciA9IEVycm9ySW5zdGFuY2U6OmNyZWF0ZShnbG9iYWxPYmplY3QsIHZtLCBzdHJ1Y3R1 cmUsIG1lc3NhZ2VTdHJpbmcsIGNhdXNlLCBhcHBlbmRlciwgdHlwZSwgRXJyb3JUeXBlOjpBZ2dy ZWdhdGVFcnJvciwgdXNlQ3VycmVudEZyYW1lKTsKKyAgICBlcnJvci0+cHV0RGlyZWN0KHZtLCB2 bS5wcm9wZXJ0eU5hbWVzLT5lcnJvcnMsIGFycmF5LCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oUHJv cGVydHlBdHRyaWJ1dGU6OkRvbnRFbnVtKSk7CisgICAgcmV0dXJuIGVycm9yOwogfQogCiB9IC8v IG5hbWVzcGFjZSBKU0MKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0FnZ3JlZ2F0ZUVycm9yLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9BZ2dyZWdh dGVFcnJvci5oCmluZGV4IGY0ODg3ZDc1ODJkNjY5OTRmZTExMTMzNjM0ZDJjOTNhMDFkNzFhOGUu LjY2Y2MxNWMwNzNlMmFkMzFiNTI1ZjNhNmE1ZDc5MGM3YmNmNzY5YWMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FnZ3JlZ2F0ZUVycm9yLmgKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQWdncmVnYXRlRXJyb3IuaApAQCAtMjUsNDUgKzI1LDE1 IEBACiAKICNwcmFnbWEgb25jZQogCi0jaW5jbHVkZSAiQXJnTGlzdC5oIgogI2luY2x1ZGUgIkVy cm9ySW5zdGFuY2UuaCIKICNpbmNsdWRlICJKU0NKU1ZhbHVlLmgiCiAjaW5jbHVkZSAiSlNDZWxs LmgiCiAjaW5jbHVkZSAiSlNHbG9iYWxPYmplY3QuaCIKICNpbmNsdWRlICJTdHJ1Y3R1cmUuaCIK ICNpbmNsdWRlICJWTS5oIgotI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiBuYW1l c3BhY2UgSlNDIHsKIAotY2xhc3MgQWdncmVnYXRlRXJyb3IgZmluYWwgOiBwdWJsaWMgRXJyb3JJ bnN0YW5jZSB7Ci1wdWJsaWM6Ci0gICAgdXNpbmcgQmFzZSA9IEVycm9ySW5zdGFuY2U7Ci0gICAg c3RhdGljIGNvbnN0ZXhwciB1bnNpZ25lZCBTdHJ1Y3R1cmVGbGFncyA9IEJhc2U6OlN0cnVjdHVy ZUZsYWdzOwotICAgIHN0YXRpYyBjb25zdGV4cHIgYm9vbCBuZWVkc0Rlc3RydWN0aW9uID0gQmFz ZTo6bmVlZHNEZXN0cnVjdGlvbjsKLQotICAgIERFQ0xBUkVfRVhQT1JUX0lORk87Ci0KLSAgICBz dGF0aWMgU3RydWN0dXJlKiBjcmVhdGVTdHJ1Y3R1cmUoVk0mIHZtLCBKU0dsb2JhbE9iamVjdCog Z2xvYmFsT2JqZWN0LCBKU1ZhbHVlIHByb3RvdHlwZSkKLSAgICB7Ci0gICAgICAgIHJldHVybiBT dHJ1Y3R1cmU6OmNyZWF0ZSh2bSwgZ2xvYmFsT2JqZWN0LCBwcm90b3R5cGUsIFR5cGVJbmZvKEVy cm9ySW5zdGFuY2VUeXBlLCBTdHJ1Y3R1cmVGbGFncyksIGluZm8oKSk7Ci0gICAgfQotCi0gICAg c3RhdGljIEFnZ3JlZ2F0ZUVycm9yKiBjcmVhdGUoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVj dCwgVk0mIHZtLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgY29uc3QgTWFya2VkQXJndW1lbnRCdWZm ZXImIGVycm9ycywgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBKU1ZhbHVlIGNhdXNlLCBTb3VyY2VB cHBlbmRlciBhcHBlbmRlciA9IG51bGxwdHIsIFJ1bnRpbWVUeXBlIHR5cGUgPSBUeXBlTm90aGlu ZywgYm9vbCB1c2VDdXJyZW50RnJhbWUgPSB0cnVlKQotICAgIHsKLSAgICAgICAgYXV0byogaW5z dGFuY2UgPSBuZXcgKE5vdE51bGwsIGFsbG9jYXRlQ2VsbDxBZ2dyZWdhdGVFcnJvcj4odm0uaGVh cCkpIEFnZ3JlZ2F0ZUVycm9yKHZtLCBzdHJ1Y3R1cmUpOwotICAgICAgICBpbnN0YW5jZS0+Zmlu aXNoQ3JlYXRpb24odm0sIGdsb2JhbE9iamVjdCwgZXJyb3JzLCBtZXNzYWdlLCBjYXVzZSwgYXBw ZW5kZXIsIHR5cGUsIHVzZUN1cnJlbnRGcmFtZSk7Ci0gICAgICAgIHJldHVybiBpbnN0YW5jZTsK LSAgICB9Ci0KLSAgICBzdGF0aWMgQWdncmVnYXRlRXJyb3IqIGNyZWF0ZShKU0dsb2JhbE9iamVj dCosIFZNJiwgU3RydWN0dXJlKiwgSlNWYWx1ZSBlcnJvcnMsIEpTVmFsdWUgbWVzc2FnZSwgSlNW YWx1ZSBvcHRpb25zLCBTb3VyY2VBcHBlbmRlciA9IG51bGxwdHIsIFJ1bnRpbWVUeXBlID0gVHlw ZU5vdGhpbmcsIGJvb2wgdXNlQ3VycmVudEZyYW1lID0gdHJ1ZSk7Ci0KLSAgICB2b2lkIGZpbmlz aENyZWF0aW9uKFZNJiwgSlNHbG9iYWxPYmplY3QqLCBjb25zdCBNYXJrZWRBcmd1bWVudEJ1ZmZl ciYgZXJyb3JzLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIEpTVmFsdWUgY2F1c2UsIFNvdXJjZUFw cGVuZGVyID0gbnVsbHB0ciwgUnVudGltZVR5cGUgPSBUeXBlTm90aGluZywgYm9vbCB1c2VDdXJy ZW50RnJhbWUgPSB0cnVlKTsKLQotcHJpdmF0ZToKLSAgICBleHBsaWNpdCBBZ2dyZWdhdGVFcnJv cihWTSYsIFN0cnVjdHVyZSopOwotfTsKLQotU1RBVElDX0FTU0VSVF9JU09fU1VCU1BBQ0VfU0hB UkFCTEUoQWdncmVnYXRlRXJyb3IsIEFnZ3JlZ2F0ZUVycm9yOjpCYXNlKTsKK0Vycm9ySW5zdGFu Y2UqIGNyZWF0ZUFnZ3JlZ2F0ZUVycm9yKEpTR2xvYmFsT2JqZWN0KiwgVk0mLCBTdHJ1Y3R1cmUq LCBKU1ZhbHVlIGVycm9ycywgSlNWYWx1ZSBtZXNzYWdlLCBKU1ZhbHVlIG9wdGlvbnMsIEVycm9y SW5zdGFuY2U6OlNvdXJjZUFwcGVuZGVyID0gbnVsbHB0ciwgUnVudGltZVR5cGUgPSBUeXBlTm90 aGluZywgYm9vbCB1c2VDdXJyZW50RnJhbWUgPSB0cnVlKTsKIAogfSAvLyBuYW1lc3BhY2UgSlND CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9BZ2dyZWdhdGVFcnJv ckNvbnN0cnVjdG9yLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FnZ3JlZ2F0 ZUVycm9yQ29uc3RydWN0b3IuY3BwCmluZGV4IDM0NzdlYmJmZjE4NjNlNjlhZjI3OWUzOTM3NDQx YjE1YTcxMGNhYTIuLjU0ZmIyNmM2MWIzZWExM2Y1MThhNTY3ZWY3OGU5M2YxZDUzMTI4NWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FnZ3JlZ2F0ZUVycm9yQ29u c3RydWN0b3IuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FnZ3JlZ2F0 ZUVycm9yQ29uc3RydWN0b3IuY3BwCkBAIC02Miw3ICs2Miw3IEBAIEpTQ19ERUZJTkVfSE9TVF9G VU5DVElPTihjYWxsQWdncmVnYXRlRXJyb3JDb25zdHJ1Y3RvciwgKEpTR2xvYmFsT2JqZWN0KiBn bG9iYWxPCiAgICAgSlNWYWx1ZSBtZXNzYWdlID0gY2FsbEZyYW1lLT5hcmd1bWVudCgxKTsKICAg ICBKU1ZhbHVlIG9wdGlvbnMgPSBPcHRpb25zOjp1c2VFcnJvckNhdXNlKCkgPyBjYWxsRnJhbWUt PmFyZ3VtZW50KDIpIDoganNVbmRlZmluZWQoKTsKICAgICBTdHJ1Y3R1cmUqIGVycm9yU3RydWN0 dXJlID0gZ2xvYmFsT2JqZWN0LT5lcnJvclN0cnVjdHVyZShFcnJvclR5cGU6OkFnZ3JlZ2F0ZUVy cm9yKTsKLSAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKEFnZ3JlZ2F0ZUVycm9yOjpjcmVhdGUo Z2xvYmFsT2JqZWN0LCB2bSwgZXJyb3JTdHJ1Y3R1cmUsIGVycm9ycywgbWVzc2FnZSwgb3B0aW9u cywgbnVsbHB0ciwgVHlwZU5vdGhpbmcsIGZhbHNlKSk7CisgICAgcmV0dXJuIEpTVmFsdWU6OmVu Y29kZShjcmVhdGVBZ2dyZWdhdGVFcnJvcihnbG9iYWxPYmplY3QsIHZtLCBlcnJvclN0cnVjdHVy ZSwgZXJyb3JzLCBtZXNzYWdlLCBvcHRpb25zLCBudWxscHRyLCBUeXBlTm90aGluZywgZmFsc2Up KTsKIH0KIAogSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKGNvbnN0cnVjdEFnZ3JlZ2F0ZUVycm9y Q29uc3RydWN0b3IsIChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDYWxsRnJhbWUqIGNh bGxGcmFtZSkpCkBAIC03OCw3ICs3OCw3IEBAIEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTihjb25z dHJ1Y3RBZ2dyZWdhdGVFcnJvckNvbnN0cnVjdG9yLCAoSlNHbG9iYWxPYmplY3QqIGdsCiAgICAg UkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKICAgICBBU1NFUlQoZXJyb3JTdHJ1Y3R1 cmUpOwogCi0gICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBKU1ZhbHVlOjplbmNvZGUoQWdn cmVnYXRlRXJyb3I6OmNyZWF0ZShnbG9iYWxPYmplY3QsIHZtLCBlcnJvclN0cnVjdHVyZSwgZXJy b3JzLCBtZXNzYWdlLCBvcHRpb25zLCBudWxscHRyLCBUeXBlTm90aGluZywgZmFsc2UpKSk7Cisg ICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBKU1ZhbHVlOjplbmNvZGUoY3JlYXRlQWdncmVn YXRlRXJyb3IoZ2xvYmFsT2JqZWN0LCB2bSwgZXJyb3JTdHJ1Y3R1cmUsIGVycm9ycywgbWVzc2Fn ZSwgb3B0aW9ucywgbnVsbHB0ciwgVHlwZU5vdGhpbmcsIGZhbHNlKSkpOwogfQogCiB9IC8vIG5h bWVzcGFjZSBKU0MKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT R2xvYmFsT2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFs T2JqZWN0LmNwcAppbmRleCBkZWU5N2U2MjU3MDI3ZGViZDZhN2ZiMDNkZjIzMzIxMmViOWJkMTNh Li44YmY2NmMxYTQ2OTRkOGM1Zjc1Mjg3YWFkYTI2MGVkZDQ4NzI0MWVhIDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwCkBAIC01NzYsNyAr NTc2LDcgQEAgdm9pZCBKU0dsb2JhbE9iamVjdDo6aW5pdGlhbGl6ZUVycm9yQ29uc3RydWN0b3Io TGF6eUNsYXNzU3RydWN0dXJlOjpJbml0aWFsaXplciYKIHZvaWQgSlNHbG9iYWxPYmplY3Q6Omlu aXRpYWxpemVBZ2dyZWdhdGVFcnJvckNvbnN0cnVjdG9yKExhenlDbGFzc1N0cnVjdHVyZTo6SW5p dGlhbGl6ZXImIGluaXQpCiB7CiAgICAgaW5pdC5zZXRQcm90b3R5cGUoQWdncmVnYXRlRXJyb3JQ cm90b3R5cGU6OmNyZWF0ZShpbml0LnZtLCBBZ2dyZWdhdGVFcnJvclByb3RvdHlwZTo6Y3JlYXRl U3RydWN0dXJlKGluaXQudm0sIHRoaXMsIG1fZXJyb3JTdHJ1Y3R1cmUucHJvdG90eXBlKHRoaXMp KSkpOwotICAgIGluaXQuc2V0U3RydWN0dXJlKEFnZ3JlZ2F0ZUVycm9yOjpjcmVhdGVTdHJ1Y3R1 cmUoaW5pdC52bSwgdGhpcywgaW5pdC5wcm90b3R5cGUpKTsKKyAgICBpbml0LnNldFN0cnVjdHVy ZShFcnJvckluc3RhbmNlOjpjcmVhdGVTdHJ1Y3R1cmUoaW5pdC52bSwgdGhpcywgaW5pdC5wcm90 b3R5cGUpKTsKICAgICBpbml0LnNldENvbnN0cnVjdG9yKEFnZ3JlZ2F0ZUVycm9yQ29uc3RydWN0 b3I6OmNyZWF0ZShpbml0LnZtLCBBZ2dyZWdhdGVFcnJvckNvbnN0cnVjdG9yOjpjcmVhdGVTdHJ1 Y3R1cmUoaW5pdC52bSwgdGhpcywgbV9lcnJvclN0cnVjdHVyZS5jb25zdHJ1Y3Rvcih0aGlzKSks IGpzQ2FzdDxBZ2dyZWdhdGVFcnJvclByb3RvdHlwZSo+KGluaXQucHJvdG90eXBlKSkpOwogfQog Cg==