156302 2016-04-06 11:50:07 -0700 bmalloc: handle aligned allocations on the fast path 2016-04-06 13:52:11 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren barraclough benjamin kling msaboff oldest_to_newest 1181331 0 ggaren 2016-04-06 11:50:07 -0700 bmalloc: handle aligned allocations on the fast path 1181340 1 275800 ggaren 2016-04-06 11:56:29 -0700 Created attachment 275800 Patch 1181359 2 275800 msaboff 2016-04-06 12:14:40 -0700 Comment on attachment 275800 Patch r=me 1181397 3 ggaren 2016-04-06 13:52:11 -0700 Committed r199115: <http://trac.webkit.org/changeset/199115> 275800 2016-04-06 11:56:29 -0700 2016-04-06 12:14:40 -0700 Patch bug-156302-20160406115634.patch text/plain 9757 ggaren SW5kZXg6IFNvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1h bGxvYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5OTEwOCkKKysrIFNvdXJjZS9ibWFsbG9jL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBACisyMDE2LTA0LTA2ICBHZW9mZnJl eSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgYm1hbGxvYzogaGFuZGxlIGFs aWduZWQgYWxsb2NhdGlvbnMgb24gdGhlIGZhc3QgcGF0aAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2MzAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBoZWxwcyBrZWVwIHRoZSBKYXZhU2NyaXB0 Q29yZSBHQyBvbiB0aGUgZmFzdCBwYXRoLCBhbmQgaXQgYWxzbworICAgICAgICBoZWxwcyBhdm9p ZCBmcmFnbWVudGF0aW9uIG9uIG91ciB3ZWJzaXRlIHN0cmVzcyB0ZXN0OgorCisgICAgICAgICAg ICBuaW1sYW5nICAgICAgICAgICAgICAgICAgICAgIDIwOSw1ODRrQiAgICAgICAgICAgIDE5OCww NzZrQiAgICAgIF4gMS4wNnggc21hbGxlcgorCisgICAgICAgICogYm1hbGxvYy9BbGxvY2F0b3Iu Y3BwOgorICAgICAgICAoYm1hbGxvYzo6QWxsb2NhdG9yOjphbGxvY2F0ZSk6IEJlY2F1c2Ugd2Ug YXJyYW5nZSBmb3IgcG93ZXItb2YtdHdvIHNpemUKKyAgICAgICAgY2xhc3NlcyB0byBhbGxvY2F0 ZSBhdCBwb3dlci1vZi10d28gYWxpZ25tZW50cywgd2UgY2FuIGFsbG9jYXRlIGFueQorICAgICAg ICBzbWFsbCBhbGlnbmVkIHJlcXVlc3Qgb24gdGhlIHNtYWxsIHBhdGguCisKKyAgICAgICAgKiBi bWFsbG9jL0NodW5rLmg6CisgICAgICAgIChibWFsbG9jOjpDaHVuazo6Ynl0ZXMpOgorICAgICAg ICAoYm1hbGxvYzo6Q2h1bms6OmxpbmVzKToKKyAgICAgICAgKGJtYWxsb2M6OkNodW5rOjpwYWdl cyk6CisgICAgICAgIChibWFsbG9jOjpDaHVuazo6Ym91bmRhcnlUYWdzKToKKyAgICAgICAgKGJt YWxsb2M6OkNodW5rOjpvYmplY3RUeXBlKTogTW92ZWQgc29tZSBjb2RlIGFyb3VuZCB0byBwcm92 aWRlIGJldHRlcgorICAgICAgICBBUEkuCisKKyAgICAgICAgKGJtYWxsb2M6OkNodW5rOjpDaHVu ayk6IE1vdmVkIHRoaXMgY29kZSB0byBWTUhlYXAuCisKKyAgICAgICAgKGJtYWxsb2M6OkNodW5r OjpvZmZzZXQpOgorICAgICAgICAoYm1hbGxvYzo6Q2h1bms6Om9iamVjdCk6IFVzZSBvdXIgbmV3 IGJ5dGVzKCkgaGVscGVyIGZ1bmN0aW9uLgorCisgICAgICAgICogYm1hbGxvYy9WTUhlYXAuY3Bw OgorICAgICAgICAoYm1hbGxvYzo6Vk1IZWFwOjphbGxvY2F0ZUNodW5rKTogTW92ZWQgY29kZSBo ZXJlIGZyb20gQ2h1bmsuCisKKyAgICAgICAgKGJtYWxsb2M6OlZNSGVhcDo6YWxsb2NhdGVTbWFs bENodW5rKTogRW5zdXJlIHRoYXQgcG93ZXItb2YtdHdvIHBhZ2UKKyAgICAgICAgc2l6ZXMgYWx3 YXlzIGJlZ2luIGFsbG9jYXRpb24gYXQgdGhlIHNhbWUgYWxpZ25tZW50LiBQb3dlci1vZi10d28g b2JqZWN0CisgICAgICAgIHNpemVzIGFsd2F5cyByZXF1ZXN0IHBvd2VyLW9mLXR3byBwYWdlIHNp emVzIChzaW5jZSB0aGF0J3MgdGhlIGxlYXN0CisgICAgICAgIHdhc3RlZnVsIG9wdGlvbiksIHNv IGlmIHdlIGFsc28gZW5zdXJlIHRoYXQgcG93ZXItb2YtdHdvIHBhZ2Ugc2l6ZXMgZ2V0CisgICAg ICAgIHBvd2VyLW9mLXR3byBhbGlnbm1lbnQsIHRoZW4gZXZlcnl0aGluZyBpcyBhbGlnbmVkIGZv ciBhbGwgc21hbGwgb2JqZWN0cy4KKwogMjAxNi0wNC0wMyAgR2VvZmZyZXkgR2FyZW4gIDxnZ2Fy ZW5AYXBwbGUuY29tPgogCiAgICAgICAgIGJtYWxsb2M6IHNlZ3JlZ2F0ZSBzbWFsbCBhbmQgbGFy Z2Ugb2JqZWN0cyBhZ2FpbiwgYW5kIGFsbG9jYXRlIG1vcmUgb2JqZWN0cyBvbiB0aGUgc21hbGwg cGF0aApJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9BbGxvY2F0b3IuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQWxsb2NhdG9yLmNwcAkocmV2aXNpb24gMTk5 MDA3KQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9BbGxvY2F0b3IuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC03NywxNSArNzcsMTIgQEAgdm9pZCogQWxsb2NhdG9yOjphbGxvY2F0ZShzaXplX3Qg YWxpZ25tZQogICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgIHJldHVybiByZXN1 bHQ7CiAgICAgfQotICAgIAotICAgIGlmIChzaXplIDw9IHNtYWxsTWF4ICYmIGFsaWdubWVudCA8 PSBzbWFsbExpbmVTaXplKSB7Ci0gICAgICAgIHNpemVfdCBhbGlnbm1lbnRNYXNrID0gYWxpZ25t ZW50IC0gMTsKLSAgICAgICAgd2hpbGUgKHZvaWQqIHAgPSBhbGxvY2F0ZShzaXplKSkgewotICAg ICAgICAgICAgaWYgKCF0ZXN0KHAsIGFsaWdubWVudE1hc2spKQotICAgICAgICAgICAgICAgIHJl dHVybiBwOwotICAgICAgICAgICAgbV9kZWFsbG9jYXRvci5kZWFsbG9jYXRlKHApOwotICAgICAg ICB9Ci0gICAgfQorCisgICAgaWYgKCFzaXplKQorICAgICAgICBzaXplID0gYWxpZ25tZW50Owor CisgICAgaWYgKHNpemUgPD0gc21hbGxNYXggJiYgYWxpZ25tZW50IDw9IHNtYWxsTWF4KQorICAg ICAgICByZXR1cm4gYWxsb2NhdGUocm91bmRVcFRvTXVsdGlwbGVPZihhbGlnbm1lbnQsIHNpemUp KTsKIAogICAgIGlmIChzaXplIDw9IGxhcmdlTWF4ICYmIGFsaWdubWVudCA8PSBsYXJnZU1heCkg ewogICAgICAgICBzaXplID0gc3RkOjptYXgobGFyZ2VNaW4sIHJvdW5kVXBUb011bHRpcGxlT2Y8 bGFyZ2VBbGlnbm1lbnQ+KHNpemUpKTsKSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQ2h1 bmsuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0NodW5rLmgJKHJldmlz aW9uIDE5OTAwNykKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQ2h1bmsuaAkod29ya2luZyBj b3B5KQpAQCAtMzksNiArMzksMjMgQEAKIG5hbWVzcGFjZSBibWFsbG9jIHsKIAogY2xhc3MgQ2h1 bmsgeworICAgIC8vIE91ciBtZXRhZGF0YSBsYXlvdXQgaW5jbHVkZXMgYSBsZWZ0IGFuZCByaWdo dCBlZGdlIHNlbnRpbmVsLgorICAgIC8vIE1ldGFkYXRhIHRha2VzIHVwIGVub3VnaCBzcGFjZSB0 byBsZWF2ZSBhdCBsZWFzdCB0aGUgZmlyc3QgdHdvCisgICAgLy8gYm91bmRhcnkgdGFnIHNsb3Rz IHVudXNlZC4KKyAgICAvLworICAgIC8vICAgICAgU28sIGJvdW5kYXJ5IHRhZyBzcGFjZSBsb29r cyBsaWtlIHRoaXM6CisgICAgLy8KKyAgICAvLyAgICAgICAgICBbT09YWFhYWC4uLl0KKyAgICAv LworICAgIC8vICAgICAgQW5kIEJvdW5kYXJ5VGFnOjpnZXQgc3VidHJhY3RzIG9uZSwgcHJvZHVj aW5nOgorICAgIC8vCisgICAgLy8gICAgICAgICAgW09YWFhYWC4uLk9dLgorICAgIC8vCisgICAg Ly8gV2UgdXNlIHRoZSBYJ3MgZm9yIGJvdW5kYXJ5IHRhZ3MgYW5kIHRoZSBPJ3MgZm9yIGVkZ2Ug c2VudGluZWxzLgorCisgICAgc3RhdGljIGNvbnN0IHNpemVfdCBib3VuZGFyeVRhZ0NvdW50ID0g Y2h1bmtTaXplIC8gbGFyZ2VNaW47CisgICAgc3RhdGljX2Fzc2VydChib3VuZGFyeVRhZ0NvdW50 ID4gMiwgIkNodW5rIG11c3QgaGF2ZSBzcGFjZSBmb3IgdHdvIHNlbnRpbmVsIGJvdW5kYXJ5IHRh Z3MiKTsKKwogcHVibGljOgogICAgIHN0YXRpYyBDaHVuayogZ2V0KHZvaWQqKTsKIApAQCAtNTMs MzMgKzcwLDE0IEBAIHB1YmxpYzoKICAgICBTbWFsbFBhZ2UqIHBhZ2Uoc2l6ZV90IG9mZnNldCk7 CiAgICAgU21hbGxMaW5lKiBsaW5lKHNpemVfdCBvZmZzZXQpOwogCisgICAgY2hhciogYnl0ZXMo KSB7IHJldHVybiByZWludGVycHJldF9jYXN0PGNoYXIqPih0aGlzKTsgfQogICAgIFNtYWxsTGlu ZSogbGluZXMoKSB7IHJldHVybiBtX2xpbmVzLmJlZ2luKCk7IH0KICAgICBTbWFsbFBhZ2UqIHBh Z2VzKCkgeyByZXR1cm4gbV9wYWdlcy5iZWdpbigpOyB9Ci0KLSAgICBjaGFyKiBiZWdpbigpIHsg cmV0dXJuIHJvdW5kVXBUb011bHRpcGxlT2Yodm1QYWdlU2l6ZVBoeXNpY2FsKCksIG1fbWVtb3J5 KTsgfQotICAgIGNoYXIqIGVuZCgpIHsgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KHRo aXMpICsgY2h1bmtTaXplOyB9Ci0gICAgc2l6ZV90IHNpemUoKSB7IHJldHVybiBlbmQoKSAtIGJl Z2luKCk7IH0KKyAgICBzdGQ6OmFycmF5PEJvdW5kYXJ5VGFnLCBib3VuZGFyeVRhZ0NvdW50PiYg Ym91bmRhcnlUYWdzKCkgeyByZXR1cm4gbV9ib3VuZGFyeVRhZ3M7IH0KIAogICAgIE9iamVjdFR5 cGUgb2JqZWN0VHlwZSgpIHsgcmV0dXJuIG1fb2JqZWN0VHlwZTsgfQogCiBwcml2YXRlOgotICAg IHN0YXRpYyBjb25zdCBzaXplX3QgYm91bmRhcnlUYWdDb3VudCA9IGNodW5rU2l6ZSAvIGxhcmdl TWluOwotICAgIHN0YXRpY19hc3NlcnQoYm91bmRhcnlUYWdDb3VudCA+IDIsICJDaHVuayBtdXN0 IGhhdmUgc3BhY2UgZm9yIHR3byBzZW50aW5lbCBib3VuZGFyeSB0YWdzIik7Ci0KLSAgICAvLyBP dXIgbWV0YWRhdGEgbGF5b3V0IGluY2x1ZGVzIGEgbGVmdCBhbmQgcmlnaHQgZWRnZSBzZW50aW5l bC4KLSAgICAvLyBNZXRhZGF0YSB0YWtlcyB1cCBlbm91Z2ggc3BhY2UgdG8gbGVhdmUgYXQgbGVh c3QgdGhlIGZpcnN0IHR3bwotICAgIC8vIGJvdW5kYXJ5IHRhZyBzbG90cyB1bnVzZWQuCi0gICAg Ly8KLSAgICAvLyAgICAgIFNvLCBib3VuZGFyeSB0YWcgc3BhY2UgbG9va3MgbGlrZSB0aGlzOgot ICAgIC8vCi0gICAgLy8gICAgICAgICAgW09PWFhYWFguLi5dCi0gICAgLy8KLSAgICAvLyAgICAg IEFuZCBCb3VuZGFyeVRhZzo6Z2V0IHN1YnRyYWN0cyBvbmUsIHByb2R1Y2luZzoKLSAgICAvLwot ICAgIC8vICAgICAgICAgIFtPWFhYWFguLi5PXS4KLSAgICAvLwotICAgIC8vIFdlIHVzZSB0aGUg WCdzIGZvciBib3VuZGFyeSB0YWdzIGFuZCB0aGUgTydzIGZvciBlZGdlIHNlbnRpbmVscy4KLQog ICAgIHVuaW9uIHsKICAgICAgICAgLy8gVGhlIGZpcnN0IGZldyBieXRlcyBvZiBtZXRhZGF0YSBj b3ZlciB0aGUgbWV0YWRhdGEgcmVnaW9uLCBzbyB0aGV5J3JlCiAgICAgICAgIC8vIG5vdCB1c2Vk LiBXZSBjYW4gc3RlYWwgdGhlbSB0byBzdG9yZSBtX29iamVjdFR5cGUuCkBAIC05Myw3ICs5MSw2 IEBAIHByaXZhdGU6CiAgICAgICAgIHN0ZDo6YXJyYXk8U21hbGxQYWdlLCBjaHVua1NpemUgLyBz bWFsbFBhZ2VTaXplPiBtX3BhZ2VzOwogICAgICAgICBzdGQ6OmFycmF5PEJvdW5kYXJ5VGFnLCBi b3VuZGFyeVRhZ0NvdW50PiBtX2JvdW5kYXJ5VGFnczsKICAgICB9OwotICAgIGNoYXIgbV9tZW1v cnlbXTsKIH07CiAKIHN0YXRpY19hc3NlcnQoc2l6ZW9mKENodW5rKSArIGxhcmdlTWF4IDw9IGNo dW5rU2l6ZSwgImxhcmdlTWF4IGlzIHRvbyBiaWciKTsKQEAgLTEwNCwzMyArMTAxLDYgQEAgc3Rh dGljX2Fzc2VydChzaXplb2YoQ2h1bmspIC8gc21hbGxMaW5lUwogaW5saW5lIENodW5rOjpDaHVu ayhzdGQ6OmxvY2tfZ3VhcmQ8U3RhdGljTXV0ZXg+JiwgT2JqZWN0VHlwZSBvYmplY3RUeXBlKQog ICAgIDogbV9vYmplY3RUeXBlKG9iamVjdFR5cGUpCiB7Ci0gICAgaWYgKG9iamVjdFR5cGUgIT0g T2JqZWN0VHlwZTo6TGFyZ2UpCi0gICAgICAgIHJldHVybjsKLQotICAgIFJhbmdlIHJhbmdlKGJl Z2luKCksIHNpemUoKSk7Ci0gICAgQkFTU0VSVChyYW5nZS5zaXplKCkgPD0gbGFyZ2VPYmplY3RN YXgpOwotCi0gICAgQmVnaW5UYWcqIGJlZ2luVGFnID0gQ2h1bms6OmJlZ2luVGFnKHJhbmdlLmJl Z2luKCkpOwotICAgIGJlZ2luVGFnLT5zZXRSYW5nZShyYW5nZSk7Ci0gICAgYmVnaW5UYWctPnNl dEZyZWUodHJ1ZSk7Ci0gICAgYmVnaW5UYWctPnNldFZNU3RhdGUoVk1TdGF0ZTo6VmlydHVhbCk7 Ci0KLSAgICBFbmRUYWcqIGVuZFRhZyA9IENodW5rOjplbmRUYWcocmFuZ2UuYmVnaW4oKSwgcmFu Z2Uuc2l6ZSgpKTsKLSAgICBlbmRUYWctPmluaXQoYmVnaW5UYWcpOwotCi0gICAgLy8gTWFyayB0 aGUgbGVmdCBhbmQgcmlnaHQgZWRnZXMgb2Ygb3VyIHJhbmdlIGFzIGFsbG9jYXRlZC4gVGhpcyBu YXR1cmFsbHkKLSAgICAvLyBwcmV2ZW50cyBtZXJnaW5nIGxvZ2ljIGZyb20gb3ZlcmZsb3dpbmcg bGVmdCAoaW50byBtZXRhZGF0YSkgb3IgcmlnaHQKLSAgICAvLyAoYmV5b25kIG91ciBjaHVuayks IHdpdGhvdXQgcmVxdWlyaW5nIHNwZWNpYWwtY2FzZSBjaGVja3MuCi0KLSAgICBFbmRUYWcqIGxl ZnRTZW50aW5lbCA9IGJlZ2luVGFnLT5wcmV2KCk7Ci0gICAgQkFTU0VSVChsZWZ0U2VudGluZWwg Pj0gbV9ib3VuZGFyeVRhZ3MuYmVnaW4oKSk7Ci0gICAgQkFTU0VSVChsZWZ0U2VudGluZWwgPCBt X2JvdW5kYXJ5VGFncy5lbmQoKSk7Ci0gICAgbGVmdFNlbnRpbmVsLT5pbml0U2VudGluZWwoKTsK LQotICAgIEJlZ2luVGFnKiByaWdodFNlbnRpbmVsID0gZW5kVGFnLT5uZXh0KCk7Ci0gICAgQkFT U0VSVChyaWdodFNlbnRpbmVsID49IG1fYm91bmRhcnlUYWdzLmJlZ2luKCkpOwotICAgIEJBU1NF UlQocmlnaHRTZW50aW5lbCA8IG1fYm91bmRhcnlUYWdzLmVuZCgpKTsKLSAgICByaWdodFNlbnRp bmVsLT5pbml0U2VudGluZWwoKTsKIH0KIAogaW5saW5lIENodW5rKiBDaHVuazo6Z2V0KHZvaWQq IG9iamVjdCkKQEAgLTE2MSwxMyArMTMxLDEzIEBAIGlubGluZSBFbmRUYWcqIENodW5rOjplbmRU YWcodm9pZCogb2JqZWMKIGlubGluZSBzaXplX3QgQ2h1bms6Om9mZnNldCh2b2lkKiBvYmplY3Qp CiB7CiAgICAgQkFTU0VSVChvYmplY3QgPj0gdGhpcyk7Ci0gICAgQkFTU0VSVChvYmplY3QgPCBy ZWludGVycHJldF9jYXN0PGNoYXIqPih0aGlzKSArIGNodW5rU2l6ZSk7Ci0gICAgcmV0dXJuIHN0 YXRpY19jYXN0PGNoYXIqPihvYmplY3QpIC0gcmVpbnRlcnByZXRfY2FzdDxjaGFyKj4odGhpcyk7 CisgICAgQkFTU0VSVChvYmplY3QgPCBieXRlcygpICsgY2h1bmtTaXplKTsKKyAgICByZXR1cm4g c3RhdGljX2Nhc3Q8Y2hhcio+KG9iamVjdCkgLSBieXRlcygpOwogfQogCiBpbmxpbmUgY2hhciog Q2h1bms6Om9iamVjdChzaXplX3Qgb2Zmc2V0KQogewotICAgIHJldHVybiByZWludGVycHJldF9j YXN0PGNoYXIqPih0aGlzKSArIG9mZnNldDsKKyAgICByZXR1cm4gYnl0ZXMoKSArIG9mZnNldDsK IH0KIAogaW5saW5lIFNtYWxsUGFnZSogQ2h1bms6OnBhZ2Uoc2l6ZV90IG9mZnNldCkKSW5kZXg6 IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvVk1IZWFwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv Ym1hbGxvYy9ibWFsbG9jL1ZNSGVhcC5jcHAJKHJldmlzaW9uIDE5OTAwNykKKysrIFNvdXJjZS9i bWFsbG9jL2JtYWxsb2MvVk1IZWFwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsNyArNDQsMzUg QEAgTGFyZ2VPYmplY3QgVk1IZWFwOjphbGxvY2F0ZUNodW5rKHN0ZDo6bAogICAgIG1fem9uZS5h ZGRDaHVuayhjaHVuayk7CiAjZW5kaWYKIAotICAgIHJldHVybiBMYXJnZU9iamVjdChjaHVuay0+ YmVnaW4oKSk7CisgICAgc2l6ZV90IGFsaWdubWVudCA9IGxhcmdlQWxpZ25tZW50OworICAgIHNp emVfdCBtZXRhZGF0YVNpemUgPSByb3VuZFVwVG9NdWx0aXBsZU9mKGFsaWdubWVudCwgc2l6ZW9m KENodW5rKSk7CisKKyAgICBSYW5nZSByYW5nZShjaHVuay0+Ynl0ZXMoKSArIG1ldGFkYXRhU2l6 ZSwgY2h1bmtTaXplIC0gbWV0YWRhdGFTaXplKTsKKyAgICBCQVNTRVJUKHJhbmdlLnNpemUoKSA8 PSBsYXJnZU9iamVjdE1heCk7CisKKyAgICBCZWdpblRhZyogYmVnaW5UYWcgPSBDaHVuazo6YmVn aW5UYWcocmFuZ2UuYmVnaW4oKSk7CisgICAgYmVnaW5UYWctPnNldFJhbmdlKHJhbmdlKTsKKyAg ICBiZWdpblRhZy0+c2V0RnJlZSh0cnVlKTsKKyAgICBiZWdpblRhZy0+c2V0Vk1TdGF0ZShWTVN0 YXRlOjpWaXJ0dWFsKTsKKworICAgIEVuZFRhZyogZW5kVGFnID0gQ2h1bms6OmVuZFRhZyhyYW5n ZS5iZWdpbigpLCByYW5nZS5zaXplKCkpOworICAgIGVuZFRhZy0+aW5pdChiZWdpblRhZyk7CisK KyAgICAvLyBNYXJrIHRoZSBsZWZ0IGFuZCByaWdodCBlZGdlcyBvZiBvdXIgcmFuZ2UgYXMgYWxs b2NhdGVkLiBUaGlzIG5hdHVyYWxseQorICAgIC8vIHByZXZlbnRzIG1lcmdpbmcgbG9naWMgZnJv bSBvdmVyZmxvd2luZyBsZWZ0IChpbnRvIG1ldGFkYXRhKSBvciByaWdodAorICAgIC8vIChiZXlv bmQgb3VyIGNodW5rKSwgd2l0aG91dCByZXF1aXJpbmcgc3BlY2lhbC1jYXNlIGNoZWNrcy4KKwor ICAgIEVuZFRhZyogbGVmdFNlbnRpbmVsID0gYmVnaW5UYWctPnByZXYoKTsKKyAgICBCQVNTRVJU KGxlZnRTZW50aW5lbCA+PSBjaHVuay0+Ym91bmRhcnlUYWdzKCkuYmVnaW4oKSk7CisgICAgQkFT U0VSVChsZWZ0U2VudGluZWwgPCBjaHVuay0+Ym91bmRhcnlUYWdzKCkuZW5kKCkpOworICAgIGxl ZnRTZW50aW5lbC0+aW5pdFNlbnRpbmVsKCk7CisKKyAgICBCZWdpblRhZyogcmlnaHRTZW50aW5l bCA9IGVuZFRhZy0+bmV4dCgpOworICAgIEJBU1NFUlQocmlnaHRTZW50aW5lbCA+PSBjaHVuay0+ Ym91bmRhcnlUYWdzKCkuYmVnaW4oKSk7CisgICAgQkFTU0VSVChyaWdodFNlbnRpbmVsIDwgY2h1 bmstPmJvdW5kYXJ5VGFncygpLmVuZCgpKTsKKyAgICByaWdodFNlbnRpbmVsLT5pbml0U2VudGlu ZWwoKTsKKworICAgIHJldHVybiBMYXJnZU9iamVjdChyYW5nZS5iZWdpbigpKTsKIH0KIAogdm9p ZCBWTUhlYXA6OmFsbG9jYXRlU21hbGxDaHVuayhzdGQ6OmxvY2tfZ3VhcmQ8U3RhdGljTXV0ZXg+ JiBsb2NrLCBzaXplX3QgcGFnZUNsYXNzKQpAQCAtNTksOCArODcsMTUgQEAgdm9pZCBWTUhlYXA6 OmFsbG9jYXRlU21hbGxDaHVuayhzdGQ6OmxvYwogICAgIHNpemVfdCBwYWdlU2l6ZSA9IGJtYWxs b2M6OnBhZ2VTaXplKHBhZ2VDbGFzcyk7CiAgICAgc2l6ZV90IHNtYWxsUGFnZUNvdW50ID0gcGFn ZVNpemUgLyBzbWFsbFBhZ2VTaXplOwogCi0gICAgT2JqZWN0IGJlZ2luKGNodW5rLT5iZWdpbigp KTsKLSAgICBPYmplY3QgZW5kKGJlZ2luICsgY2h1bmstPnNpemUoKSk7CisgICAgLy8gSWYgb3Vy IHBhZ2Ugc2l6ZSBpcyBhIHBvd2VyIG9mIHR3bywgd2UgYWxpZ24gdG8gaXQgaW4gb3JkZXIgdG8g Z3VhcmFudGVlCisgICAgLy8gdGhhdCB3ZSBjYW4gc2VydmljZSBhbGlnbmVkIGFsbG9jYXRpb24g cmVxdWVzdHMgYXQgdGhlIHNhbWUgcG93ZXIgb2YgdHdvLgorICAgIHNpemVfdCBhbGlnbm1lbnQg PSB2bVBhZ2VTaXplUGh5c2ljYWwoKTsKKyAgICBpZiAoaXNQb3dlck9mVHdvKHBhZ2VTaXplKSkK KyAgICAgICAgYWxpZ25tZW50ID0gcGFnZVNpemU7CisgICAgc2l6ZV90IG1ldGFkYXRhU2l6ZSA9 IHJvdW5kVXBUb011bHRpcGxlT2YoYWxpZ25tZW50LCBzaXplb2YoQ2h1bmspKTsKKworICAgIE9i amVjdCBiZWdpbihjaHVuaywgbWV0YWRhdGFTaXplKTsKKyAgICBPYmplY3QgZW5kKGNodW5rLCBj aHVua1NpemUpOwogCiAgICAgZm9yIChPYmplY3QgaXQgPSBiZWdpbjsgaXQgKyBwYWdlU2l6ZSA8 PSBlbmQ7IGl0ID0gaXQgKyBwYWdlU2l6ZSkgewogICAgICAgICBTbWFsbFBhZ2UqIHBhZ2UgPSBp dC5wYWdlKCk7Cg==