229396 2021-08-23 02:05:33 -0700 [JSC] emitArrayProfilingSiteWithCell should not load indexingType unnecessarily 2021-08-23 10:37:23 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1786356 0 ysuzuki 2021-08-23 02:05:33 -0700 [JSC] emitArrayProfilingSiteWithCell should not load indexingType unnecessarily 1786358 1 436167 ysuzuki 2021-08-23 02:06:29 -0700 Created attachment 436167 Patch 1786466 2 436167 ysuzuki 2021-08-23 10:31:47 -0700 Comment on attachment 436167 Patch Thank you! 1786469 3 ews-feeder 2021-08-23 10:36:52 -0700 Committed r281454 (240836@main): <https://commits.webkit.org/240836@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436167. 1786470 4 webkit-bug-importer 2021-08-23 10:37:23 -0700 <rdar://problem/82251234> 436167 2021-08-23 02:06:29 -0700 2021-08-23 10:36:53 -0700 Patch bug-229396-20210823020629.patch text/plain 9722 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 NWQ0NTJlN2MwODc0MjZkNWZjODgxMDBiODQ3NzYxOTRlNjJjMGQ3Li4yNjc4YzZkZjBiYzE4ODRk NTZmMmUxMDVjMmNlNDkyMWMyYTFmOTY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAyMS0wOC0yMyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIGVtaXRBcnJheVByb2ZpbGluZ1NpdGVXaXRoQ2VsbCBzaG91bGQg bm90IGxvYWQgaW5kZXhpbmdUeXBlIHVubmVjZXNzYXJpbHkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTM5NgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGVtaXRBcnJheVByb2ZpbGluZ1NpdGVXaXRoQ2Vs bCBpcyBhbHdheXMgbG9hZGluZyBpbmRleGluZ1R5cGUgYWZ0ZXIgcHJvZmlsaW5nIGEgY2VsbC4K KyAgICAgICAgQnV0IChwb3NzaWJseSkgdGhpcyBpcyBvbGQgY29kZSwgYW5kIHRoZXJlIGlzIG5v IHJlYXNvbiB0byBkbyB0aGF0LiBUaGlzIHBhdGNoIHJlbW92ZXMgaXQuCisKKyAgICAgICAgKiBq aXQvSklULmg6CisgICAgICAgICogaml0L0pJVElubGluZXMuaDoKKyAgICAgICAgKEpTQzo6SklU OjplbWl0QXJyYXlQcm9maWxpbmdTaXRlV2l0aENlbGwpOgorICAgICAgICAqIGppdC9KSVRQcm9w ZXJ0eUFjY2Vzcy5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9nZXRfYnlfdmFsKToK KyAgICAgICAgKEpTQzo6SklUOjplbWl0X29wX3B1dF9ieV92YWwpOgorICAgICAgICAoSlNDOjpK SVQ6OmVtaXRfb3BfZ2V0X2J5X2lkKToKKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29wX2luX2J5 X3ZhbCk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9lbnVtZXJhdG9yX2dldF9ieV92YWwp OgorICAgICAgICAqIGppdC9KSVRQcm9wZXJ0eUFjY2VzczMyXzY0LmNwcDoKKyAgICAgICAgKEpT Qzo6SklUOjplbWl0X29wX2dldF9ieV92YWwpOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRfb3Bf cHV0X2J5X3ZhbCk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9nZXRfYnlfaWQpOgorICAg ICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfaW5fYnlfdmFsKToKKwogMjAyMS0wOC0yMiAgWXVzdWtl IFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIFJlbW92ZSBhbHJl YWR5LXNoaXBwZWQgd2FzbSBvcHRpb24gZmxhZ3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9qaXQvSklULmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCmluZGV4 IDY0NDBmZjI0MTBmMDM3MmQxYjVmYjdmMDU3N2ZkNzBmNDllMjA1NTguLjZjNGYxMWY2OGU5MDNl YmE2N2M2ZDdlYTkzODdkODFiNDU2YWUwZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvSklULmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaApAQCAt MzgxLDcgKzM4MSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBzdGQ6OmVuYWJsZV9pZl90 PHN0ZDo6aXNfc2FtZTxkZWNsdHlwZShPcDo6TWV0YWRhdGE6Om1fcHJvZmlsZSksIFZhbHVlUHJv ZmlsZT46OnZhbHVlLCB2b2lkPgogICAgICAgICBlbWl0VmFsdWVQcm9maWxpbmdTaXRlSWZQcm9m aWxlZE9wY29kZShPcCBieXRlY29kZSk7CiAKLSAgICAgICAgdm9pZCBlbWl0QXJyYXlQcm9maWxp bmdTaXRlV2l0aENlbGwoUmVnaXN0ZXJJRCBjZWxsLCBSZWdpc3RlcklEIGluZGV4aW5nVHlwZSwg QXJyYXlQcm9maWxlKik7CisgICAgICAgIHZvaWQgZW1pdEFycmF5UHJvZmlsaW5nU2l0ZVdpdGhD ZWxsKFJlZ2lzdGVySUQgY2VsbEdQUiwgQXJyYXlQcm9maWxlKiwgUmVnaXN0ZXJJRCBzY3JhdGNo R1BSKTsKICAgICAgICAgdm9pZCBlbWl0QXJyYXlQcm9maWxlU3RvcmVUb0hvbGVTcGVjaWFsQ2Fz ZShBcnJheVByb2ZpbGUqKTsKICAgICAgICAgdm9pZCBlbWl0QXJyYXlQcm9maWxlT3V0T2ZCb3Vu ZHNTcGVjaWFsQ2FzZShBcnJheVByb2ZpbGUqKTsKICAgICAgICAgCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVElubGluZXMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUSW5saW5lcy5oCmluZGV4IDc3NDRiNTA4MzdhZWE3YmEwODVhMDEzNDVmYmJmMmI2 OGJmMGQ0MjUuLjE3YzI3ZmRjMWNkM2JmNjMyNmE0M2I1ZmVmODFlNjBlNmNjNDdmMDIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUSW5saW5lcy5oCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUSW5saW5lcy5oCkBAIC0zNDQsMTQgKzM0NCwxMiBAQCBp bmxpbmUgdm9pZCBKSVQ6OmVtaXRWYWx1ZVByb2ZpbGluZ1NpdGUoTWV0YWRhdGEmIG1ldGFkYXRh LCBHUFJSZWcgcmVzdWx0UmVnKQogfQogI2VuZGlmCiAKLWlubGluZSB2b2lkIEpJVDo6ZW1pdEFy cmF5UHJvZmlsaW5nU2l0ZVdpdGhDZWxsKFJlZ2lzdGVySUQgY2VsbCwgUmVnaXN0ZXJJRCBpbmRl eGluZ1R5cGUsIEFycmF5UHJvZmlsZSogYXJyYXlQcm9maWxlKQoraW5saW5lIHZvaWQgSklUOjpl bWl0QXJyYXlQcm9maWxpbmdTaXRlV2l0aENlbGwoUmVnaXN0ZXJJRCBjZWxsR1BSLCBBcnJheVBy b2ZpbGUqIGFycmF5UHJvZmlsZSwgUmVnaXN0ZXJJRCBzY3JhdGNoR1BSKQogewogICAgIGlmIChz aG91bGRFbWl0UHJvZmlsaW5nKCkpIHsKLSAgICAgICAgbG9hZDMyKE1hY3JvQXNzZW1ibGVyOjpB ZGRyZXNzKGNlbGwsIEpTQ2VsbDo6c3RydWN0dXJlSURPZmZzZXQoKSksIGluZGV4aW5nVHlwZSk7 Ci0gICAgICAgIHN0b3JlMzIoaW5kZXhpbmdUeXBlLCBhcnJheVByb2ZpbGUtPmFkZHJlc3NPZkxh c3RTZWVuU3RydWN0dXJlSUQoKSk7CisgICAgICAgIGxvYWQzMihNYWNyb0Fzc2VtYmxlcjo6QWRk cmVzcyhjZWxsR1BSLCBKU0NlbGw6OnN0cnVjdHVyZUlET2Zmc2V0KCkpLCBzY3JhdGNoR1BSKTsK KyAgICAgICAgc3RvcmUzMihzY3JhdGNoR1BSLCBhcnJheVByb2ZpbGUtPmFkZHJlc3NPZkxhc3RT ZWVuU3RydWN0dXJlSUQoKSk7CiAgICAgfQotCi0gICAgbG9hZDgoQWRkcmVzcyhjZWxsLCBKU0Nl bGw6OmluZGV4aW5nVHlwZUFuZE1pc2NPZmZzZXQoKSksIGluZGV4aW5nVHlwZSk7CiB9CiAKIGlu bGluZSB2b2lkIEpJVDo6ZW1pdEFycmF5UHJvZmlsZVN0b3JlVG9Ib2xlU3BlY2lhbENhc2UoQXJy YXlQcm9maWxlKiBhcnJheVByb2ZpbGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaml0L0pJVFByb3BlcnR5QWNjZXNzLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv SklUUHJvcGVydHlBY2Nlc3MuY3BwCmluZGV4IDU2NjhkZmJlNDFkMTJhOTIyNGE0M2MwODgxMzRl M2NjNWM4NGNjN2UuLjNkMWQ4NGZjODIwMmJmODg5YmRmMjBlYTMzOGRmOGE5MTEwOTA2M2IgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nlc3MuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nlc3MuY3BwCkBA IC02MCwxMiArNjAsMTIgQEAgdm9pZCBKSVQ6OmVtaXRfb3BfZ2V0X2J5X3ZhbChjb25zdCBJbnN0 cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQogCiAgICAgaWYgKG1ldGFkYXRhLm1fc2Vlbklk ZW50aWZpZXJzLmNvdW50KCkgPiBPcHRpb25zOjpnZXRCeVZhbElDTWF4TnVtYmVyT2ZJZGVudGlm aWVycygpKSB7CiAgICAgICAgIGF1dG8gbm90Q2VsbCA9IGJyYW5jaElmTm90Q2VsbChyZWdUMCk7 Ci0gICAgICAgIGVtaXRBcnJheVByb2ZpbGluZ1NpdGVXaXRoQ2VsbChyZWdUMCwgcmVnVDIsIHBy b2ZpbGUpOworICAgICAgICBlbWl0QXJyYXlQcm9maWxpbmdTaXRlV2l0aENlbGwocmVnVDAsIHBy b2ZpbGUsIHJlZ1QyKTsKICAgICAgICAgbm90Q2VsbC5saW5rKHRoaXMpOwogICAgICAgICBjYWxs T3BlcmF0aW9uV2l0aFByb2ZpbGUoYnl0ZWNvZGUubWV0YWRhdGEobV9jb2RlQmxvY2spLCBvcGVy YXRpb25HZXRCeVZhbCwgZHN0LCBUcnVzdGVkSW1tUHRyKG1fY29kZUJsb2NrLT5nbG9iYWxPYmpl Y3QoKSksIHJlZ1QwLCByZWdUMSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgZW1pdEp1bXBTbG93 Q2FzZUlmTm90SlNDZWxsKHJlZ1QwLCBiYXNlKTsKLSAgICAgICAgZW1pdEFycmF5UHJvZmlsaW5n U2l0ZVdpdGhDZWxsKHJlZ1QwLCByZWdUMiwgcHJvZmlsZSk7CisgICAgICAgIGVtaXRBcnJheVBy b2ZpbGluZ1NpdGVXaXRoQ2VsbChyZWdUMCwgcHJvZmlsZSwgcmVnVDIpOwogCiAgICAgICAgIEpT VmFsdWVSZWdzIHJlc3VsdFJlZ3MgPSBKU1ZhbHVlUmVncyhyZWdUMCk7CiAKQEAgLTQ2MiwxMiAr NDYyLDEzIEBAIHZvaWQgSklUOjplbWl0X29wX3B1dF9ieV92YWwoY29uc3QgSW5zdHJ1Y3Rpb24q IGN1cnJlbnRJbnN0cnVjdGlvbikKICAgICAgICAgLy8gU2VlIGNvbW1lbnQgaW4gb3BfZ2V0X2J5 X3ZhbC4KICAgICAgICAgemVyb0V4dGVuZDMyVG9Xb3JkKHJlZ1QxLCByZWdUMSk7CiAgICAgfQot ICAgIGVtaXRBcnJheVByb2ZpbGluZ1NpdGVXaXRoQ2VsbChyZWdUMCwgcmVnVDIsIHByb2ZpbGUp OworICAgIGVtaXRBcnJheVByb2ZpbGluZ1NpdGVXaXRoQ2VsbChyZWdUMCwgcHJvZmlsZSwgcmVn VDIpOwogCiAgICAgUGF0Y2hhYmxlSnVtcCBiYWRUeXBlOwogICAgIEp1bXBMaXN0IHNsb3dDYXNl czsKIAogICAgIC8vIEZJWE1FOiBNYXliZSB3ZSBzaG91bGQgZG8gdGhpcyBpbmxpbmU/CisgICAg bG9hZDgoQWRkcmVzcyhyZWdUMCwgSlNDZWxsOjppbmRleGluZ1R5cGVBbmRNaXNjT2Zmc2V0KCkp LCByZWdUMik7CiAgICAgYWRkU2xvd0Nhc2UoYnJhbmNoVGVzdDMyKE5vblplcm8sIHJlZ1QyLCBU cnVzdGVkSW1tMzIoQ29weU9uV3JpdGUpKSk7CiAgICAgYW5kMzIoVHJ1c3RlZEltbTMyKEluZGV4 aW5nU2hhcGVNYXNrKSwgcmVnVDIpOwogCkBAIC0xMzA3LDcgKzEzMDgsNyBAQCB2b2lkIEpJVDo6 ZW1pdF9vcF9nZXRfYnlfaWQoY29uc3QgSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikK ICAgICAKICAgICBpZiAoKmlkZW50ID09IG1fdm0tPnByb3BlcnR5TmFtZXMtPmxlbmd0aCAmJiBz aG91bGRFbWl0UHJvZmlsaW5nKCkpIHsKICAgICAgICAgSnVtcCBub3RBcnJheUxlbmd0aE1vZGUg PSBicmFuY2g4KE5vdEVxdWFsLCBBYnNvbHV0ZUFkZHJlc3MoJm1ldGFkYXRhLm1fbW9kZU1ldGFk YXRhLm1vZGUpLCBUcnVzdGVkSW1tMzIoc3RhdGljX2Nhc3Q8dWludDhfdD4oR2V0QnlJZE1vZGU6 OkFycmF5TGVuZ3RoKSkpOwotICAgICAgICBlbWl0QXJyYXlQcm9maWxpbmdTaXRlV2l0aENlbGwo cmVnVDAsIHJlZ1QxLCAmbWV0YWRhdGEubV9tb2RlTWV0YWRhdGEuYXJyYXlMZW5ndGhNb2RlLmFy cmF5UHJvZmlsZSk7CisgICAgICAgIGVtaXRBcnJheVByb2ZpbGluZ1NpdGVXaXRoQ2VsbChyZWdU MCwgJm1ldGFkYXRhLm1fbW9kZU1ldGFkYXRhLmFycmF5TGVuZ3RoTW9kZS5hcnJheVByb2ZpbGUs IHJlZ1QxKTsKICAgICAgICAgbm90QXJyYXlMZW5ndGhNb2RlLmxpbmsodGhpcyk7CiAgICAgfQog CkBAIC0xNzEzLDcgKzE3MTQsNyBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9pbl9ieV92YWwoY29uc3Qg SW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKICAgICBlbWl0R2V0VmlydHVhbFJlZ2lz dGVyKGJhc2UsIHJlZ1QwKTsKICAgICBlbWl0SnVtcFNsb3dDYXNlSWZOb3RKU0NlbGwocmVnVDAs IGJhc2UpOwogICAgIGVtaXRHZXRWaXJ0dWFsUmVnaXN0ZXIocHJvcGVydHksIHJlZ1QxKTsKLSAg ICBlbWl0QXJyYXlQcm9maWxpbmdTaXRlV2l0aENlbGwocmVnVDAsIHJlZ1QyLCBwcm9maWxlKTsK KyAgICBlbWl0QXJyYXlQcm9maWxpbmdTaXRlV2l0aENlbGwocmVnVDAsIHByb2ZpbGUsIHJlZ1Qy KTsKIAogICAgIEpJVEluQnlWYWxHZW5lcmF0b3IgZ2VuKAogICAgICAgICBtX2NvZGVCbG9jaywg SklUVHlwZTo6QmFzZWxpbmVKSVQsIENvZGVPcmlnaW4obV9ieXRlY29kZUluZGV4KSwgQ2FsbFNp dGVJbmRleChtX2J5dGVjb2RlSW5kZXgpLCBBY2Nlc3NUeXBlOjpJbkJ5VmFsLCBSZWdpc3RlclNl dDo6c3R1YlVuYXZhaWxhYmxlUmVnaXN0ZXJzKCksCkBAIC0zMTAxLDcgKzMxMDIsNyBAQCB2b2lk IEpJVDo6ZW1pdF9vcF9lbnVtZXJhdG9yX2dldF9ieV92YWwoY29uc3QgSW5zdHJ1Y3Rpb24qIGN1 cnJlbnRJbnN0cnVjdGlvbikKICAgICBlbWl0R2V0VmlydHVhbFJlZ2lzdGVyKGluZGV4LCByZWdU MSk7CiAKICAgICBpc05vdEluZGV4ZWQubGluayh0aGlzKTsKLSAgICBlbWl0QXJyYXlQcm9maWxp bmdTaXRlV2l0aENlbGwocmVnVDAsIHJlZ1QyLCBwcm9maWxlKTsKKyAgICBlbWl0QXJyYXlQcm9m aWxpbmdTaXRlV2l0aENlbGwocmVnVDAsIHByb2ZpbGUsIHJlZ1QyKTsKIAogICAgIEpJVEdldEJ5 VmFsR2VuZXJhdG9yIGdlbigKICAgICAgICAgbV9jb2RlQmxvY2ssIEpJVFR5cGU6OkJhc2VsaW5l SklULCBDb2RlT3JpZ2luKG1fYnl0ZWNvZGVJbmRleCksIENhbGxTaXRlSW5kZXgobV9ieXRlY29k ZUluZGV4KSwgQWNjZXNzVHlwZTo6R2V0QnlWYWwsIFJlZ2lzdGVyU2V0OjpzdHViVW5hdmFpbGFi bGVSZWdpc3RlcnMoKSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklU UHJvcGVydHlBY2Nlc3MzMl82NC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFBy b3BlcnR5QWNjZXNzMzJfNjQuY3BwCmluZGV4IGI5OGJmZWNlZGFhNTU2MDFmOTVhODhiZWRhNjFi MDlmMWEzNDM0NzEuLmU4MjY5ZmQxZTE5OWYxNTI0ODRlYjQ0ZGRlZjJhYWQxNzc4MjMyZmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nlc3MzMl82 NC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2VzczMy XzY0LmNwcApAQCAtMjQ3LDEyICsyNDcsMTIgQEAgdm9pZCBKSVQ6OmVtaXRfb3BfZ2V0X2J5X3Zh bChjb25zdCBJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQogCiAgICAgaWYgKG1ldGFk YXRhLm1fc2VlbklkZW50aWZpZXJzLmNvdW50KCkgPiBPcHRpb25zOjpnZXRCeVZhbElDTWF4TnVt YmVyT2ZJZGVudGlmaWVycygpKSB7CiAgICAgICAgIGF1dG8gbm90Q2VsbCA9IGJyYW5jaElmTm90 Q2VsbChyZWdUMSk7Ci0gICAgICAgIGVtaXRBcnJheVByb2ZpbGluZ1NpdGVXaXRoQ2VsbChyZWdU MCwgcmVnVDQsIHByb2ZpbGUpOworICAgICAgICBlbWl0QXJyYXlQcm9maWxpbmdTaXRlV2l0aENl bGwocmVnVDAsIHByb2ZpbGUsIHJlZ1Q0KTsKICAgICAgICAgbm90Q2VsbC5saW5rKHRoaXMpOwog ICAgICAgICBjYWxsT3BlcmF0aW9uV2l0aFByb2ZpbGUoYnl0ZWNvZGUubWV0YWRhdGEobV9jb2Rl QmxvY2spLCBvcGVyYXRpb25HZXRCeVZhbCwgZHN0LCBUcnVzdGVkSW1tUHRyKG1fY29kZUJsb2Nr LT5nbG9iYWxPYmplY3QoKSksIEpTVmFsdWVSZWdzKHJlZ1QxLCByZWdUMCksIEpTVmFsdWVSZWdz KHJlZ1QzLCByZWdUMikpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGVtaXRKdW1wU2xvd0Nhc2VJ Zk5vdEpTQ2VsbChiYXNlLCByZWdUMSk7Ci0gICAgICAgIGVtaXRBcnJheVByb2ZpbGluZ1NpdGVX aXRoQ2VsbChyZWdUMCwgcmVnVDQsIHByb2ZpbGUpOworICAgICAgICBlbWl0QXJyYXlQcm9maWxp bmdTaXRlV2l0aENlbGwocmVnVDAsIHByb2ZpbGUsIHJlZ1Q0KTsKIAogICAgICAgICBKU1ZhbHVl UmVncyByZXN1bHRSZWdzID0gSlNWYWx1ZVJlZ3MocmVnVDEsIHJlZ1QwKTsKIApAQCAtNDc0LDEy ICs0NzQsMTMgQEAgdm9pZCBKSVQ6OmVtaXRfb3BfcHV0X2J5X3ZhbChjb25zdCBJbnN0cnVjdGlv biogY3VycmVudEluc3RydWN0aW9uKQogICAgIGVtaXRKdW1wU2xvd0Nhc2VJZk5vdEpTQ2VsbChi YXNlLCByZWdUMSk7CiAgICAgUGF0Y2hhYmxlSnVtcCBub3RJbmRleCA9IHBhdGNoYWJsZUJyYW5j aDMyKE5vdEVxdWFsLCByZWdUMywgVHJ1c3RlZEltbTMyKEpTVmFsdWU6OkludDMyVGFnKSk7CiAg ICAgYWRkU2xvd0Nhc2Uobm90SW5kZXgpOwotICAgIGVtaXRBcnJheVByb2ZpbGluZ1NpdGVXaXRo Q2VsbChyZWdUMCwgcmVnVDEsIHByb2ZpbGUpOworICAgIGVtaXRBcnJheVByb2ZpbGluZ1NpdGVX aXRoQ2VsbChyZWdUMCwgcHJvZmlsZSwgcmVnVDEpOwogICAgIAogICAgIFBhdGNoYWJsZUp1bXAg YmFkVHlwZTsKICAgICBKdW1wTGlzdCBzbG93Q2FzZXM7CiAKICAgICAvLyBGSVhNRTogTWF5YmUg d2Ugc2hvdWxkIGRvIHRoaXMgaW5saW5lPworICAgIGxvYWQ4KEFkZHJlc3MocmVnVDAsIEpTQ2Vs bDo6aW5kZXhpbmdUeXBlQW5kTWlzY09mZnNldCgpKSwgcmVnVDEpOwogICAgIGFkZFNsb3dDYXNl KGJyYW5jaFRlc3QzMihOb25aZXJvLCByZWdUMSwgVHJ1c3RlZEltbTMyKENvcHlPbldyaXRlKSkp OwogICAgIGFuZDMyKFRydXN0ZWRJbW0zMihJbmRleGluZ1NoYXBlTWFzayksIHJlZ1QxKTsKICAg ICAKQEAgLTc0NCw3ICs3NDUsNyBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9nZXRfYnlfaWQoY29uc3Qg SW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKIAogICAgIGlmICgqaWRlbnQgPT0gbV92 bS0+cHJvcGVydHlOYW1lcy0+bGVuZ3RoICYmIHNob3VsZEVtaXRQcm9maWxpbmcoKSkgewogICAg ICAgICBKdW1wIG5vdEFycmF5TGVuZ3RoTW9kZSA9IGJyYW5jaDgoTm90RXF1YWwsIEFic29sdXRl QWRkcmVzcygmbWV0YWRhdGEubV9tb2RlTWV0YWRhdGEubW9kZSksIFRydXN0ZWRJbW0zMihzdGF0 aWNfY2FzdDx1aW50OF90PihHZXRCeUlkTW9kZTo6QXJyYXlMZW5ndGgpKSk7Ci0gICAgICAgIGVt aXRBcnJheVByb2ZpbGluZ1NpdGVXaXRoQ2VsbChyZWdUMCwgcmVnVDIsICZtZXRhZGF0YS5tX21v ZGVNZXRhZGF0YS5hcnJheUxlbmd0aE1vZGUuYXJyYXlQcm9maWxlKTsKKyAgICAgICAgZW1pdEFy cmF5UHJvZmlsaW5nU2l0ZVdpdGhDZWxsKHJlZ1QwLCAmbWV0YWRhdGEubV9tb2RlTWV0YWRhdGEu YXJyYXlMZW5ndGhNb2RlLmFycmF5UHJvZmlsZSwgcmVnVDIpOwogICAgICAgICBub3RBcnJheUxl bmd0aE1vZGUubGluayh0aGlzKTsKICAgICB9CiAKQEAgLTkyMSw3ICs5MjIsNyBAQCB2b2lkIEpJ VDo6ZW1pdF9vcF9pbl9ieV92YWwoY29uc3QgSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlv bikKIAogICAgIGVtaXRMb2FkMihiYXNlLCByZWdUMSwgcmVnVDAsIHByb3BlcnR5LCByZWdUMywg cmVnVDIpOwogICAgIGVtaXRKdW1wU2xvd0Nhc2VJZk5vdEpTQ2VsbChiYXNlLCByZWdUMSk7Ci0g ICAgZW1pdEFycmF5UHJvZmlsaW5nU2l0ZVdpdGhDZWxsKHJlZ1QwLCByZWdUNCwgcHJvZmlsZSk7 CisgICAgZW1pdEFycmF5UHJvZmlsaW5nU2l0ZVdpdGhDZWxsKHJlZ1QwLCBwcm9maWxlLCByZWdU NCk7CiAKICAgICBKSVRJbkJ5VmFsR2VuZXJhdG9yIGdlbigKICAgICAgICAgbV9jb2RlQmxvY2ss IEpJVFR5cGU6OkJhc2VsaW5lSklULCBDb2RlT3JpZ2luKG1fYnl0ZWNvZGVJbmRleCksIENhbGxT aXRlSW5kZXgobV9ieXRlY29kZUluZGV4KSwgQWNjZXNzVHlwZTo6SW5CeVZhbCwgUmVnaXN0ZXJT ZXQ6OnN0dWJVbmF2YWlsYWJsZVJlZ2lzdGVycygpLAo=