200958 2019-08-20 18:06:53 -0700 Remove superfluous size argument to allocateCell() for fixed size objects. 2019-08-20 18:14:23 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1563345 0 mark.lam 2019-08-20 18:06:53 -0700 The size is already automatically computed by the allocateCell() template's default arguments. Removing these superfluous arguments will make it easier for us to grep for cases where we allocate variable size cells (for later analysis work). 1563346 1 376835 mark.lam 2019-08-20 18:09:45 -0700 Created attachment 376835 proposed patch. 1563347 2 376835 ysuzuki 2019-08-20 18:11:16 -0700 Comment on attachment 376835 proposed patch. r=me 1563350 3 mark.lam 2019-08-20 18:13:40 -0700 Thanks for the review. Landed in r248929: <http://trac.webkit.org/r248929>. 1563351 4 webkit-bug-importer 2019-08-20 18:14:23 -0700 <rdar://problem/54537825> 376835 2019-08-20 18:09:45 -0700 2019-08-20 18:11:16 -0700 proposed patch. bug-200958.patch text/plain 10279 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQ4OTI4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBA CisyMDE5LTA4LTIwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW1vdmUgc3VwZXJmbHVvdXMgc2l6ZSBhcmd1bWVudCB0byBhbGxvY2F0ZUNlbGwoKSBmb3IgZml4 ZWQgc2l6ZSBvYmplY3RzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjAwOTU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlIHNpemUgaXMgYWxyZWFkeSBhdXRvbWF0aWNhbGx5IGNvbXB1dGVkIGJ5IHRo ZSBhbGxvY2F0ZUNlbGwoKSB0ZW1wbGF0ZSdzIGRlZmF1bHQKKyAgICAgICAgYXJndW1lbnRzLiAg UmVtb3ZpbmcgdGhlc2Ugc3VwZXJmbHVvdXMgYXJndW1lbnRzIHdpbGwgbWFrZSBpdCBlYXNpZXIg Zm9yIHVzIHRvCisgICAgICAgIGdyZXAgZm9yIGNhc2VzIHdoZXJlIHdlIGRvIGFsbG9jYXRlIHZh cmlhYmxlIHNpemUgY2VsbHMgKGZvciBsYXRlciBhbmFseXNpcyB3b3JrKS4KKworICAgICAgICAq IGpzYy5jcHA6CisgICAgICAgIChKU0M6Ok1hc3F1ZXJhZGVyOjpjcmVhdGUpOgorICAgICAgICAo SlNDTWVtb3J5Rm9vdHByaW50OjpjcmVhdGUpOgorICAgICAgICAqIHRvb2xzL0pTRG9sbGFyVk0u Y3BwOgorICAgICAgICAoSlNDOjpKU0RvbGxhclZNQ2FsbEZyYW1lOjpjcmVhdGUpOgorICAgICAg ICAoSlNDOjpFbGVtZW50OjpjcmVhdGUpOgorICAgICAgICAoSlNDOjpSb290OjpjcmVhdGUpOgor ICAgICAgICAoSlNDOjpTaW1wbGVPYmplY3Q6OmNyZWF0ZSk6CisgICAgICAgIChKU0M6OkltcHVy ZUdldHRlcjo6Y3JlYXRlKToKKyAgICAgICAgKEpTQzo6Q3VzdG9tR2V0dGVyOjpjcmVhdGUpOgor ICAgICAgICAoSlNDOjpET01KSVROb2RlOjpjcmVhdGUpOgorICAgICAgICAoSlNDOjpET01KSVRH ZXR0ZXI6OmNyZWF0ZSk6CisgICAgICAgIChKU0M6OkRPTUpJVEdldHRlckNvbXBsZXg6OmNyZWF0 ZSk6CisgICAgICAgIChKU0M6OkRPTUpJVEZ1bmN0aW9uT2JqZWN0OjpjcmVhdGUpOgorICAgICAg ICAoSlNDOjpET01KSVRDaGVja1N1YkNsYXNzT2JqZWN0OjpjcmVhdGUpOgorICAgICAgICAoSlND OjpET01KSVRHZXR0ZXJCYXNlSlNPYmplY3Q6OmNyZWF0ZSk6CisgICAgICAgIChKU0M6OkpTVGVz dEN1c3RvbUdldHRlclNldHRlcjo6Y3JlYXRlKToKKyAgICAgICAgKEpTQzo6V2FzbVN0cmVhbWlu Z1BhcnNlcjo6Y3JlYXRlKToKKwogMjAxOS0wOC0yMCAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBs ZS5jb20+CiAKICAgICAgICAgSlNCaWdJbnQ6Om1fbGVuZ3RoIHNob3VsZCBiZSBpbW11dGFibGUu CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAkocmV2aXNpb24gMjQ4OTI1KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2pzYy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNiArMSw2IEBACiAvKgog ICogIENvcHlyaWdodCAoQykgMTk5OS0yMDAwIEhhcnJpIFBvcnRlbiAocG9ydGVuQGtkZS5vcmcp Ci0gKiAgQ29weXJpZ2h0IChDKSAyMDA0LTIwMTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICogIENvcHlyaWdodCAoQykgMjAwNC0yMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICAqICBDb3B5cmlnaHQgKEMpIDIwMDYgQmpvZXJuIEdyYWYgKGJqb2Vybi5ncmFm QGdtYWlsLmNvbSkKICAqCiAgKiAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBj YW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgpAQCAtMjAxLDcgKzIwMSw3IEBAIHB1YmxpYzoKICAg ICB7CiAgICAgICAgIGdsb2JhbE9iamVjdC0+bWFzcXVlcmFkZXNBc1VuZGVmaW5lZFdhdGNocG9p bnQoKS0+ZmlyZUFsbCh2bSwgIk1hc3F1ZXJhZGluZyBvYmplY3QgYWxsb2NhdGVkIik7CiAgICAg ICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gY3JlYXRlU3RydWN0dXJlKHZtLCBnbG9iYWxPYmpl Y3QsIGpzTnVsbCgpKTsKLSAgICAgICAgTWFzcXVlcmFkZXIqIHJlc3VsdCA9IG5ldyAoTm90TnVs bCwgYWxsb2NhdGVDZWxsPE1hc3F1ZXJhZGVyPih2bS5oZWFwLCBzaXplb2YoTWFzcXVlcmFkZXIp KSkgTWFzcXVlcmFkZXIodm0sIHN0cnVjdHVyZSk7CisgICAgICAgIE1hc3F1ZXJhZGVyKiByZXN1 bHQgPSBuZXcgKE5vdE51bGwsIGFsbG9jYXRlQ2VsbDxNYXNxdWVyYWRlcj4odm0uaGVhcCkpIE1h c3F1ZXJhZGVyKHZtLCBzdHJ1Y3R1cmUpOwogICAgICAgICByZXN1bHQtPmZpbmlzaENyZWF0aW9u KHZtKTsKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CkBAIC0xMzkyLDcgKzEzOTIsNyBA QCBwdWJsaWM6CiAgICAgc3RhdGljIEpTQ01lbW9yeUZvb3RwcmludCogY3JlYXRlKFZNJiB2bSwg SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCkKICAgICB7CiAgICAgICAgIFN0cnVjdHVyZSog c3RydWN0dXJlID0gY3JlYXRlU3RydWN0dXJlKHZtLCBnbG9iYWxPYmplY3QsIGpzTnVsbCgpKTsK LSAgICAgICAgSlNDTWVtb3J5Rm9vdHByaW50KiBmb290cHJpbnQgPSBuZXcgKE5vdE51bGwsIGFs bG9jYXRlQ2VsbDxKU0NNZW1vcnlGb290cHJpbnQ+KHZtLmhlYXAsIHNpemVvZihKU0NNZW1vcnlG b290cHJpbnQpKSkgSlNDTWVtb3J5Rm9vdHByaW50KHZtLCBzdHJ1Y3R1cmUpOworICAgICAgICBK U0NNZW1vcnlGb290cHJpbnQqIGZvb3RwcmludCA9IG5ldyAoTm90TnVsbCwgYWxsb2NhdGVDZWxs PEpTQ01lbW9yeUZvb3RwcmludD4odm0uaGVhcCkpIEpTQ01lbW9yeUZvb3RwcmludCh2bSwgc3Ry dWN0dXJlKTsKICAgICAgICAgZm9vdHByaW50LT5maW5pc2hDcmVhdGlvbih2bSk7CiAgICAgICAg IHJldHVybiBmb290cHJpbnQ7CiAgICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3Rv b2xzL0pTRG9sbGFyVk0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90 b29scy9KU0RvbGxhclZNLmNwcAkocmV2aXNpb24gMjQ4OTI1KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL3Rvb2xzL0pTRG9sbGFyVk0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OSw3ICs3OSw3 IEBAIHB1YmxpYzoKICAgICAgICAgVk0mIHZtID0gZXhlYy0+dm0oKTsKICAgICAgICAgSlNHbG9i YWxPYmplY3QqIGdsb2JhbE9iamVjdCA9IGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKTsKICAg ICAgICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSBjcmVhdGVTdHJ1Y3R1cmUodm0sIGdsb2JhbE9i amVjdCwganNOdWxsKCkpOwotICAgICAgICBKU0RvbGxhclZNQ2FsbEZyYW1lKiBmcmFtZSA9IG5l dyAoTm90TnVsbCwgYWxsb2NhdGVDZWxsPEpTRG9sbGFyVk1DYWxsRnJhbWU+KHZtLmhlYXAsIHNp emVvZihKU0RvbGxhclZNQ2FsbEZyYW1lKSkpIEpTRG9sbGFyVk1DYWxsRnJhbWUodm0sIHN0cnVj dHVyZSk7CisgICAgICAgIEpTRG9sbGFyVk1DYWxsRnJhbWUqIGZyYW1lID0gbmV3IChOb3ROdWxs LCBhbGxvY2F0ZUNlbGw8SlNEb2xsYXJWTUNhbGxGcmFtZT4odm0uaGVhcCkpIEpTRG9sbGFyVk1D YWxsRnJhbWUodm0sIHN0cnVjdHVyZSk7CiAgICAgICAgIGZyYW1lLT5maW5pc2hDcmVhdGlvbih2 bSwgZXhlYywgcmVxdWVzdGVkRnJhbWVJbmRleCk7CiAgICAgICAgIHJldHVybiBmcmFtZTsKICAg ICB9CkBAIC0xNDgsNyArMTQ4LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBFbGVtZW50KiBjcmVh dGUoVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBSb290KiByb290KQogICAg IHsKICAgICAgICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSBjcmVhdGVTdHJ1Y3R1cmUodm0sIGds b2JhbE9iamVjdCwganNOdWxsKCkpOwotICAgICAgICBFbGVtZW50KiBlbGVtZW50ID0gbmV3IChO b3ROdWxsLCBhbGxvY2F0ZUNlbGw8RWxlbWVudD4odm0uaGVhcCwgc2l6ZW9mKEVsZW1lbnQpKSkg RWxlbWVudCh2bSwgc3RydWN0dXJlKTsKKyAgICAgICAgRWxlbWVudCogZWxlbWVudCA9IG5ldyAo Tm90TnVsbCwgYWxsb2NhdGVDZWxsPEVsZW1lbnQ+KHZtLmhlYXApKSBFbGVtZW50KHZtLCBzdHJ1 Y3R1cmUpOwogICAgICAgICBlbGVtZW50LT5maW5pc2hDcmVhdGlvbih2bSwgcm9vdCk7CiAgICAg ICAgIHJldHVybiBlbGVtZW50OwogICAgIH0KQEAgLTIwOSw3ICsyMDksNyBAQCBwdWJsaWM6CiAg ICAgc3RhdGljIFJvb3QqIGNyZWF0ZShWTSYgdm0sIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmpl Y3QpCiAgICAgewogICAgICAgICBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGNyZWF0ZVN0cnVjdHVy ZSh2bSwgZ2xvYmFsT2JqZWN0LCBqc051bGwoKSk7Ci0gICAgICAgIFJvb3QqIHJvb3QgPSBuZXcg KE5vdE51bGwsIGFsbG9jYXRlQ2VsbDxSb290Pih2bS5oZWFwLCBzaXplb2YoUm9vdCkpKSBSb290 KHZtLCBzdHJ1Y3R1cmUpOworICAgICAgICBSb290KiByb290ID0gbmV3IChOb3ROdWxsLCBhbGxv Y2F0ZUNlbGw8Um9vdD4odm0uaGVhcCkpIFJvb3Qodm0sIHN0cnVjdHVyZSk7CiAgICAgICAgIHJv b3QtPmZpbmlzaENyZWF0aW9uKHZtKTsKICAgICAgICAgcmV0dXJuIHJvb3Q7CiAgICAgfQpAQCAt MjQ3LDcgKzI0Nyw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgU2ltcGxlT2JqZWN0KiBjcmVhdGUo Vk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQogICAgIHsKICAgICAgICAgU3Ry dWN0dXJlKiBzdHJ1Y3R1cmUgPSBjcmVhdGVTdHJ1Y3R1cmUodm0sIGdsb2JhbE9iamVjdCwganNO dWxsKCkpOwotICAgICAgICBTaW1wbGVPYmplY3QqIHNpbXBsZU9iamVjdCA9IG5ldyAoTm90TnVs bCwgYWxsb2NhdGVDZWxsPFNpbXBsZU9iamVjdD4odm0uaGVhcCwgc2l6ZW9mKFNpbXBsZU9iamVj dCkpKSBTaW1wbGVPYmplY3Qodm0sIHN0cnVjdHVyZSk7CisgICAgICAgIFNpbXBsZU9iamVjdCog c2ltcGxlT2JqZWN0ID0gbmV3IChOb3ROdWxsLCBhbGxvY2F0ZUNlbGw8U2ltcGxlT2JqZWN0Pih2 bS5oZWFwKSkgU2ltcGxlT2JqZWN0KHZtLCBzdHJ1Y3R1cmUpOwogICAgICAgICBzaW1wbGVPYmpl Y3QtPmZpbmlzaENyZWF0aW9uKHZtKTsKICAgICAgICAgcmV0dXJuIHNpbXBsZU9iamVjdDsKICAg ICB9CkBAIC0zMDAsNyArMzAwLDcgQEAgcHVibGljOgogCiAgICAgc3RhdGljIEltcHVyZUdldHRl ciogY3JlYXRlKFZNJiB2bSwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIEpTT2JqZWN0KiBkZWxlZ2F0 ZSkKICAgICB7Ci0gICAgICAgIEltcHVyZUdldHRlciogZ2V0dGVyID0gbmV3IChOb3ROdWxsLCBh bGxvY2F0ZUNlbGw8SW1wdXJlR2V0dGVyPih2bS5oZWFwLCBzaXplb2YoSW1wdXJlR2V0dGVyKSkp IEltcHVyZUdldHRlcih2bSwgc3RydWN0dXJlKTsKKyAgICAgICAgSW1wdXJlR2V0dGVyKiBnZXR0 ZXIgPSBuZXcgKE5vdE51bGwsIGFsbG9jYXRlQ2VsbDxJbXB1cmVHZXR0ZXI+KHZtLmhlYXApKSBJ bXB1cmVHZXR0ZXIodm0sIHN0cnVjdHVyZSk7CiAgICAgICAgIGdldHRlci0+ZmluaXNoQ3JlYXRp b24odm0sIGRlbGVnYXRlKTsKICAgICAgICAgcmV0dXJuIGdldHRlcjsKICAgICB9CkBAIC0zNjIs NyArMzYyLDcgQEAgcHVibGljOgogCiAgICAgc3RhdGljIEN1c3RvbUdldHRlciogY3JlYXRlKFZN JiB2bSwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUpCiAgICAgewotICAgICAgICBDdXN0b21HZXR0ZXIq IGdldHRlciA9IG5ldyAoTm90TnVsbCwgYWxsb2NhdGVDZWxsPEN1c3RvbUdldHRlcj4odm0uaGVh cCwgc2l6ZW9mKEN1c3RvbUdldHRlcikpKSBDdXN0b21HZXR0ZXIodm0sIHN0cnVjdHVyZSk7Cisg ICAgICAgIEN1c3RvbUdldHRlciogZ2V0dGVyID0gbmV3IChOb3ROdWxsLCBhbGxvY2F0ZUNlbGw8 Q3VzdG9tR2V0dGVyPih2bS5oZWFwKSkgQ3VzdG9tR2V0dGVyKHZtLCBzdHJ1Y3R1cmUpOwogICAg ICAgICBnZXR0ZXItPmZpbmlzaENyZWF0aW9uKHZtKTsKICAgICAgICAgcmV0dXJuIGdldHRlcjsK ICAgICB9CkBAIC01NTUsNyArNTU1LDcgQEAgcHVibGljOgogCiAgICAgc3RhdGljIERPTUpJVE5v ZGUqIGNyZWF0ZShWTSYgdm0sIFN0cnVjdHVyZSogc3RydWN0dXJlKQogICAgIHsKLSAgICAgICAg RE9NSklUTm9kZSogZ2V0dGVyID0gbmV3IChOb3ROdWxsLCBhbGxvY2F0ZUNlbGw8RE9NSklUTm9k ZT4odm0uaGVhcCwgc2l6ZW9mKERPTUpJVE5vZGUpKSkgRE9NSklUTm9kZSh2bSwgc3RydWN0dXJl KTsKKyAgICAgICAgRE9NSklUTm9kZSogZ2V0dGVyID0gbmV3IChOb3ROdWxsLCBhbGxvY2F0ZUNl bGw8RE9NSklUTm9kZT4odm0uaGVhcCkpIERPTUpJVE5vZGUodm0sIHN0cnVjdHVyZSk7CiAgICAg ICAgIGdldHRlci0+ZmluaXNoQ3JlYXRpb24odm0pOwogICAgICAgICByZXR1cm4gZ2V0dGVyOwog ICAgIH0KQEAgLTU4OSw3ICs1ODksNyBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgRE9NSklUR2V0 dGVyKiBjcmVhdGUoVk0mIHZtLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkKICAgICB7Ci0gICAgICAg IERPTUpJVEdldHRlciogZ2V0dGVyID0gbmV3IChOb3ROdWxsLCBhbGxvY2F0ZUNlbGw8RE9NSklU R2V0dGVyPih2bS5oZWFwLCBzaXplb2YoRE9NSklUR2V0dGVyKSkpIERPTUpJVEdldHRlcih2bSwg c3RydWN0dXJlKTsKKyAgICAgICAgRE9NSklUR2V0dGVyKiBnZXR0ZXIgPSBuZXcgKE5vdE51bGws IGFsbG9jYXRlQ2VsbDxET01KSVRHZXR0ZXI+KHZtLmhlYXApKSBET01KSVRHZXR0ZXIodm0sIHN0 cnVjdHVyZSk7CiAgICAgICAgIGdldHRlci0+ZmluaXNoQ3JlYXRpb24odm0pOwogICAgICAgICBy ZXR1cm4gZ2V0dGVyOwogICAgIH0KQEAgLTY3Miw3ICs2NzIsNyBAQCBwdWJsaWM6CiAKICAgICBz dGF0aWMgRE9NSklUR2V0dGVyQ29tcGxleCogY3JlYXRlKFZNJiB2bSwgSlNHbG9iYWxPYmplY3Qq IGdsb2JhbE9iamVjdCwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUpCiAgICAgewotICAgICAgICBET01K SVRHZXR0ZXJDb21wbGV4KiBnZXR0ZXIgPSBuZXcgKE5vdE51bGwsIGFsbG9jYXRlQ2VsbDxET01K SVRHZXR0ZXJDb21wbGV4Pih2bS5oZWFwLCBzaXplb2YoRE9NSklUR2V0dGVyQ29tcGxleCkpKSBE T01KSVRHZXR0ZXJDb21wbGV4KHZtLCBzdHJ1Y3R1cmUpOworICAgICAgICBET01KSVRHZXR0ZXJD b21wbGV4KiBnZXR0ZXIgPSBuZXcgKE5vdE51bGwsIGFsbG9jYXRlQ2VsbDxET01KSVRHZXR0ZXJD b21wbGV4Pih2bS5oZWFwKSkgRE9NSklUR2V0dGVyQ29tcGxleCh2bSwgc3RydWN0dXJlKTsKICAg ICAgICAgZ2V0dGVyLT5maW5pc2hDcmVhdGlvbih2bSwgZ2xvYmFsT2JqZWN0KTsKICAgICAgICAg cmV0dXJuIGdldHRlcjsKICAgICB9CkBAIC03ODQsNyArNzg0LDcgQEAgcHVibGljOgogCiAgICAg c3RhdGljIERPTUpJVEZ1bmN0aW9uT2JqZWN0KiBjcmVhdGUoVk0mIHZtLCBKU0dsb2JhbE9iamVj dCogZ2xvYmFsT2JqZWN0LCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkKICAgICB7Ci0gICAgICAgIERP TUpJVEZ1bmN0aW9uT2JqZWN0KiBvYmplY3QgPSBuZXcgKE5vdE51bGwsIGFsbG9jYXRlQ2VsbDxE T01KSVRGdW5jdGlvbk9iamVjdD4odm0uaGVhcCwgc2l6ZW9mKERPTUpJVEZ1bmN0aW9uT2JqZWN0 KSkpIERPTUpJVEZ1bmN0aW9uT2JqZWN0KHZtLCBzdHJ1Y3R1cmUpOworICAgICAgICBET01KSVRG dW5jdGlvbk9iamVjdCogb2JqZWN0ID0gbmV3IChOb3ROdWxsLCBhbGxvY2F0ZUNlbGw8RE9NSklU RnVuY3Rpb25PYmplY3Q+KHZtLmhlYXApKSBET01KSVRGdW5jdGlvbk9iamVjdCh2bSwgc3RydWN0 dXJlKTsKICAgICAgICAgb2JqZWN0LT5maW5pc2hDcmVhdGlvbih2bSwgZ2xvYmFsT2JqZWN0KTsK ICAgICAgICAgcmV0dXJuIG9iamVjdDsKICAgICB9CkBAIC04NTUsNyArODU1LDcgQEAgcHVibGlj OgogCiAgICAgc3RhdGljIERPTUpJVENoZWNrU3ViQ2xhc3NPYmplY3QqIGNyZWF0ZShWTSYgdm0s IEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFN0cnVjdHVyZSogc3RydWN0dXJlKQogICAg IHsKLSAgICAgICAgRE9NSklUQ2hlY2tTdWJDbGFzc09iamVjdCogb2JqZWN0ID0gbmV3IChOb3RO dWxsLCBhbGxvY2F0ZUNlbGw8RE9NSklUQ2hlY2tTdWJDbGFzc09iamVjdD4odm0uaGVhcCwgc2l6 ZW9mKERPTUpJVENoZWNrU3ViQ2xhc3NPYmplY3QpKSkgRE9NSklUQ2hlY2tTdWJDbGFzc09iamVj dCh2bSwgc3RydWN0dXJlKTsKKyAgICAgICAgRE9NSklUQ2hlY2tTdWJDbGFzc09iamVjdCogb2Jq ZWN0ID0gbmV3IChOb3ROdWxsLCBhbGxvY2F0ZUNlbGw8RE9NSklUQ2hlY2tTdWJDbGFzc09iamVj dD4odm0uaGVhcCkpIERPTUpJVENoZWNrU3ViQ2xhc3NPYmplY3Qodm0sIHN0cnVjdHVyZSk7CiAg ICAgICAgIG9iamVjdC0+ZmluaXNoQ3JlYXRpb24odm0sIGdsb2JhbE9iamVjdCk7CiAgICAgICAg IHJldHVybiBvYmplY3Q7CiAgICAgfQpAQCAtOTA4LDcgKzkwOCw3IEBAIHB1YmxpYzoKIAogICAg IHN0YXRpYyBET01KSVRHZXR0ZXJCYXNlSlNPYmplY3QqIGNyZWF0ZShWTSYgdm0sIFN0cnVjdHVy ZSogc3RydWN0dXJlKQogICAgIHsKLSAgICAgICAgRE9NSklUR2V0dGVyQmFzZUpTT2JqZWN0KiBn ZXR0ZXIgPSBuZXcgKE5vdE51bGwsIGFsbG9jYXRlQ2VsbDxET01KSVRHZXR0ZXJCYXNlSlNPYmpl Y3Q+KHZtLmhlYXAsIHNpemVvZihET01KSVRHZXR0ZXJCYXNlSlNPYmplY3QpKSkgRE9NSklUR2V0 dGVyQmFzZUpTT2JqZWN0KHZtLCBzdHJ1Y3R1cmUpOworICAgICAgICBET01KSVRHZXR0ZXJCYXNl SlNPYmplY3QqIGdldHRlciA9IG5ldyAoTm90TnVsbCwgYWxsb2NhdGVDZWxsPERPTUpJVEdldHRl ckJhc2VKU09iamVjdD4odm0uaGVhcCkpIERPTUpJVEdldHRlckJhc2VKU09iamVjdCh2bSwgc3Ry dWN0dXJlKTsKICAgICAgICAgZ2V0dGVyLT5maW5pc2hDcmVhdGlvbih2bSk7CiAgICAgICAgIHJl dHVybiBnZXR0ZXI7CiAgICAgfQpAQCAtOTk4LDcgKzk5OCw3IEBAIHB1YmxpYzoKIAogICAgIHN0 YXRpYyBKU1Rlc3RDdXN0b21HZXR0ZXJTZXR0ZXIqIGNyZWF0ZShWTSYgdm0sIEpTR2xvYmFsT2Jq ZWN0KiwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUpCiAgICAgewotICAgICAgICBKU1Rlc3RDdXN0b21H ZXR0ZXJTZXR0ZXIqIHJlc3VsdCA9IG5ldyAoTm90TnVsbCwgYWxsb2NhdGVDZWxsPEpTVGVzdEN1 c3RvbUdldHRlclNldHRlcj4odm0uaGVhcCwgc2l6ZW9mKEpTVGVzdEN1c3RvbUdldHRlclNldHRl cikpKSBKU1Rlc3RDdXN0b21HZXR0ZXJTZXR0ZXIodm0sIHN0cnVjdHVyZSk7CisgICAgICAgIEpT VGVzdEN1c3RvbUdldHRlclNldHRlciogcmVzdWx0ID0gbmV3IChOb3ROdWxsLCBhbGxvY2F0ZUNl bGw8SlNUZXN0Q3VzdG9tR2V0dGVyU2V0dGVyPih2bS5oZWFwKSkgSlNUZXN0Q3VzdG9tR2V0dGVy U2V0dGVyKHZtLCBzdHJ1Y3R1cmUpOwogICAgICAgICByZXN1bHQtPmZpbmlzaENyZWF0aW9uKHZt KTsKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CkBAIC0xMTIxLDcgKzExMjEsNyBAQCBw dWJsaWM6CiAgICAgc3RhdGljIFdhc21TdHJlYW1pbmdQYXJzZXIqIGNyZWF0ZShWTSYgdm0sIEpT R2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QpCiAgICAgewogICAgICAgICBTdHJ1Y3R1cmUqIHN0 cnVjdHVyZSA9IGNyZWF0ZVN0cnVjdHVyZSh2bSwgZ2xvYmFsT2JqZWN0LCBqc051bGwoKSk7Ci0g ICAgICAgIFdhc21TdHJlYW1pbmdQYXJzZXIqIHJlc3VsdCA9IG5ldyAoTm90TnVsbCwgYWxsb2Nh dGVDZWxsPFdhc21TdHJlYW1pbmdQYXJzZXI+KHZtLmhlYXAsIHNpemVvZihXYXNtU3RyZWFtaW5n UGFyc2VyKSkpIFdhc21TdHJlYW1pbmdQYXJzZXIodm0sIHN0cnVjdHVyZSk7CisgICAgICAgIFdh c21TdHJlYW1pbmdQYXJzZXIqIHJlc3VsdCA9IG5ldyAoTm90TnVsbCwgYWxsb2NhdGVDZWxsPFdh c21TdHJlYW1pbmdQYXJzZXI+KHZtLmhlYXApKSBXYXNtU3RyZWFtaW5nUGFyc2VyKHZtLCBzdHJ1 Y3R1cmUpOwogICAgICAgICByZXN1bHQtPmZpbmlzaENyZWF0aW9uKHZtKTsKICAgICAgICAgcmV0 dXJuIHJlc3VsdDsKICAgICB9Cg==