137081 2014-09-24 16:01:40 -0700 bmalloc: cleaned up fast path vs slow path 2014-09-30 11:38:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren barraclough kling sam oldest_to_newest 1037060 0 ggaren 2014-09-24 16:01:40 -0700 bmalloc: cleaned up fast path vs slow path 1037069 1 238619 ggaren 2014-09-24 16:12:38 -0700 Created attachment 238619 Patch 1038271 2 ggaren 2014-09-30 11:38:02 -0700 Committed r174109: <http://trac.webkit.org/changeset/174109> 238619 2014-09-24 16:12:38 -0700 2014-09-25 22:39:42 -0700 Patch bug-137081-20140924161237.patch text/plain 15761 ggaren SW5kZXg6IFNvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1h bGxvYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzkzNSkKKysrIFNvdXJjZS9ibWFsbG9jL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDY0IEBACisyMDE0LTA5LTI0ICBHZW9mZnJl eSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgYm1hbGxvYzogY2xlYW5lZCB1 cCBmYXN0IHBhdGggdnMgc2xvdyBwYXRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzcwODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBNaWdodCBiZSBhIDElIHNwZWVkdXAgb24gTWFsbG9jQmVuY2guIEFs c28gY2xlYW5zIHVwIHRoZSBjb2RlIGEgYml0LgorCisgICAgICAgICogYm1hbGxvYy9BbGxvY2F0 b3IuY3BwOgorICAgICAgICAoYm1hbGxvYzo6QWxsb2NhdG9yOjpBbGxvY2F0b3IpOiBNZXJnZWQg dGhlIHNtYWxsIGFuZCBtZWRpdW0gcmFuZ2UKKyAgICAgICAgY2FjaGVzLCBqdXN0IGxpa2UgdGhl IHNtYWxsIGFuZCBtZWRpdW0gYWxsb2NhdG9ycy4gUmFuZ2VzIGFyZSBhYnN0cmFjdAorICAgICAg ICBvYmplY3RzIHRoYXQgZG9uJ3QgcmVhbGx5IGNhcmUgd2hldGhlciB0aGV5IGhvbGQgc21hbGwg b3IgbWVkaXVtIG9iamVjdHMsCisgICAgICAgIHNvIHRoZXkgZG9uJ3QgbmVlZCB0byBiZSBzZWdy ZWdhdGVkLgorCisgICAgICAgIChibWFsbG9jOjpBbGxvY2F0b3I6OnNjYXZlbmdlKTogRGl0dG8u CisKKyAgICAgICAgKGJtYWxsb2M6OkFsbG9jYXRvcjo6YWxsb2NhdGVCdW1wUmFuZ2VTbG93Q2Fz ZSk6CisgICAgICAgIChibWFsbG9jOjpBbGxvY2F0b3I6OmFsbG9jYXRlQnVtcFJhbmdlKTogU2Ft ZSB0aGluZyBoZXJlLCBleGNlcHQgdGhhdAorICAgICAgICB3ZSBkbyBjYXJlIGEgdGlueSBiaXQs IGJlY2F1c2Ugd2UgbmVlZCB0byBzcGVjaWZ5IHNtYWxsIHZzIG1lZGl1bSB3aGVuCisgICAgICAg IGFsbG9jYXRpbmcgbmV3IHJhbmdlcyBmcm9tIHRoZSBoZWFwLCB0byBlbnN1cmUgdGhhdCB0aGUg aGVhcCBhbGxvY2F0ZXMKKyAgICAgICAgZnJvbSB0aGUgcmlnaHQgc2VnbWVudCBvZiBWTS4KKwor ICAgICAgICAoYm1hbGxvYzo6QWxsb2NhdG9yOjphbGxvY2F0ZUxhcmdlKToKKyAgICAgICAgKGJt YWxsb2M6OkFsbG9jYXRvcjo6YWxsb2NhdGVYTGFyZ2UpOiBOT19JTkxJTkUgYmVjYXVzZSB0aGlz IHdhcyBjbG91ZGluZworICAgICAgICB1cCB0aGUgZmFzdCBwYXRoLiBMYXJnZSBhbGxvY2F0aW9u IHBlcmZvcm1hbmNlIGlzIGRvbWluYXRlZCBieSBhbGxvY2F0aW9uCisgICAgICAgIGxvZ2ljIGFu ZCBpbml0aWFsaXphdGlvbiwgc28gaW5saW5pbmcgaXQgZG9lc24ndCBoZWxwLgorCisgICAgICAg IChibWFsbG9jOjpBbGxvY2F0b3I6OmFsbG9jYXRlU2xvd0Nhc2UpOiBTbG93IHBhdGggZ290IGEg Yml0IGNsZWFuZXIgc2luY2UKKyAgICAgICAgaXQgZG9lc24ndCBuZWVkIHRvIGRpc3Rpbmd1aXNo IHNtYWxsIHZzIG1lZGl1bSBvYmplY3RzLgorCisgICAgICAgIChibWFsbG9jOjpBbGxvY2F0b3I6 OmFsbG9jYXRlU21hbGxCdW1wUmFuZ2UpOiBEZWxldGVkLgorICAgICAgICAoYm1hbGxvYzo6QWxs b2NhdG9yOjphbGxvY2F0ZU1lZGl1bUJ1bXBSYW5nZSk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBi bWFsbG9jL0FsbG9jYXRvci5oOgorICAgICAgICAqIGJtYWxsb2MvQnVtcFJhbmdlLmg6CisKKyAg ICAgICAgKiBibWFsbG9jL0NhY2hlLmNwcDoKKyAgICAgICAgKGJtYWxsb2M6OkNhY2hlOjphbGxv Y2F0ZVNsb3dDYXNlKTogRGVsZXRlZC4KKyAgICAgICAgKGJtYWxsb2M6OkNhY2hlOjpkZWFsbG9j YXRlU2xvd0Nhc2UpOiBEZWxldGVkLgorICAgICAgICAqIGJtYWxsb2MvQ2FjaGUuaDoKKyAgICAg ICAgKGJtYWxsb2M6OkNhY2hlOjphbGxvY2F0ZSk6CisgICAgICAgIChibWFsbG9jOjpDYWNoZTo6 ZGVhbGxvY2F0ZSk6CisgICAgICAgIChibWFsbG9jOjpDYWNoZTo6YWxsb2NhdGVGYXN0Q2FzZSk6 IERlbGV0ZWQuCisgICAgICAgIChibWFsbG9jOjpDYWNoZTo6ZGVhbGxvY2F0ZUZhc3RDYXNlKTog RGVsZXRlZC4gUmVtb3ZlZCB0aGUgQ2FjaGUgc2xvdworICAgICAgICBwYXRocy4gVGhlIGRvd25z aWRlIHRvIHRoaXMgY2hhbmdlIGlzIHRoYXQgdGhlIGZhc3QgcGF0aCBicmFuY2hlcyB0byB0d28K KyAgICAgICAgZGlzdGluY3QgZmFpbHVyZSBjYXNlcyBpbnN0ZWFkIG9mIG9uZS4gVGhlIHVwc2lk ZSBpcyB0aGF0IHRoZSBzbG93IHBhdGgKKyAgICAgICAgZG9lc24ndCBuZWVkIHRvIHJlLXJlYWQg dGhlIHNlZ21lbnQgcmVnaXN0ZXIsIHdoaWNoIGlzIG5vdCBhcyBjaGVhcCBhcyBhCisgICAgICAg IG5vcm1hbCByZWdpc3RlciwgYW5kIGl0IGRvZXNuJ3QgbmVlZCB0byBkbyBhbiBleHRyYSBsZXZl bCBvZiBmdW5jdGlvbiAKKyAgICAgICAgY2FsbC4gU2VlbXMgdG8gYmUgd29ydGggaXQuCisKKyAg ICAgICAgKiBibWFsbG9jL0RlYWxsb2NhdG9yLmg6CisgICAgICAgICogYm1hbGxvYy9IZWFwLmNw cDoKKyAgICAgICAgKGJtYWxsb2M6OkhlYXA6OnJlZmlsbFNtYWxsQnVtcFJhbmdlQ2FjaGUpOgor ICAgICAgICAoYm1hbGxvYzo6SGVhcDo6cmVmaWxsTWVkaXVtQnVtcFJhbmdlQ2FjaGUpOgorICAg ICAgICAqIGJtYWxsb2MvSGVhcC5oOiBVcGRhdGVkIGZvciBpbnRlcmZhY2UgY2hhbmdlcy4KKwor ICAgICAgICAqIGJtYWxsb2MvU2l6ZXMuaDogVGhlIG1vc3QgcmFuZ2VzIGEgY2FjaGUgd2lsbCBo b2xkIGlzIHRoZSBudW1iZXIgb2YKKyAgICAgICAgc21hbGwgbGluZXMgaW4gYSBwYWdlIC8gMiwg c2luY2UgYW55IG90aGVyIGZyZWUgbGluZXMgd2lsbCBjb2FsZXNjZQorICAgICAgICB3aXRoIHRo ZWlyIG5laWdoYm9ycy4KKwogMjAxNC0wOS0yMyAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBw bGUuY29tPgogCiAgICAgICAgIFJvbGxlZCBvdXQgcjE3MzM0Ni4KSW5kZXg6IFNvdXJjZS9ibWFs bG9jL2JtYWxsb2MvQWxsb2NhdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9i bWFsbG9jL0FsbG9jYXRvci5jcHAJKHJldmlzaW9uIDE3MzkwNykKKysrIFNvdXJjZS9ibWFsbG9j L2JtYWxsb2MvQWxsb2NhdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzgsMTAgKzM4LDcgQEAg bmFtZXNwYWNlIGJtYWxsb2MgewogQWxsb2NhdG9yOjpBbGxvY2F0b3IoRGVhbGxvY2F0b3ImIGRl YWxsb2NhdG9yKQogICAgIDogbV9kZWFsbG9jYXRvcihkZWFsbG9jYXRvcikKIHsKLSAgICBmb3Ig KHVuc2lnbmVkIHNob3J0IHNpemUgPSBhbGlnbm1lbnQ7IHNpemUgPD0gc21hbGxNYXg7IHNpemUg Kz0gYWxpZ25tZW50KQotICAgICAgICBtX2J1bXBBbGxvY2F0b3JzW3NpemVDbGFzcyhzaXplKV0u aW5pdChzaXplKTsKLQotICAgIGZvciAodW5zaWduZWQgc2hvcnQgc2l6ZSA9IHNtYWxsTWF4ICsg YWxpZ25tZW50OyBzaXplIDw9IG1lZGl1bU1heDsgc2l6ZSArPSBhbGlnbm1lbnQpCisgICAgZm9y ICh1bnNpZ25lZCBzaG9ydCBzaXplID0gYWxpZ25tZW50OyBzaXplIDw9IG1lZGl1bU1heDsgc2l6 ZSArPSBhbGlnbm1lbnQpCiAgICAgICAgIG1fYnVtcEFsbG9jYXRvcnNbc2l6ZUNsYXNzKHNpemUp XS5pbml0KHNpemUpOwogfQogCkBAIC01MiwyNSArNDksOSBAQCBBbGxvY2F0b3I6On5BbGxvY2F0 b3IoKQogCiB2b2lkIEFsbG9jYXRvcjo6c2NhdmVuZ2UoKQogewotICAgIGZvciAodW5zaWduZWQg c2hvcnQgaSA9IGFsaWdubWVudDsgaSA8PSBzbWFsbE1heDsgaSArPSBhbGlnbm1lbnQpIHsKKyAg ICBmb3IgKHVuc2lnbmVkIHNob3J0IGkgPSBhbGlnbm1lbnQ7IGkgPD0gbWVkaXVtTWF4OyBpICs9 IGFsaWdubWVudCkgewogICAgICAgICBCdW1wQWxsb2NhdG9yJiBhbGxvY2F0b3IgPSBtX2J1bXBB bGxvY2F0b3JzW3NpemVDbGFzcyhpKV07Ci0gICAgICAgIFNtYWxsQnVtcFJhbmdlQ2FjaGUmIGJ1 bXBSYW5nZUNhY2hlID0gbV9zbWFsbEJ1bXBSYW5nZUNhY2hlc1tzaXplQ2xhc3MoaSldOwotCi0g ICAgICAgIHdoaWxlIChhbGxvY2F0b3IuY2FuQWxsb2NhdGUoKSkKLSAgICAgICAgICAgIG1fZGVh bGxvY2F0b3IuZGVhbGxvY2F0ZShhbGxvY2F0b3IuYWxsb2NhdGUoKSk7Ci0KLSAgICAgICAgd2hp bGUgKGJ1bXBSYW5nZUNhY2hlLnNpemUoKSkgewotICAgICAgICAgICAgYWxsb2NhdG9yLnJlZmls bChidW1wUmFuZ2VDYWNoZS5wb3AoKSk7Ci0gICAgICAgICAgICB3aGlsZSAoYWxsb2NhdG9yLmNh bkFsbG9jYXRlKCkpCi0gICAgICAgICAgICAgICAgbV9kZWFsbG9jYXRvci5kZWFsbG9jYXRlKGFs bG9jYXRvci5hbGxvY2F0ZSgpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGFsbG9jYXRvci5jbGVh cigpOwotICAgIH0KLQotICAgIGZvciAodW5zaWduZWQgc2hvcnQgaSA9IHNtYWxsTWF4ICsgYWxp Z25tZW50OyBpIDw9IG1lZGl1bU1heDsgaSArPSBhbGlnbm1lbnQpIHsKLSAgICAgICAgQnVtcEFs bG9jYXRvciYgYWxsb2NhdG9yID0gbV9idW1wQWxsb2NhdG9yc1tzaXplQ2xhc3MoaSldOwotICAg ICAgICBNZWRpdW1CdW1wUmFuZ2VDYWNoZSYgYnVtcFJhbmdlQ2FjaGUgPSBtX21lZGl1bUJ1bXBS YW5nZUNhY2hlc1tzaXplQ2xhc3MoaSldOworICAgICAgICBCdW1wUmFuZ2VDYWNoZSYgYnVtcFJh bmdlQ2FjaGUgPSBtX2J1bXBSYW5nZUNhY2hlc1tzaXplQ2xhc3MoaSldOwogCiAgICAgICAgIHdo aWxlIChhbGxvY2F0b3IuY2FuQWxsb2NhdGUoKSkKICAgICAgICAgICAgIG1fZGVhbGxvY2F0b3Iu ZGVhbGxvY2F0ZShhbGxvY2F0b3IuYWxsb2NhdGUoKSk7CkBAIC04NSwzNiArNjYsMzUgQEAgdm9p ZCBBbGxvY2F0b3I6OnNjYXZlbmdlKCkKICAgICB9CiB9CiAKLUJ1bXBSYW5nZSBBbGxvY2F0b3I6 OmFsbG9jYXRlU21hbGxCdW1wUmFuZ2Uoc2l6ZV90IHNpemVDbGFzcykKK05PX0lOTElORSBCdW1w UmFuZ2UgQWxsb2NhdG9yOjphbGxvY2F0ZUJ1bXBSYW5nZVNsb3dDYXNlKHNpemVfdCBzaXplQ2xh c3MpCiB7Ci0gICAgU21hbGxCdW1wUmFuZ2VDYWNoZSYgYnVtcFJhbmdlQ2FjaGUgPSBtX3NtYWxs QnVtcFJhbmdlQ2FjaGVzW3NpemVDbGFzc107Ci0gICAgaWYgKCFidW1wUmFuZ2VDYWNoZS5zaXpl KCkpIHsKLSAgICAgICAgc3RkOjpsb2NrX2d1YXJkPFN0YXRpY011dGV4PiBsb2NrKFBlclByb2Nl c3M8SGVhcD46Om11dGV4KCkpOworICAgIEJ1bXBSYW5nZUNhY2hlJiBidW1wUmFuZ2VDYWNoZSA9 IG1fYnVtcFJhbmdlQ2FjaGVzW3NpemVDbGFzc107CisKKyAgICBzdGQ6OmxvY2tfZ3VhcmQ8U3Rh dGljTXV0ZXg+IGxvY2soUGVyUHJvY2VzczxIZWFwPjo6bXV0ZXgoKSk7CisgICAgaWYgKHNpemVD bGFzcyA8PSBibWFsbG9jOjpzaXplQ2xhc3Moc21hbGxNYXgpKQogICAgICAgICBQZXJQcm9jZXNz PEhlYXA+OjpnZXRGYXN0Q2FzZSgpLT5yZWZpbGxTbWFsbEJ1bXBSYW5nZUNhY2hlKGxvY2ssIHNp emVDbGFzcywgYnVtcFJhbmdlQ2FjaGUpOwotICAgIH0KKyAgICBlbHNlCisgICAgICAgIFBlclBy b2Nlc3M8SGVhcD46OmdldEZhc3RDYXNlKCktPnJlZmlsbE1lZGl1bUJ1bXBSYW5nZUNhY2hlKGxv Y2ssIHNpemVDbGFzcywgYnVtcFJhbmdlQ2FjaGUpOwogCiAgICAgcmV0dXJuIGJ1bXBSYW5nZUNh Y2hlLnBvcCgpOwogfQogCi1CdW1wUmFuZ2UgQWxsb2NhdG9yOjphbGxvY2F0ZU1lZGl1bUJ1bXBS YW5nZShzaXplX3Qgc2l6ZUNsYXNzKQorSU5MSU5FIEJ1bXBSYW5nZSBBbGxvY2F0b3I6OmFsbG9j YXRlQnVtcFJhbmdlKHNpemVfdCBzaXplQ2xhc3MpCiB7Ci0gICAgTWVkaXVtQnVtcFJhbmdlQ2Fj aGUmIGJ1bXBSYW5nZUNhY2hlID0gbV9tZWRpdW1CdW1wUmFuZ2VDYWNoZXNbc2l6ZUNsYXNzXTsK LSAgICBpZiAoIWJ1bXBSYW5nZUNhY2hlLnNpemUoKSkgewotICAgICAgICBzdGQ6OmxvY2tfZ3Vh cmQ8U3RhdGljTXV0ZXg+IGxvY2soUGVyUHJvY2VzczxIZWFwPjo6bXV0ZXgoKSk7Ci0gICAgICAg IFBlclByb2Nlc3M8SGVhcD46OmdldEZhc3RDYXNlKCktPnJlZmlsbE1lZGl1bUJ1bXBSYW5nZUNh Y2hlKGxvY2ssIHNpemVDbGFzcywgYnVtcFJhbmdlQ2FjaGUpOwotICAgIH0KLQorICAgIEJ1bXBS YW5nZUNhY2hlJiBidW1wUmFuZ2VDYWNoZSA9IG1fYnVtcFJhbmdlQ2FjaGVzW3NpemVDbGFzc107 CisgICAgaWYgKCFidW1wUmFuZ2VDYWNoZS5zaXplKCkpCisgICAgICAgIHJldHVybiBhbGxvY2F0 ZUJ1bXBSYW5nZVNsb3dDYXNlKHNpemVDbGFzcyk7CiAgICAgcmV0dXJuIGJ1bXBSYW5nZUNhY2hl LnBvcCgpOwogfQogCi12b2lkKiBBbGxvY2F0b3I6OmFsbG9jYXRlTGFyZ2Uoc2l6ZV90IHNpemUp CitOT19JTkxJTkUgdm9pZCogQWxsb2NhdG9yOjphbGxvY2F0ZUxhcmdlKHNpemVfdCBzaXplKQog ewogICAgIHNpemUgPSByb3VuZFVwVG9NdWx0aXBsZU9mPGxhcmdlQWxpZ25tZW50PihzaXplKTsK ICAgICBzdGQ6OmxvY2tfZ3VhcmQ8U3RhdGljTXV0ZXg+IGxvY2soUGVyUHJvY2VzczxIZWFwPjo6 bXV0ZXgoKSk7CiAgICAgcmV0dXJuIFBlclByb2Nlc3M8SGVhcD46OmdldEZhc3RDYXNlKCktPmFs bG9jYXRlTGFyZ2UobG9jaywgc2l6ZSk7CiB9CiAKLXZvaWQqIEFsbG9jYXRvcjo6YWxsb2NhdGVY TGFyZ2Uoc2l6ZV90IHNpemUpCitOT19JTkxJTkUgdm9pZCogQWxsb2NhdG9yOjphbGxvY2F0ZVhM YXJnZShzaXplX3Qgc2l6ZSkKIHsKICAgICBzaXplID0gcm91bmRVcFRvTXVsdGlwbGVPZjxsYXJn ZUFsaWdubWVudD4oc2l6ZSk7CiAgICAgc3RkOjpsb2NrX2d1YXJkPFN0YXRpY011dGV4PiBsb2Nr KFBlclByb2Nlc3M8SGVhcD46Om11dGV4KCkpOwpAQCAtMTIzLDI2ICsxMDMsMTMgQEAgdm9pZCog QWxsb2NhdG9yOjphbGxvY2F0ZVhMYXJnZShzaXplX3QgcwogCiB2b2lkKiBBbGxvY2F0b3I6OmFs bG9jYXRlU2xvd0Nhc2Uoc2l6ZV90IHNpemUpCiB7Ci1JRl9ERUJVRygKLSAgICB2b2lkKiBkdW1t eTsKLSAgICBCQVNTRVJUKCFhbGxvY2F0ZUZhc3RDYXNlKHNpemUsIGR1bW15KSk7Ci0pCi0KICAg ICBpZiAoc2l6ZSA8PSBtZWRpdW1NYXgpIHsKICAgICAgICAgc2l6ZV90IHNpemVDbGFzcyA9IGJt YWxsb2M6OnNpemVDbGFzcyhzaXplKTsKICAgICAgICAgQnVtcEFsbG9jYXRvciYgYWxsb2NhdG9y ID0gbV9idW1wQWxsb2NhdG9yc1tzaXplQ2xhc3NdOwotCi0gICAgICAgIGlmIChhbGxvY2F0b3Iu c2l6ZSgpIDw9IHNtYWxsTWF4KSB7Ci0gICAgICAgICAgICBhbGxvY2F0b3IucmVmaWxsKGFsbG9j YXRlU21hbGxCdW1wUmFuZ2Uoc2l6ZUNsYXNzKSk7Ci0gICAgICAgICAgICByZXR1cm4gYWxsb2Nh dG9yLmFsbG9jYXRlKCk7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoYWxsb2NhdG9yLnNpemUo KSA8PSBtZWRpdW1NYXgpIHsKLSAgICAgICAgICAgIGFsbG9jYXRvci5yZWZpbGwoYWxsb2NhdGVN ZWRpdW1CdW1wUmFuZ2Uoc2l6ZUNsYXNzKSk7Ci0gICAgICAgICAgICByZXR1cm4gYWxsb2NhdG9y LmFsbG9jYXRlKCk7Ci0gICAgICAgIH0KKyAgICAgICAgYWxsb2NhdG9yLnJlZmlsbChhbGxvY2F0 ZUJ1bXBSYW5nZShzaXplQ2xhc3MpKTsKKyAgICAgICAgcmV0dXJuIGFsbG9jYXRvci5hbGxvY2F0 ZSgpOwogICAgIH0KLSAgICAKKwogICAgIGlmIChzaXplIDw9IGxhcmdlTWF4KQogICAgICAgICBy ZXR1cm4gYWxsb2NhdGVMYXJnZShzaXplKTsKIApJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxv Yy9BbGxvY2F0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsbG9j YXRvci5oCShyZXZpc2lvbiAxNzM5MDcpCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsbG9j YXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC00NSwyNyArNDUsMjMgQEAgcHVibGljOgogICAgIH5B bGxvY2F0b3IoKTsKIAogICAgIHZvaWQqIGFsbG9jYXRlKHNpemVfdCk7Ci0gICAgYm9vbCBhbGxv Y2F0ZUZhc3RDYXNlKHNpemVfdCwgdm9pZComKTsKLSAgICB2b2lkKiBhbGxvY2F0ZVNsb3dDYXNl KHNpemVfdCk7Ci0gICAgCiAgICAgdm9pZCBzY2F2ZW5nZSgpOwogCiBwcml2YXRlOgotICAgIHZv aWQqIGFsbG9jYXRlRmFzdENhc2UoQnVtcEFsbG9jYXRvciYpOwotCisgICAgYm9vbCBhbGxvY2F0 ZUZhc3RDYXNlKHNpemVfdCwgdm9pZComKTsKKyAgICB2b2lkKiBhbGxvY2F0ZVNsb3dDYXNlKHNp emVfdCk7CisgICAgCiAgICAgdm9pZCogYWxsb2NhdGVNZWRpdW0oc2l6ZV90KTsKICAgICB2b2lk KiBhbGxvY2F0ZUxhcmdlKHNpemVfdCk7CiAgICAgdm9pZCogYWxsb2NhdGVYTGFyZ2Uoc2l6ZV90 KTsKICAgICAKLSAgICBCdW1wUmFuZ2UgYWxsb2NhdGVTbWFsbEJ1bXBSYW5nZShzaXplX3Qgc2l6 ZUNsYXNzKTsKLSAgICBCdW1wUmFuZ2UgYWxsb2NhdGVNZWRpdW1CdW1wUmFuZ2Uoc2l6ZV90IHNp emVDbGFzcyk7CisgICAgQnVtcFJhbmdlIGFsbG9jYXRlQnVtcFJhbmdlKHNpemVfdCBzaXplQ2xh c3MpOworICAgIEJ1bXBSYW5nZSBhbGxvY2F0ZUJ1bXBSYW5nZVNsb3dDYXNlKHNpemVfdCBzaXpl Q2xhc3MpOwogICAgIAogICAgIERlYWxsb2NhdG9yJiBtX2RlYWxsb2NhdG9yOwogCiAgICAgc3Rk OjphcnJheTxCdW1wQWxsb2NhdG9yLCBtZWRpdW1NYXggLyBhbGlnbm1lbnQ+IG1fYnVtcEFsbG9j YXRvcnM7Ci0KLSAgICBzdGQ6OmFycmF5PFNtYWxsQnVtcFJhbmdlQ2FjaGUsIHNtYWxsTWF4IC8g YWxpZ25tZW50PiBtX3NtYWxsQnVtcFJhbmdlQ2FjaGVzOwotICAgIHN0ZDo6YXJyYXk8TWVkaXVt QnVtcFJhbmdlQ2FjaGUsIG1lZGl1bU1heCAvIGFsaWdubWVudD4gbV9tZWRpdW1CdW1wUmFuZ2VD YWNoZXM7CisgICAgc3RkOjphcnJheTxCdW1wUmFuZ2VDYWNoZSwgbWVkaXVtTWF4IC8gYWxpZ25t ZW50PiBtX2J1bXBSYW5nZUNhY2hlczsKIH07CiAKIGlubGluZSBib29sIEFsbG9jYXRvcjo6YWxs b2NhdGVGYXN0Q2FzZShzaXplX3Qgc2l6ZSwgdm9pZComIG9iamVjdCkKSW5kZXg6IFNvdXJjZS9i bWFsbG9jL2JtYWxsb2MvQnVtcFJhbmdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL2JtYWxsb2Mv Ym1hbGxvYy9CdW1wUmFuZ2UuaAkocmV2aXNpb24gMTczOTA3KQorKysgU291cmNlL2JtYWxsb2Mv Ym1hbGxvYy9CdW1wUmFuZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMzcsOCArMzcsNyBAQCBzdHJ1 Y3QgQnVtcFJhbmdlIHsKICAgICB1bnNpZ25lZCBzaG9ydCBvYmplY3RDb3VudDsKIH07CiAKLXR5 cGVkZWYgRml4ZWRWZWN0b3I8QnVtcFJhbmdlLCBzbWFsbFJhbmdlQ2FjaGVDYXBhY2l0eT4gU21h bGxCdW1wUmFuZ2VDYWNoZTsKLXR5cGVkZWYgRml4ZWRWZWN0b3I8QnVtcFJhbmdlLCBtZWRpdW1S YW5nZUNhY2hlQ2FwYWNpdHk+IE1lZGl1bUJ1bXBSYW5nZUNhY2hlOwordHlwZWRlZiBGaXhlZFZl Y3RvcjxCdW1wUmFuZ2UsIGJ1bXBSYW5nZUNhY2hlQ2FwYWNpdHk+IEJ1bXBSYW5nZUNhY2hlOwog CiB9IC8vIG5hbWVzcGFjZSBibWFsbG9jCiAKSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2Mv Q2FjaGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQ2FjaGUuY3Bw CShyZXZpc2lvbiAxNzM5MDcpCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0NhY2hlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTQsMjcgKzU0LDExIEBAIHZvaWQgQ2FjaGU6OnNjYXZlbmdlKCkK ICAgICBtX2RlYWxsb2NhdG9yLnNjYXZlbmdlKCk7CiB9CiAKLU5PX0lOTElORSB2b2lkKiBDYWNo ZTo6YWxsb2NhdGVTbG93Q2FzZShzaXplX3Qgc2l6ZSkKLXsKLSAgICBDYWNoZSogY2FjaGUgPSBQ ZXJUaHJlYWQ8Q2FjaGU+OjpnZXRGYXN0Q2FzZSgpOwotICAgIGlmICghY2FjaGUpCi0gICAgICAg IHJldHVybiBhbGxvY2F0ZVNsb3dDYXNlTnVsbENhY2hlKHNpemUpOwotICAgIHJldHVybiBjYWNo ZS0+YWxsb2NhdG9yKCkuYWxsb2NhdGVTbG93Q2FzZShzaXplKTsKLX0KLQogTk9fSU5MSU5FIHZv aWQqIENhY2hlOjphbGxvY2F0ZVNsb3dDYXNlTnVsbENhY2hlKHNpemVfdCBzaXplKQogewogICAg IHJldHVybiBQZXJUaHJlYWQ8Q2FjaGU+OjpnZXRTbG93Q2FzZSgpLT5hbGxvY2F0b3IoKS5hbGxv Y2F0ZShzaXplKTsKIH0KIAotTk9fSU5MSU5FIHZvaWQgQ2FjaGU6OmRlYWxsb2NhdGVTbG93Q2Fz ZSh2b2lkKiBvYmplY3QpCi17Ci0gICAgQ2FjaGUqIGNhY2hlID0gUGVyVGhyZWFkPENhY2hlPjo6 Z2V0RmFzdENhc2UoKTsKLSAgICBpZiAoIWNhY2hlKQotICAgICAgICByZXR1cm4gZGVhbGxvY2F0 ZVNsb3dDYXNlTnVsbENhY2hlKG9iamVjdCk7Ci0gICAgY2FjaGUtPmRlYWxsb2NhdG9yKCkuZGVh bGxvY2F0ZVNsb3dDYXNlKG9iamVjdCk7Ci19Ci0KIE5PX0lOTElORSB2b2lkIENhY2hlOjpkZWFs bG9jYXRlU2xvd0Nhc2VOdWxsQ2FjaGUodm9pZCogb2JqZWN0KQogewogICAgIFBlclRocmVhZDxD YWNoZT46OmdldFNsb3dDYXNlKCktPmRlYWxsb2NhdG9yKCkuZGVhbGxvY2F0ZShvYmplY3QpOwpJ bmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9DYWNoZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9ibWFsbG9jL2JtYWxsb2MvQ2FjaGUuaAkocmV2aXNpb24gMTczOTA3KQorKysgU291cmNlL2Jt YWxsb2MvYm1hbGxvYy9DYWNoZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01MCw0NiArNTAsMjcgQEAg cHVibGljOgogICAgIHZvaWQgc2NhdmVuZ2UoKTsKIAogcHJpdmF0ZToKLSAgICBzdGF0aWMgYm9v bCBhbGxvY2F0ZUZhc3RDYXNlKHNpemVfdCwgdm9pZComKTsKLSAgICBzdGF0aWMgdm9pZCogYWxs b2NhdGVTbG93Q2FzZShzaXplX3QpOwogICAgIHN0YXRpYyB2b2lkKiBhbGxvY2F0ZVNsb3dDYXNl TnVsbENhY2hlKHNpemVfdCk7Ci0KLSAgICBzdGF0aWMgYm9vbCBkZWFsbG9jYXRlRmFzdENhc2Uo dm9pZCopOwotICAgIHN0YXRpYyB2b2lkIGRlYWxsb2NhdGVTbG93Q2FzZSh2b2lkKik7CiAgICAg c3RhdGljIHZvaWQgZGVhbGxvY2F0ZVNsb3dDYXNlTnVsbENhY2hlKHZvaWQqKTsKIAogICAgIERl YWxsb2NhdG9yIG1fZGVhbGxvY2F0b3I7CiAgICAgQWxsb2NhdG9yIG1fYWxsb2NhdG9yOwogfTsK IAotaW5saW5lIGJvb2wgQ2FjaGU6OmFsbG9jYXRlRmFzdENhc2Uoc2l6ZV90IHNpemUsIHZvaWQq JiBvYmplY3QpCitpbmxpbmUgdm9pZCogQ2FjaGU6OmFsbG9jYXRlKHNpemVfdCBzaXplKQogewog ICAgIENhY2hlKiBjYWNoZSA9IFBlclRocmVhZDxDYWNoZT46OmdldEZhc3RDYXNlKCk7CiAgICAg aWYgKCFjYWNoZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJldHVybiBjYWNoZS0+YWxs b2NhdG9yKCkuYWxsb2NhdGVGYXN0Q2FzZShzaXplLCBvYmplY3QpOworICAgICAgICByZXR1cm4g YWxsb2NhdGVTbG93Q2FzZU51bGxDYWNoZShzaXplKTsKKyAgICByZXR1cm4gY2FjaGUtPmFsbG9j YXRvcigpLmFsbG9jYXRlKHNpemUpOwogfQogCi1pbmxpbmUgYm9vbCBDYWNoZTo6ZGVhbGxvY2F0 ZUZhc3RDYXNlKHZvaWQqIG9iamVjdCkKK2lubGluZSB2b2lkIENhY2hlOjpkZWFsbG9jYXRlKHZv aWQqIG9iamVjdCkKIHsKICAgICBDYWNoZSogY2FjaGUgPSBQZXJUaHJlYWQ8Q2FjaGU+OjpnZXRG YXN0Q2FzZSgpOwogICAgIGlmICghY2FjaGUpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBy ZXR1cm4gY2FjaGUtPmRlYWxsb2NhdG9yKCkuZGVhbGxvY2F0ZUZhc3RDYXNlKG9iamVjdCk7Ci19 Ci0KLWlubGluZSB2b2lkKiBDYWNoZTo6YWxsb2NhdGUoc2l6ZV90IHNpemUpCi17Ci0gICAgdm9p ZCogb2JqZWN0OwotICAgIGlmICghYWxsb2NhdGVGYXN0Q2FzZShzaXplLCBvYmplY3QpKQotICAg ICAgICByZXR1cm4gYWxsb2NhdGVTbG93Q2FzZShzaXplKTsKLSAgICByZXR1cm4gb2JqZWN0Owot fQotCi1pbmxpbmUgdm9pZCBDYWNoZTo6ZGVhbGxvY2F0ZSh2b2lkKiBvYmplY3QpCi17Ci0gICAg aWYgKCFkZWFsbG9jYXRlRmFzdENhc2Uob2JqZWN0KSkKLSAgICAgICAgZGVhbGxvY2F0ZVNsb3dD YXNlKG9iamVjdCk7CisgICAgICAgIHJldHVybiBkZWFsbG9jYXRlU2xvd0Nhc2VOdWxsQ2FjaGUo b2JqZWN0KTsKKyAgICByZXR1cm4gY2FjaGUtPmRlYWxsb2NhdG9yKCkuZGVhbGxvY2F0ZShvYmpl Y3QpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBibWFsbG9jCkluZGV4OiBTb3VyY2UvYm1hbGxvYy9i bWFsbG9jL0RlYWxsb2NhdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL2JtYWxsb2MvYm1hbGxv Yy9EZWFsbG9jYXRvci5oCShyZXZpc2lvbiAxNzM5MDcpCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFs bG9jL0RlYWxsb2NhdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDEyICs0MSwxMiBAQCBwdWJs aWM6CiAgICAgfkRlYWxsb2NhdG9yKCk7CiAKICAgICB2b2lkIGRlYWxsb2NhdGUodm9pZCopOwot ICAgIGJvb2wgZGVhbGxvY2F0ZUZhc3RDYXNlKHZvaWQqKTsKLSAgICB2b2lkIGRlYWxsb2NhdGVT bG93Q2FzZSh2b2lkKik7Ci0KICAgICB2b2lkIHNjYXZlbmdlKCk7CiAgICAgCiBwcml2YXRlOgor ICAgIGJvb2wgZGVhbGxvY2F0ZUZhc3RDYXNlKHZvaWQqKTsKKyAgICB2b2lkIGRlYWxsb2NhdGVT bG93Q2FzZSh2b2lkKik7CisKICAgICB2b2lkIGRlYWxsb2NhdGVMYXJnZSh2b2lkKik7CiAgICAg dm9pZCBkZWFsbG9jYXRlWExhcmdlKHZvaWQqKTsKICAgICB2b2lkIHByb2Nlc3NPYmplY3RMb2co KTsKSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvSGVhcC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL2JtYWxsb2MvYm1hbGxvYy9IZWFwLmNwcAkocmV2aXNpb24gMTczOTA4KQorKysgU291 cmNlL2JtYWxsb2MvYm1hbGxvYy9IZWFwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTUyLDcgKzE1 Miw3IEBAIHZvaWQgSGVhcDo6c2NhdmVuZ2VMYXJnZVJhbmdlcyhzdGQ6OnVuaXEKICAgICB9CiB9 CiAKLXZvaWQgSGVhcDo6cmVmaWxsU21hbGxCdW1wUmFuZ2VDYWNoZShzdGQ6OmxvY2tfZ3VhcmQ8 U3RhdGljTXV0ZXg+JiBsb2NrLCBzaXplX3Qgc2l6ZUNsYXNzLCBTbWFsbEJ1bXBSYW5nZUNhY2hl JiByYW5nZUNhY2hlKQordm9pZCBIZWFwOjpyZWZpbGxTbWFsbEJ1bXBSYW5nZUNhY2hlKHN0ZDo6 bG9ja19ndWFyZDxTdGF0aWNNdXRleD4mIGxvY2ssIHNpemVfdCBzaXplQ2xhc3MsIEJ1bXBSYW5n ZUNhY2hlJiByYW5nZUNhY2hlKQogewogICAgIEJBU1NFUlQoIXJhbmdlQ2FjaGUuc2l6ZSgpKTsK ICAgICBTbWFsbFBhZ2UqIHBhZ2UgPSBhbGxvY2F0ZVNtYWxsUGFnZShsb2NrLCBzaXplQ2xhc3Mp OwpAQCAtMTg5LDcgKzE4OSw3IEBAIHZvaWQgSGVhcDo6cmVmaWxsU21hbGxCdW1wUmFuZ2VDYWNo ZShzdGQKICAgICB9CiB9CiAKLXZvaWQgSGVhcDo6cmVmaWxsTWVkaXVtQnVtcFJhbmdlQ2FjaGUo c3RkOjpsb2NrX2d1YXJkPFN0YXRpY011dGV4PiYgbG9jaywgc2l6ZV90IHNpemVDbGFzcywgTWVk aXVtQnVtcFJhbmdlQ2FjaGUmIHJhbmdlQ2FjaGUpCit2b2lkIEhlYXA6OnJlZmlsbE1lZGl1bUJ1 bXBSYW5nZUNhY2hlKHN0ZDo6bG9ja19ndWFyZDxTdGF0aWNNdXRleD4mIGxvY2ssIHNpemVfdCBz aXplQ2xhc3MsIEJ1bXBSYW5nZUNhY2hlJiByYW5nZUNhY2hlKQogewogICAgIE1lZGl1bVBhZ2Uq IHBhZ2UgPSBhbGxvY2F0ZU1lZGl1bVBhZ2UobG9jaywgc2l6ZUNsYXNzKTsKICAgICBCQVNTRVJU KCFyYW5nZUNhY2hlLnNpemUoKSk7CkluZGV4OiBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0hlYXAu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0hlYXAuaAkocmV2aXNpb24g MTczOTA4KQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9IZWFwLmgJKHdvcmtpbmcgY29weSkK QEAgLTUwLDEwICs1MCwxMCBAQCBjbGFzcyBIZWFwIHsKIHB1YmxpYzoKICAgICBIZWFwKHN0ZDo6 bG9ja19ndWFyZDxTdGF0aWNNdXRleD4mKTsKIAotICAgIHZvaWQgcmVmaWxsU21hbGxCdW1wUmFu Z2VDYWNoZShzdGQ6OmxvY2tfZ3VhcmQ8U3RhdGljTXV0ZXg+Jiwgc2l6ZV90IHNpemVDbGFzcywg U21hbGxCdW1wUmFuZ2VDYWNoZSYpOworICAgIHZvaWQgcmVmaWxsU21hbGxCdW1wUmFuZ2VDYWNo ZShzdGQ6OmxvY2tfZ3VhcmQ8U3RhdGljTXV0ZXg+Jiwgc2l6ZV90IHNpemVDbGFzcywgQnVtcFJh bmdlQ2FjaGUmKTsKICAgICB2b2lkIGRlcmVmU21hbGxMaW5lKHN0ZDo6bG9ja19ndWFyZDxTdGF0 aWNNdXRleD4mLCBTbWFsbExpbmUqKTsKIAotICAgIHZvaWQgcmVmaWxsTWVkaXVtQnVtcFJhbmdl Q2FjaGUoc3RkOjpsb2NrX2d1YXJkPFN0YXRpY011dGV4PiYsIHNpemVfdCBzaXplQ2xhc3MsIE1l ZGl1bUJ1bXBSYW5nZUNhY2hlJik7CisgICAgdm9pZCByZWZpbGxNZWRpdW1CdW1wUmFuZ2VDYWNo ZShzdGQ6OmxvY2tfZ3VhcmQ8U3RhdGljTXV0ZXg+Jiwgc2l6ZV90IHNpemVDbGFzcywgQnVtcFJh bmdlQ2FjaGUmKTsKICAgICB2b2lkIGRlcmVmTWVkaXVtTGluZShzdGQ6OmxvY2tfZ3VhcmQ8U3Rh dGljTXV0ZXg+JiwgTWVkaXVtTGluZSopOwogCiAgICAgdm9pZCogYWxsb2NhdGVMYXJnZShzdGQ6 OmxvY2tfZ3VhcmQ8U3RhdGljTXV0ZXg+Jiwgc2l6ZV90KTsKSW5kZXg6IFNvdXJjZS9ibWFsbG9j L2JtYWxsb2MvU2l6ZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1Np emVzLmgJKHJldmlzaW9uIDE3MzkwNykKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvU2l6ZXMu aAkod29ya2luZyBjb3B5KQpAQCAtOTEsOSArOTEsNyBAQCBuYW1lc3BhY2UgU2l6ZXMgewogICAg IHN0YXRpYyBjb25zdCB1aW50cHRyX3Qgc21hbGxPck1lZGl1bVNtYWxsVHlwZU1hc2sgPSBzbWFs bFR5cGUgXiBtZWRpdW1UeXBlOyAvLyBPbmx5IHZhbGlkIGlmIG9iamVjdCBpcyBrbm93biB0byBi ZSBzbWFsbCBvciBtZWRpdW0uCiAKICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IGRlYWxsb2NhdG9y TG9nQ2FwYWNpdHkgPSAyNTY7Ci0KLSAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IHNtYWxsUmFuZ2VD YWNoZUNhcGFjaXR5ID0gdm1QYWdlU2l6ZSAvIHNtYWxsTGluZVNpemU7Ci0gICAgc3RhdGljIGNv bnN0IHNpemVfdCBtZWRpdW1SYW5nZUNhY2hlQ2FwYWNpdHkgPSB2bVBhZ2VTaXplIC8gbWVkaXVt TGluZVNpemU7CisgICAgc3RhdGljIGNvbnN0IHNpemVfdCBidW1wUmFuZ2VDYWNoZUNhcGFjaXR5 ID0gdm1QYWdlU2l6ZSAvIHNtYWxsTGluZVNpemUgLyAyOwogICAgIAogICAgIHN0YXRpYyBjb25z dCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzIHNjYXZlbmdlU2xlZXBEdXJhdGlvbiA9IHN0ZDo6 Y2hyb25vOjptaWxsaXNlY29uZHMoNTEyKTsKIAo=