158999 2016-06-21 14:52:00 -0700 Options::useImmortalObjects is not safe for conservative GC 2016-06-21 16:06:22 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1204297 0 ggaren 2016-06-21 14:52:00 -0700 Options::useImmortalObjects is not safe for conservative GC 1204309 1 281784 ggaren 2016-06-21 15:07:29 -0700 Created attachment 281784 Patch 1204310 2 281784 msaboff 2016-06-21 15:09:12 -0700 Comment on attachment 281784 Patch r=me 1204314 3 281784 joepeck 2016-06-21 15:14:35 -0700 Comment on attachment 281784 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=281784&action=review > Source/JavaScriptCore/heap/Heap.cpp:-1476 > - if (Options::useImmortalObjects()) > - markDeadObjects(); This is the only use of Options::useImmortalObjects. Should we remove the Option, or should we leave in legacy options even if they do nothing? 1204316 4 281784 joepeck 2016-06-21 15:14:56 -0700 Comment on attachment 281784 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=281784&action=review > Source/JavaScriptCore/heap/MarkedAllocator.cpp:74 > + bool isImmortal = block->state() != MarkedBlock::New && Options::useImmortalObjects(); I see it is now used here! Nevermind =) 1204319 5 281786 ggaren 2016-06-21 15:19:55 -0700 Created attachment 281786 Patch 1204321 6 281786 msaboff 2016-06-21 15:21:04 -0700 Comment on attachment 281786 Patch LGTM 1204324 7 281786 mark.lam 2016-06-21 15:25:40 -0700 Comment on attachment 281786 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=281786&action=review > Source/JavaScriptCore/heap/MarkedAllocator.cpp:225 > + if (Options::useImmortalObjects()) { Make this UNLIKELY(Options::useImmortalObjects())? 1204329 8 281788 ggaren 2016-06-21 15:32:29 -0700 Created attachment 281788 Patch for landing 1204330 9 281789 ggaren 2016-06-21 15:33:51 -0700 Created attachment 281789 Patch for landing 1204340 10 281789 commit-queue 2016-06-21 16:06:18 -0700 Comment on attachment 281789 Patch for landing Clearing flags on attachment: 281789 Committed r202299: <http://trac.webkit.org/changeset/202299> 1204341 11 commit-queue 2016-06-21 16:06:22 -0700 All reviewed patches have been landed. Closing bug. 281784 2016-06-21 15:07:29 -0700 2016-06-21 15:19:52 -0700 Patch bug-158999-20160621150721.patch text/plain 5693 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAyMjk0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDE2LTA2LTIxICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgT3B0aW9uczo6dXNlSW1tb3J0YWxPYmplY3RzIGlzIG5vdCBzYWZlIGZvciBjb25zZXJ2YXRp dmUgR0MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 ODk5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHVz ZUltbW9ydGFsT2JqZWN0cyBzZXQgdGhlIG1hcmsgYml0IHRvIGtlZXAgYW4gb2JqZWN0IGZyb20g YmVpbmcKKyAgICAgICAgcmVhbGxvY2F0ZWQuIFRoaXMgaGFkIHRoZSBuZWdhdGl2ZSBzaWRlLWVm ZmVjdCBvZiBjb252aW5jaW5nIHRoZQorICAgICAgICBjb25zZXJ2YXRpdmUgbWFya2VyIHRoYXQg dGhlIG9iamVjdCB3YXMgYSB2YWxpZCBhbmQgbGl2ZSBjZWxsLCB3aGljaAorICAgICAgICB3b3Vs ZCBjYXVzZSB1cyB0byB2aXNpdCBnYXJiYWdlLgorCisgICAgICAgICogaGVhcC9IZWFwLmNwcDoK KyAgICAgICAgKEpTQzo6SGVhcDo6ZGlkRmluaXNoQ29sbGVjdGlvbik6CisgICAgICAgIChKU0M6 OkhlYXA6OnJlc3VtZUNvbXBpbGVyVGhyZWFkcyk6CisgICAgICAgIChKU0M6OkhlYXA6OnNldEZ1 bGxBY3Rpdml0eUNhbGxiYWNrKToKKyAgICAgICAgKEpTQzo6SGVhcDo6bWFya0RlYWRPYmplY3Rz KTogRGVsZXRlZC4KKyAgICAgICAgKiBoZWFwL0hlYXAuaDogRG9uJ3Qgc2V0IHRoZSBtYXJrIGJp dCBvbiBhIGRlYWQgb2JqZWN0LiBUaGF0J3MgYSBidWcgaW4KKyAgICAgICAgYSBjb25zZXJ2YXRp dmUgR0MuCisKKyAgICAgICAgKiBoZWFwL01hcmtlZEFsbG9jYXRvci5jcHA6CisgICAgICAgIChK U0M6Ok1hcmtlZEFsbG9jYXRvcjo6dHJ5QWxsb2NhdGVIZWxwZXIpOiBBdXRvbWF0aWNhbGx5IHJl dGlyZSBvbGQKKyAgICAgICAgYmxvY2tzIHdoZW4gd2UncmUgZG9pbmcgdGhlIGltbW9ydGFsIG9i amVjdHMgdGhpbmcuIFRoaXMgaGFzIHRoZSBlZmZlY3QKKyAgICAgICAgb2YgcHJlc2VydmluZyBt ZW1vcnkgZm9yIGRlYnVnZ2luZyBiZWNhdXNlIHdlIG5ldmVyIHJlYWxsb2NhdGUgZnJvbSBhCisg ICAgICAgIGJsb2NrIHdlJ3ZlIHByZXZpb3VzbHkgYWxsb2NhdGVkIGZyb20uCisKIDIwMTYtMDYt MjEgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQ29kZUJsb2Nr OjpzaHJpbmtUb0ZpdCBpcyByYWN5CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9I ZWFwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNw cAkocmV2aXNpb24gMjAyMTcwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MiwyMCArMjUyLDYgQEAgc3RhdGljIGlubGluZSBib29s IGlzVmFsaWRUaHJlYWRTdGF0ZShWTQogICAgIHJldHVybiB0cnVlOwogfQogCi1zdHJ1Y3QgTWFy a09iamVjdCA6IHB1YmxpYyBNYXJrZWRCbG9jazo6Vm9pZEZ1bmN0b3IgewotICAgIGlubGluZSB2 b2lkIHZpc2l0KEpTQ2VsbCogY2VsbCkKLSAgICB7Ci0gICAgICAgIGlmIChjZWxsLT5pc1phcHBl ZCgpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBIZWFwOjpoZWFwKGNlbGwpLT5zZXRN YXJrZWQoY2VsbCk7Ci0gICAgfQotICAgIEl0ZXJhdGlvblN0YXR1cyBvcGVyYXRvcigpKEpTQ2Vs bCogY2VsbCkKLSAgICB7Ci0gICAgICAgIHZpc2l0KGNlbGwpOwotICAgICAgICByZXR1cm4gSXRl cmF0aW9uU3RhdHVzOjpDb250aW51ZTsKLSAgICB9Ci19OwotCiBzdHJ1Y3QgQ291bnQgOiBwdWJs aWMgTWFya2VkQmxvY2s6OkNvdW50RnVuY3RvciB7CiAgICAgdm9pZCBvcGVyYXRvcigpKEpTQ2Vs bCopIHsgY291bnQoMSk7IH0KIH07CkBAIC0xNDcyLDkgKzE0NTgsNiBAQCB2b2lkIEhlYXA6OmRp ZEZpbmlzaENvbGxlY3Rpb24oZG91YmxlIGdjCiAgICAgaWYgKE9wdGlvbnM6OnVzZVpvbWJpZU1v ZGUoKSkKICAgICAgICAgem9tYmlmeURlYWRPYmplY3RzKCk7CiAKLSAgICBpZiAoT3B0aW9uczo6 dXNlSW1tb3J0YWxPYmplY3RzKCkpCi0gICAgICAgIG1hcmtEZWFkT2JqZWN0cygpOwotCiAgICAg aWYgKE9wdGlvbnM6OmR1bXBPYmplY3RTdGF0aXN0aWNzKCkpCiAgICAgICAgIEhlYXBTdGF0aXN0 aWNzOjpkdW1wT2JqZWN0U3RhdGlzdGljcyh0aGlzKTsKIApAQCAtMTUwMywxMiArMTQ4Niw2IEBA IHZvaWQgSGVhcDo6cmVzdW1lQ29tcGlsZXJUaHJlYWRzKCkKICNlbmRpZgogfQogCi12b2lkIEhl YXA6Om1hcmtEZWFkT2JqZWN0cygpCi17Ci0gICAgSGVhcEl0ZXJhdGlvblNjb3BlIGl0ZXJhdGlv blNjb3BlKCp0aGlzKTsKLSAgICBtX29iamVjdFNwYWNlLmZvckVhY2hEZWFkQ2VsbDxNYXJrT2Jq ZWN0PihpdGVyYXRpb25TY29wZSk7Ci19Ci0KIHZvaWQgSGVhcDo6c2V0RnVsbEFjdGl2aXR5Q2Fs bGJhY2soUGFzc1JlZlB0cjxGdWxsR0NBY3Rpdml0eUNhbGxiYWNrPiBhY3Rpdml0eUNhbGxiYWNr KQogewogICAgIG1fZnVsbEFjdGl2aXR5Q2FsbGJhY2sgPSBhY3Rpdml0eUNhbGxiYWNrOwpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaAkocmV2aXNpb24gMjAyMTcwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNDIsNyArMzQy LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZEZpbmlzaENvbGxlY3Rpb24oZG91YmxlIGdjU3Rh cnRUaW1lKTsKICAgICB2b2lkIHJlc3VtZUNvbXBpbGVyVGhyZWFkcygpOwogICAgIHZvaWQgem9t YmlmeURlYWRPYmplY3RzKCk7Ci0gICAgdm9pZCBtYXJrRGVhZE9iamVjdHMoKTsKICAgICB2b2lk IGdhdGhlckV4dHJhSGVhcFNuYXBzaG90RGF0YShIZWFwUHJvZmlsZXImKTsKICAgICB2b2lkIHJl bW92ZURlYWRIZWFwU25hcHNob3ROb2RlcyhIZWFwUHJvZmlsZXImKTsKIApJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkQWxsb2NhdG9yLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0b3IuY3BwCShyZXZpc2lvbiAy MDIxNzApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0b3IuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC03MSwxMCArNzEsMTQgQEAgaW5saW5lIHZvaWQqIE1hcmtlZEFs bG9jYXRvcjo6dHJ5QWxsb2NhdAogICAgIGZvciAoTWFya2VkQmxvY2sqJiBibG9jayA9IG1fbmV4 dEJsb2NrVG9Td2VlcDsgYmxvY2s7IGJsb2NrID0gbmV4dCkgewogICAgICAgICBuZXh0ID0gYmxv Y2stPm5leHQoKTsKIAorICAgICAgICBib29sIGlzSW1tb3J0YWwgPSBibG9jay0+c3RhdGUoKSAh PSBNYXJrZWRCbG9jazo6TmV3ICYmIE9wdGlvbnM6OnVzZUltbW9ydGFsT2JqZWN0cygpOworCiAg ICAgICAgIE1hcmtlZEJsb2NrOjpGcmVlTGlzdCBmcmVlTGlzdCA9IGJsb2NrLT5zd2VlcChNYXJr ZWRCbG9jazo6U3dlZXBUb0ZyZWVMaXN0KTsKICAgICAgICAgCiAgICAgICAgIGRvdWJsZSB1dGls aXphdGlvbiA9ICgoZG91YmxlKU1hcmtlZEJsb2NrOjpibG9ja1NpemUgLSAoZG91YmxlKWZyZWVM aXN0LmJ5dGVzKSAvIChkb3VibGUpTWFya2VkQmxvY2s6OmJsb2NrU2l6ZTsKLSAgICAgICAgaWYg KHV0aWxpemF0aW9uID49IE9wdGlvbnM6Om1pbk1hcmtlZEJsb2NrVXRpbGl6YXRpb24oKSkgewor ICAgICAgICBib29sIGlzRnVsbCA9IHV0aWxpemF0aW9uID49IE9wdGlvbnM6Om1pbk1hcmtlZEJs b2NrVXRpbGl6YXRpb24oKTsKKworICAgICAgICBpZiAoaXNJbW1vcnRhbCB8fCBpc0Z1bGwpIHsK ICAgICAgICAgICAgIEFTU0VSVChmcmVlTGlzdC5ieXRlcyB8fCAhZnJlZUxpc3QuaGVhZCk7CiAg ICAgICAgICAgICBtX2Jsb2NrTGlzdC5yZW1vdmUoYmxvY2spOwogICAgICAgICAgICAgbV9yZXRp cmVkQmxvY2tzLnB1c2goYmxvY2spOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAv TWFya2VkQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9N YXJrZWRCbG9jay5oCShyZXZpc2lvbiAyMDIxNzApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aGVhcC9NYXJrZWRCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC03Nyw2ICs3Nyw4IEBAIG5hbWVz cGFjZSBKU0MgewogICAgICAgICBzdGF0aWNfYXNzZXJ0KCEoTWFya2VkQmxvY2s6OmF0b21TaXpl ICYgKE1hcmtlZEJsb2NrOjphdG9tU2l6ZSAtIDEpKSwgIk1hcmtlZEJsb2NrOjphdG9tU2l6ZSBt dXN0IGJlIGEgcG93ZXIgb2YgdHdvLiIpOwogICAgICAgICBzdGF0aWNfYXNzZXJ0KCEoTWFya2Vk QmxvY2s6OmJsb2NrU2l6ZSAmIChNYXJrZWRCbG9jazo6YmxvY2tTaXplIC0gMSkpLCAiTWFya2Vk QmxvY2s6OmJsb2NrU2l6ZSBtdXN0IGJlIGEgcG93ZXIgb2YgdHdvLiIpOwogCisgICAgICAgIGVu dW0gQmxvY2tTdGF0ZSB7IE5ldywgRnJlZUxpc3RlZCwgQWxsb2NhdGVkLCBNYXJrZWQsIFJldGly ZWQgfTsKKwogICAgICAgICBzdHJ1Y3QgRnJlZUNlbGwgewogICAgICAgICAgICAgRnJlZUNlbGwq IG5leHQ7CiAgICAgICAgIH07CkBAIC0xMTksNiArMTIxLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAg ICAgICAgIEhlYXAqIGhlYXAoKSBjb25zdDsKICAgICAgICAgVk0qIHZtKCkgY29uc3Q7CiAgICAg ICAgIFdlYWtTZXQmIHdlYWtTZXQoKTsKKyAgICAgICAgQmxvY2tTdGF0ZSBzdGF0ZSgpIGNvbnN0 IHsgcmV0dXJuIG1fc3RhdGU7IH0KICAgICAgICAgCiAgICAgICAgIGVudW0gU3dlZXBNb2RlIHsg U3dlZXBPbmx5LCBTd2VlcFRvRnJlZUxpc3QgfTsKICAgICAgICAgRnJlZUxpc3Qgc3dlZXAoU3dl ZXBNb2RlID0gU3dlZXBPbmx5KTsKQEAgLTE3Nyw3ICsxODAsNiBAQCBuYW1lc3BhY2UgSlNDIHsK ICAgICBwcml2YXRlOgogICAgICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IGF0b21BbGlnbm1lbnRN YXNrID0gYXRvbVNpemUgLSAxOwogCi0gICAgICAgIGVudW0gQmxvY2tTdGF0ZSB7IE5ldywgRnJl ZUxpc3RlZCwgQWxsb2NhdGVkLCBNYXJrZWQsIFJldGlyZWQgfTsKICAgICAgICAgdGVtcGxhdGU8 Ym9vbCBjYWxsRGVzdHJ1Y3RvcnM+IEZyZWVMaXN0IHN3ZWVwSGVscGVyKFN3ZWVwTW9kZSA9IFN3 ZWVwT25seSk7CiAKICAgICAgICAgdHlwZWRlZiBjaGFyIEF0b21bYXRvbVNpemVdOwo= 281786 2016-06-21 15:19:55 -0700 2016-06-21 15:32:26 -0700 Patch bug-158999-20160621151947.patch text/plain 5426 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAyMjk0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBA CisyMDE2LTA2LTIxICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgT3B0aW9uczo6dXNlSW1tb3J0YWxPYmplY3RzIGlzIG5vdCBzYWZlIGZvciBjb25zZXJ2YXRp dmUgR0MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 ODk5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHVz ZUltbW9ydGFsT2JqZWN0cyBzZXQgdGhlIG1hcmsgYml0IHRvIGtlZXAgYW4gb2JqZWN0IGZyb20g YmVpbmcKKyAgICAgICAgcmVhbGxvY2F0ZWQuIFRoaXMgaGFkIHRoZSBuZWdhdGl2ZSBzaWRlLWVm ZmVjdCBvZiBjb252aW5jaW5nIHRoZQorICAgICAgICBjb25zZXJ2YXRpdmUgbWFya2VyIHRoYXQg dGhlIG9iamVjdCB3YXMgYSB2YWxpZCBhbmQgbGl2ZSBjZWxsLCB3aGljaAorICAgICAgICB3b3Vs ZCBjYXVzZSB1cyB0byB2aXNpdCBnYXJiYWdlLgorCisgICAgICAgICogaGVhcC9IZWFwLmNwcDoK KyAgICAgICAgKEpTQzo6SGVhcDo6ZGlkRmluaXNoQ29sbGVjdGlvbik6CisgICAgICAgIChKU0M6 OkhlYXA6OnJlc3VtZUNvbXBpbGVyVGhyZWFkcyk6CisgICAgICAgIChKU0M6OkhlYXA6OnNldEZ1 bGxBY3Rpdml0eUNhbGxiYWNrKToKKyAgICAgICAgKEpTQzo6SGVhcDo6bWFya0RlYWRPYmplY3Rz KTogRGVsZXRlZC4KKyAgICAgICAgKiBoZWFwL0hlYXAuaDogRG9uJ3Qgc2V0IHRoZSBtYXJrIGJp dCBvbiBhIGRlYWQgb2JqZWN0LiBUaGF0J3MgYSBidWcgaW4KKyAgICAgICAgYSBjb25zZXJ2YXRp dmUgR0MuCisKKyAgICAgICAgKiBoZWFwL01hcmtlZEFsbG9jYXRvci5jcHA6CisgICAgICAgIChK U0M6Ok1hcmtlZEFsbG9jYXRvcjo6cmV0aXJlKTogTmV3IGhlbHBlci4KKworICAgICAgICAoSlND OjpNYXJrZWRBbGxvY2F0b3I6OnJlc2V0KTogQXV0b21hdGljYWxseSByZXRpcmUgb2xkIGJsb2Nr cyB3aGVuCisgICAgICAgIHdlJ3JlIGRvaW5nIHRoZSBpbW1vcnRhbCBvYmplY3RzIHRoaW5nLiBU aGlzIGhhcyB0aGUgZWZmZWN0IG9mCisgICAgICAgIHByZXNlcnZpbmcgbWVtb3J5IGZvciBkZWJ1 Z2dpbmcgYmVjYXVzZSB3ZSBuZXZlciByZWN5Y2xlIGEgcHJldmlvdXNseQorICAgICAgICBhbGxv Y2F0ZWQgYmxvY2suCisKIDIwMTYtMDYtMjEgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5j b20+CiAKICAgICAgICAgQ29kZUJsb2NrOjpzaHJpbmtUb0ZpdCBpcyByYWN5CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAkocmV2aXNpb24gMjAyMTcwKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MiwyMCArMjUy LDYgQEAgc3RhdGljIGlubGluZSBib29sIGlzVmFsaWRUaHJlYWRTdGF0ZShWTQogICAgIHJldHVy biB0cnVlOwogfQogCi1zdHJ1Y3QgTWFya09iamVjdCA6IHB1YmxpYyBNYXJrZWRCbG9jazo6Vm9p ZEZ1bmN0b3IgewotICAgIGlubGluZSB2b2lkIHZpc2l0KEpTQ2VsbCogY2VsbCkKLSAgICB7Ci0g ICAgICAgIGlmIChjZWxsLT5pc1phcHBlZCgpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICBIZWFwOjpoZWFwKGNlbGwpLT5zZXRNYXJrZWQoY2VsbCk7Ci0gICAgfQotICAgIEl0ZXJhdGlv blN0YXR1cyBvcGVyYXRvcigpKEpTQ2VsbCogY2VsbCkKLSAgICB7Ci0gICAgICAgIHZpc2l0KGNl bGwpOwotICAgICAgICByZXR1cm4gSXRlcmF0aW9uU3RhdHVzOjpDb250aW51ZTsKLSAgICB9Ci19 OwotCiBzdHJ1Y3QgQ291bnQgOiBwdWJsaWMgTWFya2VkQmxvY2s6OkNvdW50RnVuY3RvciB7CiAg ICAgdm9pZCBvcGVyYXRvcigpKEpTQ2VsbCopIHsgY291bnQoMSk7IH0KIH07CkBAIC0xNDcyLDkg KzE0NTgsNiBAQCB2b2lkIEhlYXA6OmRpZEZpbmlzaENvbGxlY3Rpb24oZG91YmxlIGdjCiAgICAg aWYgKE9wdGlvbnM6OnVzZVpvbWJpZU1vZGUoKSkKICAgICAgICAgem9tYmlmeURlYWRPYmplY3Rz KCk7CiAKLSAgICBpZiAoT3B0aW9uczo6dXNlSW1tb3J0YWxPYmplY3RzKCkpCi0gICAgICAgIG1h cmtEZWFkT2JqZWN0cygpOwotCiAgICAgaWYgKE9wdGlvbnM6OmR1bXBPYmplY3RTdGF0aXN0aWNz KCkpCiAgICAgICAgIEhlYXBTdGF0aXN0aWNzOjpkdW1wT2JqZWN0U3RhdGlzdGljcyh0aGlzKTsK IApAQCAtMTUwMywxMiArMTQ4Niw2IEBAIHZvaWQgSGVhcDo6cmVzdW1lQ29tcGlsZXJUaHJlYWRz KCkKICNlbmRpZgogfQogCi12b2lkIEhlYXA6Om1hcmtEZWFkT2JqZWN0cygpCi17Ci0gICAgSGVh cEl0ZXJhdGlvblNjb3BlIGl0ZXJhdGlvblNjb3BlKCp0aGlzKTsKLSAgICBtX29iamVjdFNwYWNl LmZvckVhY2hEZWFkQ2VsbDxNYXJrT2JqZWN0PihpdGVyYXRpb25TY29wZSk7Ci19Ci0KIHZvaWQg SGVhcDo6c2V0RnVsbEFjdGl2aXR5Q2FsbGJhY2soUGFzc1JlZlB0cjxGdWxsR0NBY3Rpdml0eUNh bGxiYWNrPiBhY3Rpdml0eUNhbGxiYWNrKQogewogICAgIG1fZnVsbEFjdGl2aXR5Q2FsbGJhY2sg PSBhY3Rpdml0eUNhbGxiYWNrOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVh cC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaAkocmV2 aXNpb24gMjAyMTcwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNDIsNyArMzQyLDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZEZpbmlz aENvbGxlY3Rpb24oZG91YmxlIGdjU3RhcnRUaW1lKTsKICAgICB2b2lkIHJlc3VtZUNvbXBpbGVy VGhyZWFkcygpOwogICAgIHZvaWQgem9tYmlmeURlYWRPYmplY3RzKCk7Ci0gICAgdm9pZCBtYXJr RGVhZE9iamVjdHMoKTsKICAgICB2b2lkIGdhdGhlckV4dHJhSGVhcFNuYXBzaG90RGF0YShIZWFw UHJvZmlsZXImKTsKICAgICB2b2lkIHJlbW92ZURlYWRIZWFwU25hcHNob3ROb2RlcyhIZWFwUHJv ZmlsZXImKTsKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkQWxsb2Nh dG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRB bGxvY2F0b3IuY3BwCShyZXZpc2lvbiAyMDIxNzApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aGVhcC9NYXJrZWRBbGxvY2F0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OSw2ICs1OSwxMyBA QCBib29sIE1hcmtlZEFsbG9jYXRvcjo6aXNQYWdlZE91dChkb3VibGUgCiAgICAgcmV0dXJuIGZh bHNlOwogfQogCit2b2lkIE1hcmtlZEFsbG9jYXRvcjo6cmV0aXJlKE1hcmtlZEJsb2NrKiBibG9j aykKK3sKKyAgICBtX2Jsb2NrTGlzdC5yZW1vdmUoYmxvY2spOworICAgIG1fcmV0aXJlZEJsb2Nr cy5wdXNoKGJsb2NrKTsKKyAgICBibG9jay0+ZGlkUmV0aXJlQmxvY2soZnJlZUxpc3QpOworfQor CiBpbmxpbmUgdm9pZCogTWFya2VkQWxsb2NhdG9yOjp0cnlBbGxvY2F0ZUhlbHBlcihzaXplX3Qg Ynl0ZXMpCiB7CiAgICAgaWYgKG1fY3VycmVudEJsb2NrKSB7CkBAIC03Niw5ICs4Myw3IEBAIGlu bGluZSB2b2lkKiBNYXJrZWRBbGxvY2F0b3I6OnRyeUFsbG9jYXQKICAgICAgICAgZG91YmxlIHV0 aWxpemF0aW9uID0gKChkb3VibGUpTWFya2VkQmxvY2s6OmJsb2NrU2l6ZSAtIChkb3VibGUpZnJl ZUxpc3QuYnl0ZXMpIC8gKGRvdWJsZSlNYXJrZWRCbG9jazo6YmxvY2tTaXplOwogICAgICAgICBp ZiAodXRpbGl6YXRpb24gPj0gT3B0aW9uczo6bWluTWFya2VkQmxvY2tVdGlsaXphdGlvbigpKSB7 CiAgICAgICAgICAgICBBU1NFUlQoZnJlZUxpc3QuYnl0ZXMgfHwgIWZyZWVMaXN0LmhlYWQpOwot ICAgICAgICAgICAgbV9ibG9ja0xpc3QucmVtb3ZlKGJsb2NrKTsKLSAgICAgICAgICAgIG1fcmV0 aXJlZEJsb2Nrcy5wdXNoKGJsb2NrKTsKLSAgICAgICAgICAgIGJsb2NrLT5kaWRSZXRpcmVCbG9j ayhmcmVlTGlzdCk7CisgICAgICAgICAgICByZXRpcmUoYmxvY2spOwogICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgIH0KIApAQCAtMjE2LDYgKzIyMSwxNSBAQCB2b2lkIE1hcmtlZEFsbG9j YXRvcjo6cmVzZXQoKQogICAgICAgICBtX2Jsb2NrTGlzdC5hcHBlbmQobV9yZXRpcmVkQmxvY2tz KTsKIAogICAgIG1fbmV4dEJsb2NrVG9Td2VlcCA9IG1fYmxvY2tMaXN0LmhlYWQoKTsKKworICAg IGlmIChPcHRpb25zOjp1c2VJbW1vcnRhbE9iamVjdHMoKSkgeworICAgICAgICBNYXJrZWRCbG9j ayogbmV4dDsKKyAgICAgICAgZm9yIChNYXJrZWRCbG9jayomIGJsb2NrID0gbV9uZXh0QmxvY2tU b1N3ZWVwOyBibG9jazsgYmxvY2sgPSBuZXh0KSB7CisgICAgICAgICAgICBuZXh0ID0gYmxvY2st Pm5leHQoKTsKKworICAgICAgICAgICAgcmV0aXJlKGJsb2NrKTsKKyAgICAgICAgfQorICAgIH0K IH0KIAogc3RydWN0IExhc3RDaGFuY2VUb0ZpbmFsaXplIDogTWFya2VkQmxvY2s6OlZvaWRGdW5j dG9yIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRv ci5oCShyZXZpc2lvbiAyMDIxNzApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJr ZWRBbGxvY2F0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtNzIsNiArNzIsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQqIHRyeVBvcEZyZWVMaXN0KHNpemVfdCk7CiAgICAgTWFya2VkQmxvY2sqIGFsbG9j YXRlQmxvY2soc2l6ZV90KTsKICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgZG9UZXN0Q29sbGVjdGlv bnNJZk5lZWRlZCgpOworICAgIHZvaWQgcmV0aXJlKE1hcmtlZEJsb2NrKik7CiAgICAgCiAgICAg TWFya2VkQmxvY2s6OkZyZWVMaXN0IG1fZnJlZUxpc3Q7CiAgICAgTWFya2VkQmxvY2sqIG1fY3Vy cmVudEJsb2NrOwo= 281788 2016-06-21 15:32:29 -0700 2016-06-21 15:33:48 -0700 Patch for landing bug-158999-20160621153221.patch text/plain 5593 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAyMjk0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBA CisyMDE2LTA2LTIxICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgT3B0aW9uczo6dXNlSW1tb3J0YWxPYmplY3RzIGlzIG5vdCBzYWZlIGZvciBjb25zZXJ2YXRp dmUgR0MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 ODk5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHVz ZUltbW9ydGFsT2JqZWN0cyBzZXQgdGhlIG1hcmsgYml0IHRvIGtlZXAgYW4gb2JqZWN0IGZyb20g YmVpbmcKKyAgICAgICAgcmVhbGxvY2F0ZWQuIFRoaXMgaGFkIHRoZSBuZWdhdGl2ZSBzaWRlLWVm ZmVjdCBvZiBjb252aW5jaW5nIHRoZQorICAgICAgICBjb25zZXJ2YXRpdmUgbWFya2VyIHRoYXQg dGhlIG9iamVjdCB3YXMgYSB2YWxpZCBhbmQgbGl2ZSBjZWxsLCB3aGljaAorICAgICAgICB3b3Vs ZCBjYXVzZSB1cyB0byB2aXNpdCBnYXJiYWdlLgorCisgICAgICAgICogaGVhcC9IZWFwLmNwcDoK KyAgICAgICAgKEpTQzo6SGVhcDo6ZGlkRmluaXNoQ29sbGVjdGlvbik6CisgICAgICAgIChKU0M6 OkhlYXA6OnJlc3VtZUNvbXBpbGVyVGhyZWFkcyk6CisgICAgICAgIChKU0M6OkhlYXA6OnNldEZ1 bGxBY3Rpdml0eUNhbGxiYWNrKToKKyAgICAgICAgKEpTQzo6SGVhcDo6bWFya0RlYWRPYmplY3Rz KTogRGVsZXRlZC4KKyAgICAgICAgKiBoZWFwL0hlYXAuaDogRG9uJ3Qgc2V0IHRoZSBtYXJrIGJp dCBvbiBhIGRlYWQgb2JqZWN0LiBUaGF0J3MgYSBidWcgaW4KKyAgICAgICAgYSBjb25zZXJ2YXRp dmUgR0MuCisKKyAgICAgICAgKiBoZWFwL01hcmtlZEFsbG9jYXRvci5jcHA6CisgICAgICAgIChK U0M6Ok1hcmtlZEFsbG9jYXRvcjo6cmV0aXJlKTogTmV3IGhlbHBlci4KKworICAgICAgICAoSlND OjpNYXJrZWRBbGxvY2F0b3I6OnJlc2V0KTogQXV0b21hdGljYWxseSByZXRpcmUgb2xkIGJsb2Nr cyB3aGVuCisgICAgICAgIHdlJ3JlIGRvaW5nIHRoZSBpbW1vcnRhbCBvYmplY3RzIHRoaW5nLiBU aGlzIGhhcyB0aGUgZWZmZWN0IG9mCisgICAgICAgIHByZXNlcnZpbmcgbWVtb3J5IGZvciBkZWJ1 Z2dpbmcgYmVjYXVzZSB3ZSBuZXZlciByZWN5Y2xlIGEgcHJldmlvdXNseQorICAgICAgICBhbGxv Y2F0ZWQgYmxvY2suCisKIDIwMTYtMDYtMjEgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5j b20+CiAKICAgICAgICAgQ29kZUJsb2NrOjpzaHJpbmtUb0ZpdCBpcyByYWN5CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAkocmV2aXNpb24gMjAyMTcwKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MiwyMCArMjUy LDYgQEAgc3RhdGljIGlubGluZSBib29sIGlzVmFsaWRUaHJlYWRTdGF0ZShWTQogICAgIHJldHVy biB0cnVlOwogfQogCi1zdHJ1Y3QgTWFya09iamVjdCA6IHB1YmxpYyBNYXJrZWRCbG9jazo6Vm9p ZEZ1bmN0b3IgewotICAgIGlubGluZSB2b2lkIHZpc2l0KEpTQ2VsbCogY2VsbCkKLSAgICB7Ci0g ICAgICAgIGlmIChjZWxsLT5pc1phcHBlZCgpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICBIZWFwOjpoZWFwKGNlbGwpLT5zZXRNYXJrZWQoY2VsbCk7Ci0gICAgfQotICAgIEl0ZXJhdGlv blN0YXR1cyBvcGVyYXRvcigpKEpTQ2VsbCogY2VsbCkKLSAgICB7Ci0gICAgICAgIHZpc2l0KGNl bGwpOwotICAgICAgICByZXR1cm4gSXRlcmF0aW9uU3RhdHVzOjpDb250aW51ZTsKLSAgICB9Ci19 OwotCiBzdHJ1Y3QgQ291bnQgOiBwdWJsaWMgTWFya2VkQmxvY2s6OkNvdW50RnVuY3RvciB7CiAg ICAgdm9pZCBvcGVyYXRvcigpKEpTQ2VsbCopIHsgY291bnQoMSk7IH0KIH07CkBAIC0xNDcyLDkg KzE0NTgsNiBAQCB2b2lkIEhlYXA6OmRpZEZpbmlzaENvbGxlY3Rpb24oZG91YmxlIGdjCiAgICAg aWYgKE9wdGlvbnM6OnVzZVpvbWJpZU1vZGUoKSkKICAgICAgICAgem9tYmlmeURlYWRPYmplY3Rz KCk7CiAKLSAgICBpZiAoT3B0aW9uczo6dXNlSW1tb3J0YWxPYmplY3RzKCkpCi0gICAgICAgIG1h cmtEZWFkT2JqZWN0cygpOwotCiAgICAgaWYgKE9wdGlvbnM6OmR1bXBPYmplY3RTdGF0aXN0aWNz KCkpCiAgICAgICAgIEhlYXBTdGF0aXN0aWNzOjpkdW1wT2JqZWN0U3RhdGlzdGljcyh0aGlzKTsK IApAQCAtMTUwMywxMiArMTQ4Niw2IEBAIHZvaWQgSGVhcDo6cmVzdW1lQ29tcGlsZXJUaHJlYWRz KCkKICNlbmRpZgogfQogCi12b2lkIEhlYXA6Om1hcmtEZWFkT2JqZWN0cygpCi17Ci0gICAgSGVh cEl0ZXJhdGlvblNjb3BlIGl0ZXJhdGlvblNjb3BlKCp0aGlzKTsKLSAgICBtX29iamVjdFNwYWNl LmZvckVhY2hEZWFkQ2VsbDxNYXJrT2JqZWN0PihpdGVyYXRpb25TY29wZSk7Ci19Ci0KIHZvaWQg SGVhcDo6c2V0RnVsbEFjdGl2aXR5Q2FsbGJhY2soUGFzc1JlZlB0cjxGdWxsR0NBY3Rpdml0eUNh bGxiYWNrPiBhY3Rpdml0eUNhbGxiYWNrKQogewogICAgIG1fZnVsbEFjdGl2aXR5Q2FsbGJhY2sg PSBhY3Rpdml0eUNhbGxiYWNrOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVh cC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaAkocmV2 aXNpb24gMjAyMTcwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNDIsNyArMzQyLDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZEZpbmlz aENvbGxlY3Rpb24oZG91YmxlIGdjU3RhcnRUaW1lKTsKICAgICB2b2lkIHJlc3VtZUNvbXBpbGVy VGhyZWFkcygpOwogICAgIHZvaWQgem9tYmlmeURlYWRPYmplY3RzKCk7Ci0gICAgdm9pZCBtYXJr RGVhZE9iamVjdHMoKTsKICAgICB2b2lkIGdhdGhlckV4dHJhSGVhcFNuYXBzaG90RGF0YShIZWFw UHJvZmlsZXImKTsKICAgICB2b2lkIHJlbW92ZURlYWRIZWFwU25hcHNob3ROb2RlcyhIZWFwUHJv ZmlsZXImKTsKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkQWxsb2Nh dG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRB bGxvY2F0b3IuY3BwCShyZXZpc2lvbiAyMDIxNzApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aGVhcC9NYXJrZWRBbGxvY2F0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OSw2ICs1OSwxMyBA QCBib29sIE1hcmtlZEFsbG9jYXRvcjo6aXNQYWdlZE91dChkb3VibGUgCiAgICAgcmV0dXJuIGZh bHNlOwogfQogCit2b2lkIE1hcmtlZEFsbG9jYXRvcjo6cmV0aXJlKE1hcmtlZEJsb2NrKiBibG9j aywgTWFya2VkQmxvY2s6OkZyZWVMaXN0JiBmcmVlTGlzdCkKK3sKKyAgICBtX2Jsb2NrTGlzdC5y ZW1vdmUoYmxvY2spOworICAgIG1fcmV0aXJlZEJsb2Nrcy5wdXNoKGJsb2NrKTsKKyAgICBibG9j ay0+ZGlkUmV0aXJlQmxvY2soZnJlZUxpc3QpOworfQorCiBpbmxpbmUgdm9pZCogTWFya2VkQWxs b2NhdG9yOjp0cnlBbGxvY2F0ZUhlbHBlcihzaXplX3QgYnl0ZXMpCiB7CiAgICAgaWYgKG1fY3Vy cmVudEJsb2NrKSB7CkBAIC03Niw5ICs4Myw3IEBAIGlubGluZSB2b2lkKiBNYXJrZWRBbGxvY2F0 b3I6OnRyeUFsbG9jYXQKICAgICAgICAgZG91YmxlIHV0aWxpemF0aW9uID0gKChkb3VibGUpTWFy a2VkQmxvY2s6OmJsb2NrU2l6ZSAtIChkb3VibGUpZnJlZUxpc3QuYnl0ZXMpIC8gKGRvdWJsZSlN YXJrZWRCbG9jazo6YmxvY2tTaXplOwogICAgICAgICBpZiAodXRpbGl6YXRpb24gPj0gT3B0aW9u czo6bWluTWFya2VkQmxvY2tVdGlsaXphdGlvbigpKSB7CiAgICAgICAgICAgICBBU1NFUlQoZnJl ZUxpc3QuYnl0ZXMgfHwgIWZyZWVMaXN0LmhlYWQpOwotICAgICAgICAgICAgbV9ibG9ja0xpc3Qu cmVtb3ZlKGJsb2NrKTsKLSAgICAgICAgICAgIG1fcmV0aXJlZEJsb2Nrcy5wdXNoKGJsb2NrKTsK LSAgICAgICAgICAgIGJsb2NrLT5kaWRSZXRpcmVCbG9jayhmcmVlTGlzdCk7CisgICAgICAgICAg ICByZXRpcmUoYmxvY2spOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIApAQCAt MjE2LDYgKzIyMSwxNiBAQCB2b2lkIE1hcmtlZEFsbG9jYXRvcjo6cmVzZXQoKQogICAgICAgICBt X2Jsb2NrTGlzdC5hcHBlbmQobV9yZXRpcmVkQmxvY2tzKTsKIAogICAgIG1fbmV4dEJsb2NrVG9T d2VlcCA9IG1fYmxvY2tMaXN0LmhlYWQoKTsKKworICAgIGlmIChVTkxJS0VMWShPcHRpb25zOjp1 c2VJbW1vcnRhbE9iamVjdHMoKSkpIHsKKyAgICAgICAgTWFya2VkQmxvY2sqIG5leHQ7CisgICAg ICAgIGZvciAoTWFya2VkQmxvY2sqJiBibG9jayA9IG1fbmV4dEJsb2NrVG9Td2VlcDsgYmxvY2s7 IGJsb2NrID0gbmV4dCkgeworICAgICAgICAgICAgbmV4dCA9IGJsb2NrLT5uZXh0KCk7CisKKyAg ICAgICAgICAgIE1hcmtlZEJsb2NrOjpGcmVlTGlzdCBmcmVlTGlzdCA9IGJsb2NrLT5zd2VlcChN YXJrZWRCbG9jazo6U3dlZXBUb0ZyZWVMaXN0KTsKKyAgICAgICAgICAgIHJldGlyZShibG9jaywg ZnJlZUxpc3QpOworICAgICAgICB9CisgICAgfQogfQogCiBzdHJ1Y3QgTGFzdENoYW5jZVRvRmlu YWxpemUgOiBNYXJrZWRCbG9jazo6Vm9pZEZ1bmN0b3IgewpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2hlYXAvTWFya2VkQWxsb2NhdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2hlYXAvTWFya2VkQWxsb2NhdG9yLmgJKHJldmlzaW9uIDIwMjE3MCkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5oCSh3b3JraW5nIGNvcHkp CkBAIC03Miw2ICs3Miw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCogdHJ5UG9wRnJlZUxpc3Qoc2l6 ZV90KTsKICAgICBNYXJrZWRCbG9jayogYWxsb2NhdGVCbG9jayhzaXplX3QpOwogICAgIEFMV0FZ U19JTkxJTkUgdm9pZCBkb1Rlc3RDb2xsZWN0aW9uc0lmTmVlZGVkKCk7CisgICAgdm9pZCByZXRp cmUoTWFya2VkQmxvY2sqLCBNYXJrZWRCbG9jazo6RnJlZUxpc3QmKTsKICAgICAKICAgICBNYXJr ZWRCbG9jazo6RnJlZUxpc3QgbV9mcmVlTGlzdDsKICAgICBNYXJrZWRCbG9jayogbV9jdXJyZW50 QmxvY2s7Cg== 281789 2016-06-21 15:33:51 -0700 2016-06-21 16:06:18 -0700 Patch for landing bug-158999-20160621153343.patch text/plain 5603 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAyMjk0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBA CisyMDE2LTA2LTIxICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgT3B0aW9uczo6dXNlSW1tb3J0YWxPYmplY3RzIGlzIG5vdCBzYWZlIGZvciBjb25zZXJ2YXRp dmUgR0MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 ODk5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHVz ZUltbW9ydGFsT2JqZWN0cyBzZXQgdGhlIG1hcmsgYml0IHRvIGtlZXAgYW4gb2JqZWN0IGZyb20g YmVpbmcKKyAgICAgICAgcmVhbGxvY2F0ZWQuIFRoaXMgaGFkIHRoZSBuZWdhdGl2ZSBzaWRlLWVm ZmVjdCBvZiBjb252aW5jaW5nIHRoZQorICAgICAgICBjb25zZXJ2YXRpdmUgbWFya2VyIHRoYXQg dGhlIG9iamVjdCB3YXMgYSB2YWxpZCBhbmQgbGl2ZSBjZWxsLCB3aGljaAorICAgICAgICB3b3Vs ZCBjYXVzZSB1cyB0byB2aXNpdCBnYXJiYWdlLgorCisgICAgICAgICogaGVhcC9IZWFwLmNwcDoK KyAgICAgICAgKEpTQzo6SGVhcDo6ZGlkRmluaXNoQ29sbGVjdGlvbik6CisgICAgICAgIChKU0M6 OkhlYXA6OnJlc3VtZUNvbXBpbGVyVGhyZWFkcyk6CisgICAgICAgIChKU0M6OkhlYXA6OnNldEZ1 bGxBY3Rpdml0eUNhbGxiYWNrKToKKyAgICAgICAgKEpTQzo6SGVhcDo6bWFya0RlYWRPYmplY3Rz KTogRGVsZXRlZC4KKyAgICAgICAgKiBoZWFwL0hlYXAuaDogRG9uJ3Qgc2V0IHRoZSBtYXJrIGJp dCBvbiBhIGRlYWQgb2JqZWN0LiBUaGF0J3MgYSBidWcgaW4KKyAgICAgICAgYSBjb25zZXJ2YXRp dmUgR0MuCisKKyAgICAgICAgKiBoZWFwL01hcmtlZEFsbG9jYXRvci5jcHA6CisgICAgICAgIChK U0M6Ok1hcmtlZEFsbG9jYXRvcjo6cmV0aXJlKTogTmV3IGhlbHBlci4KKworICAgICAgICAoSlND OjpNYXJrZWRBbGxvY2F0b3I6OnJlc2V0KTogQXV0b21hdGljYWxseSByZXRpcmUgb2xkIGJsb2Nr cyB3aGVuCisgICAgICAgIHdlJ3JlIGRvaW5nIHRoZSBpbW1vcnRhbCBvYmplY3RzIHRoaW5nLiBU aGlzIGhhcyB0aGUgZWZmZWN0IG9mCisgICAgICAgIHByZXNlcnZpbmcgbWVtb3J5IGZvciBkZWJ1 Z2dpbmcgYmVjYXVzZSB3ZSBuZXZlciByZWN5Y2xlIGEgcHJldmlvdXNseQorICAgICAgICBhbGxv Y2F0ZWQgYmxvY2suCisKIDIwMTYtMDYtMjEgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5j b20+CiAKICAgICAgICAgQ29kZUJsb2NrOjpzaHJpbmtUb0ZpdCBpcyByYWN5CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAkocmV2aXNpb24gMjAyMTcwKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MiwyMCArMjUy LDYgQEAgc3RhdGljIGlubGluZSBib29sIGlzVmFsaWRUaHJlYWRTdGF0ZShWTQogICAgIHJldHVy biB0cnVlOwogfQogCi1zdHJ1Y3QgTWFya09iamVjdCA6IHB1YmxpYyBNYXJrZWRCbG9jazo6Vm9p ZEZ1bmN0b3IgewotICAgIGlubGluZSB2b2lkIHZpc2l0KEpTQ2VsbCogY2VsbCkKLSAgICB7Ci0g ICAgICAgIGlmIChjZWxsLT5pc1phcHBlZCgpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICBIZWFwOjpoZWFwKGNlbGwpLT5zZXRNYXJrZWQoY2VsbCk7Ci0gICAgfQotICAgIEl0ZXJhdGlv blN0YXR1cyBvcGVyYXRvcigpKEpTQ2VsbCogY2VsbCkKLSAgICB7Ci0gICAgICAgIHZpc2l0KGNl bGwpOwotICAgICAgICByZXR1cm4gSXRlcmF0aW9uU3RhdHVzOjpDb250aW51ZTsKLSAgICB9Ci19 OwotCiBzdHJ1Y3QgQ291bnQgOiBwdWJsaWMgTWFya2VkQmxvY2s6OkNvdW50RnVuY3RvciB7CiAg ICAgdm9pZCBvcGVyYXRvcigpKEpTQ2VsbCopIHsgY291bnQoMSk7IH0KIH07CkBAIC0xNDcyLDkg KzE0NTgsNiBAQCB2b2lkIEhlYXA6OmRpZEZpbmlzaENvbGxlY3Rpb24oZG91YmxlIGdjCiAgICAg aWYgKE9wdGlvbnM6OnVzZVpvbWJpZU1vZGUoKSkKICAgICAgICAgem9tYmlmeURlYWRPYmplY3Rz KCk7CiAKLSAgICBpZiAoT3B0aW9uczo6dXNlSW1tb3J0YWxPYmplY3RzKCkpCi0gICAgICAgIG1h cmtEZWFkT2JqZWN0cygpOwotCiAgICAgaWYgKE9wdGlvbnM6OmR1bXBPYmplY3RTdGF0aXN0aWNz KCkpCiAgICAgICAgIEhlYXBTdGF0aXN0aWNzOjpkdW1wT2JqZWN0U3RhdGlzdGljcyh0aGlzKTsK IApAQCAtMTUwMywxMiArMTQ4Niw2IEBAIHZvaWQgSGVhcDo6cmVzdW1lQ29tcGlsZXJUaHJlYWRz KCkKICNlbmRpZgogfQogCi12b2lkIEhlYXA6Om1hcmtEZWFkT2JqZWN0cygpCi17Ci0gICAgSGVh cEl0ZXJhdGlvblNjb3BlIGl0ZXJhdGlvblNjb3BlKCp0aGlzKTsKLSAgICBtX29iamVjdFNwYWNl LmZvckVhY2hEZWFkQ2VsbDxNYXJrT2JqZWN0PihpdGVyYXRpb25TY29wZSk7Ci19Ci0KIHZvaWQg SGVhcDo6c2V0RnVsbEFjdGl2aXR5Q2FsbGJhY2soUGFzc1JlZlB0cjxGdWxsR0NBY3Rpdml0eUNh bGxiYWNrPiBhY3Rpdml0eUNhbGxiYWNrKQogewogICAgIG1fZnVsbEFjdGl2aXR5Q2FsbGJhY2sg PSBhY3Rpdml0eUNhbGxiYWNrOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVh cC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaAkocmV2 aXNpb24gMjAyMTcwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNDIsNyArMzQyLDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZEZpbmlz aENvbGxlY3Rpb24oZG91YmxlIGdjU3RhcnRUaW1lKTsKICAgICB2b2lkIHJlc3VtZUNvbXBpbGVy VGhyZWFkcygpOwogICAgIHZvaWQgem9tYmlmeURlYWRPYmplY3RzKCk7Ci0gICAgdm9pZCBtYXJr RGVhZE9iamVjdHMoKTsKICAgICB2b2lkIGdhdGhlckV4dHJhSGVhcFNuYXBzaG90RGF0YShIZWFw UHJvZmlsZXImKTsKICAgICB2b2lkIHJlbW92ZURlYWRIZWFwU25hcHNob3ROb2RlcyhIZWFwUHJv ZmlsZXImKTsKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkQWxsb2Nh dG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRB bGxvY2F0b3IuY3BwCShyZXZpc2lvbiAyMDIxNzApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aGVhcC9NYXJrZWRBbGxvY2F0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OSw2ICs1OSwxMyBA QCBib29sIE1hcmtlZEFsbG9jYXRvcjo6aXNQYWdlZE91dChkb3VibGUgCiAgICAgcmV0dXJuIGZh bHNlOwogfQogCit2b2lkIE1hcmtlZEFsbG9jYXRvcjo6cmV0aXJlKE1hcmtlZEJsb2NrKiBibG9j aywgTWFya2VkQmxvY2s6OkZyZWVMaXN0JiBmcmVlTGlzdCkKK3sKKyAgICBtX2Jsb2NrTGlzdC5y ZW1vdmUoYmxvY2spOworICAgIG1fcmV0aXJlZEJsb2Nrcy5wdXNoKGJsb2NrKTsKKyAgICBibG9j ay0+ZGlkUmV0aXJlQmxvY2soZnJlZUxpc3QpOworfQorCiBpbmxpbmUgdm9pZCogTWFya2VkQWxs b2NhdG9yOjp0cnlBbGxvY2F0ZUhlbHBlcihzaXplX3QgYnl0ZXMpCiB7CiAgICAgaWYgKG1fY3Vy cmVudEJsb2NrKSB7CkBAIC03Niw5ICs4Myw3IEBAIGlubGluZSB2b2lkKiBNYXJrZWRBbGxvY2F0 b3I6OnRyeUFsbG9jYXQKICAgICAgICAgZG91YmxlIHV0aWxpemF0aW9uID0gKChkb3VibGUpTWFy a2VkQmxvY2s6OmJsb2NrU2l6ZSAtIChkb3VibGUpZnJlZUxpc3QuYnl0ZXMpIC8gKGRvdWJsZSlN YXJrZWRCbG9jazo6YmxvY2tTaXplOwogICAgICAgICBpZiAodXRpbGl6YXRpb24gPj0gT3B0aW9u czo6bWluTWFya2VkQmxvY2tVdGlsaXphdGlvbigpKSB7CiAgICAgICAgICAgICBBU1NFUlQoZnJl ZUxpc3QuYnl0ZXMgfHwgIWZyZWVMaXN0LmhlYWQpOwotICAgICAgICAgICAgbV9ibG9ja0xpc3Qu cmVtb3ZlKGJsb2NrKTsKLSAgICAgICAgICAgIG1fcmV0aXJlZEJsb2Nrcy5wdXNoKGJsb2NrKTsK LSAgICAgICAgICAgIGJsb2NrLT5kaWRSZXRpcmVCbG9jayhmcmVlTGlzdCk7CisgICAgICAgICAg ICByZXRpcmUoYmxvY2ssIGZyZWVMaXN0KTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICB9CiAKQEAgLTIxNiw2ICsyMjEsMTYgQEAgdm9pZCBNYXJrZWRBbGxvY2F0b3I6OnJlc2V0KCkK ICAgICAgICAgbV9ibG9ja0xpc3QuYXBwZW5kKG1fcmV0aXJlZEJsb2Nrcyk7CiAKICAgICBtX25l eHRCbG9ja1RvU3dlZXAgPSBtX2Jsb2NrTGlzdC5oZWFkKCk7CisKKyAgICBpZiAoVU5MSUtFTFko T3B0aW9uczo6dXNlSW1tb3J0YWxPYmplY3RzKCkpKSB7CisgICAgICAgIE1hcmtlZEJsb2NrKiBu ZXh0OworICAgICAgICBmb3IgKE1hcmtlZEJsb2NrKiYgYmxvY2sgPSBtX25leHRCbG9ja1RvU3dl ZXA7IGJsb2NrOyBibG9jayA9IG5leHQpIHsKKyAgICAgICAgICAgIG5leHQgPSBibG9jay0+bmV4 dCgpOworCisgICAgICAgICAgICBNYXJrZWRCbG9jazo6RnJlZUxpc3QgZnJlZUxpc3QgPSBibG9j ay0+c3dlZXAoTWFya2VkQmxvY2s6OlN3ZWVwVG9GcmVlTGlzdCk7CisgICAgICAgICAgICByZXRp cmUoYmxvY2ssIGZyZWVMaXN0KTsKKyAgICAgICAgfQorICAgIH0KIH0KIAogc3RydWN0IExhc3RD aGFuY2VUb0ZpbmFsaXplIDogTWFya2VkQmxvY2s6OlZvaWRGdW5jdG9yIHsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5oCShyZXZpc2lvbiAyMDIx NzApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0b3IuaAkod29y a2luZyBjb3B5KQpAQCAtNzIsNiArNzIsNyBAQCBwcml2YXRlOgogICAgIHZvaWQqIHRyeVBvcEZy ZWVMaXN0KHNpemVfdCk7CiAgICAgTWFya2VkQmxvY2sqIGFsbG9jYXRlQmxvY2soc2l6ZV90KTsK ICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgZG9UZXN0Q29sbGVjdGlvbnNJZk5lZWRlZCgpOworICAg IHZvaWQgcmV0aXJlKE1hcmtlZEJsb2NrKiwgTWFya2VkQmxvY2s6OkZyZWVMaXN0Jik7CiAgICAg CiAgICAgTWFya2VkQmxvY2s6OkZyZWVMaXN0IG1fZnJlZUxpc3Q7CiAgICAgTWFya2VkQmxvY2sq IG1fY3VycmVudEJsb2NrOwo=