161751 2016-09-08 12:51:05 -0700 Heap version should be 32-bit 2016-09-08 21:52:58 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1227716 0 fpizlo 2016-09-08 12:51:05 -0700 Patch forthcoming. 1227717 1 288308 fpizlo 2016-09-08 12:53:14 -0700 Created attachment 288308 the patch 1227718 2 commit-queue 2016-09-08 12:55:02 -0700 Attachment 288308 did not pass style-queue: ERROR: Source/JavaScriptCore/heap/MarkedSpace.h:68: One space before end of line comments [whitespace/comments] [5] ERROR: Source/JavaScriptCore/heap/MarkedSpace.cpp:465: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] ERROR: Source/JavaScriptCore/heap/ConservativeRoots.h:54: The parameter name "heapVersion" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/heap/CellContainer.h:76: The parameter name "heapVersion" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/heap/MarkedBlock.h:189: The parameter name "heapVersion" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/heap/MarkedBlock.h:190: The parameter name "heapVersion" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/heap/MarkedBlock.h:269: The parameter name "heapVersion" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/heap/MarkedBlock.h:270: The parameter name "heapVersion" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 8 in 14 files If any of these errors are false positives, please file a bug against check-webkit-style. 1227721 3 288308 mark.lam 2016-09-08 13:02:06 -0700 Comment on attachment 288308 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=288308&action=review r=me. Please fix the fixable style issues that the style checker complained about. > Source/JavaScriptCore/heap/MarkedBlock.h:323 > + Please remove leading empty space characters. 1227723 4 fpizlo 2016-09-08 13:03:38 -0700 (In reply to comment #3) > Comment on attachment 288308 [details] > the patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=288308&action=review > > r=me. Please fix the fixable style issues that the style checker complained > about. OK > > > Source/JavaScriptCore/heap/MarkedBlock.h:323 > > + > > Please remove leading empty space characters. OK! Thanks for the review! 1227744 5 fpizlo 2016-09-08 13:39:58 -0700 Landed in https://trac.webkit.org/changeset/205658 1228045 6 288308 ggaren 2016-09-08 21:26:48 -0700 Comment on attachment 288308 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=288308&action=review > Source/JavaScriptCore/heap/MarkedSpace.h:68 > + static const HeapVersion initialVersion = 42; // This can be any value, including random garbage, so long as it's consistent for the lifetime of the process. It's an interesting tidbit that any value can work, but I'm not sure it's necessary or desirable to take advantage. 0 is the best value to delay flipping for as long as possible, and it is also the least comment-worthy. 1228052 7 fpizlo 2016-09-08 21:52:58 -0700 (In reply to comment #6) > Comment on attachment 288308 [details] > the patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=288308&action=review > > > Source/JavaScriptCore/heap/MarkedSpace.h:68 > > + static const HeapVersion initialVersion = 42; // This can be any value, including random garbage, so long as it's consistent for the lifetime of the process. > > It's an interesting tidbit that any value can work, but I'm not sure it's > necessary or desirable to take advantage. 0 is the best value to delay > flipping for as long as possible, and it is also the least comment-worthy. Wrap-around is not at zero. It's at the initial value. Therefore wrap-around happens after 2^32 flips, regardless of the initial value. That's sort of surprising, and I thought it deserved the comment. It's interesting that the comment fails to call out that it can be any value for not just correctness but performance, too. 288308 2016-09-08 12:53:14 -0700 2016-09-08 13:02:06 -0700 the patch blah.patch text/plain 13812 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA1NjU1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBA CisyMDE2LTA5LTA4ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg SGVhcCB2ZXJzaW9uIHNob3VsZCBiZSAzMi1iaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MTc1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgMzItYml0IGRldmljZXMgYXJlIHByb2JhYmx5 IGdldHRpbmcgaHVydCBieSB0aGUgNjQtYml0IHZlcnNpb24gbnVtYmVyLiBUaGUgcmVhc29uIHdo eSBJIG1hZGUKKyAgICAgICAgaXQgNjQtYml0IGluaXRpYWxseSBpcyBzbyB0aGF0IEkgd291bGRu J3QgaGF2ZSB0byB3b3JyeSBhYm91dCB3cmFwLWFyb3VuZC4gQnV0IHdyYXAtYXJvdW5kIGlzCisg ICAgICAgIGVhc3kgdG8gaGFuZGxlLgorCisgICAgICAgICogaGVhcC9DZWxsQ29udGFpbmVyLmg6 CisgICAgICAgICogaGVhcC9DZWxsQ29udGFpbmVySW5saW5lcy5oOgorICAgICAgICAoSlNDOjpD ZWxsQ29udGFpbmVyOjpmbGlwSWZOZWNlc3NhcnkpOgorICAgICAgICAqIGhlYXAvQ29uc2VydmF0 aXZlUm9vdHMuY3BwOgorICAgICAgICAoSlNDOjpDb25zZXJ2YXRpdmVSb290czo6Z2VuZXJpY0Fk ZFBvaW50ZXIpOgorICAgICAgICAoSlNDOjpDb25zZXJ2YXRpdmVSb290czo6Z2VuZXJpY0FkZFNw YW4pOgorICAgICAgICAqIGhlYXAvQ29uc2VydmF0aXZlUm9vdHMuaDoKKyAgICAgICAgKiBoZWFw L0hlYXAuaDoKKyAgICAgICAgKiBoZWFwL0hlYXBJbmxpbmVzLmg6CisgICAgICAgIChKU0M6Okhl YXA6OnRlc3RBbmRTZXRNYXJrZWQpOgorICAgICAgICAqIGhlYXAvSGVhcFV0aWwuaDoKKyAgICAg ICAgKEpTQzo6SGVhcFV0aWw6OmZpbmRHQ09iamVjdFBvaW50ZXJzRm9yTWFya2luZyk6CisgICAg ICAgICogaGVhcC9NYXJrZWRCbG9jay5jcHA6CisgICAgICAgIChKU0M6Ok1hcmtlZEJsb2NrOjpN YXJrZWRCbG9jayk6CisgICAgICAgICogaGVhcC9NYXJrZWRCbG9jay5oOgorICAgICAgICAoSlND OjpNYXJrZWRCbG9jazo6ZmxpcElmTmVjZXNzYXJ5KToKKyAgICAgICAgKEpTQzo6TWFya2VkQmxv Y2s6OmZsaXBJZk5lY2Vzc2FyeUNvbmN1cnJlbnRseSk6CisgICAgICAgIChKU0M6Ok1hcmtlZEJs b2NrOjpIYW5kbGU6OmZsaXBJZk5lY2Vzc2FyeSk6CisgICAgICAgIChKU0M6Ok1hcmtlZEJsb2Nr OjpIYW5kbGU6OmZsaXBJZk5lY2Vzc2FyeUNvbmN1cnJlbnRseSk6CisgICAgICAgICogaGVhcC9N YXJrZWRTcGFjZS5jcHA6CisgICAgICAgIChKU0M6Ok1hcmtlZFNwYWNlOjpmbGlwKToKKyAgICAg ICAgKiBoZWFwL01hcmtlZFNwYWNlLmg6CisgICAgICAgIChKU0M6Ok1hcmtlZFNwYWNlOjp2ZXJz aW9uKToKKyAgICAgICAgKiBoZWFwL1Nsb3RWaXNpdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6U2xv dFZpc2l0b3I6OlNsb3RWaXNpdG9yKToKKyAgICAgICAgKiBoZWFwL1Nsb3RWaXNpdG9yLmg6CisK IDIwMTYtMDktMDggIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBN b3ZlIEpTTWFwL0pTU2V0IG92ZXIgdG8gQXV4aWxpYXJ5IE1hcmtlZFNwYWNlCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaGVhcC9DZWxsQ29udGFpbmVyLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ2VsbENvbnRhaW5lci5oCShyZXZpc2lvbiAyMDU2NDcp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9DZWxsQ29udGFpbmVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTM0LDYgKzM0LDggQEAgY2xhc3MgTGFyZ2VBbGxvY2F0aW9uOwogY2xhc3MgTWFy a2VkQmxvY2s7CiBjbGFzcyBXZWFrU2V0OwogCit0eXBlZGVmIHVpbnQzMl90IEhlYXBWZXJzaW9u OworCiAvLyBUaGlzIGlzIGhvdyB3ZSBhYnN0cmFjdCBvdmVyIGVpdGhlciBNYXJrZWRCbG9jayYg b3IgTGFyZ2VBbGxvY2F0aW9uJi4gUHV0IHRoaW5ncyBpbiBoZXJlIGFzIHlvdQogLy8gZmluZCBu ZWVkIGZvciB0aGVtLgogCkBAIC03MSw3ICs3Myw3IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJu ICpiaXR3aXNlX2Nhc3Q8TGFyZ2VBbGxvY2F0aW9uKj4obV9lbmNvZGVkUG9pbnRlciAtIGlzTGFy Z2VBbGxvY2F0aW9uQml0KTsKICAgICB9CiAgICAgCi0gICAgdm9pZCBmbGlwSWZOZWNlc3Nhcnko dWludDY0X3QgaGVhcFZlcnNpb24pOworICAgIHZvaWQgZmxpcElmTmVjZXNzYXJ5KEhlYXBWZXJz aW9uIGhlYXBWZXJzaW9uKTsKICAgICB2b2lkIGZsaXBJZk5lY2Vzc2FyeSgpOwogICAgIAogICAg IGJvb2wgaXNNYXJrZWQoKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L0NlbGxDb250YWluZXJJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2hlYXAvQ2VsbENvbnRhaW5lcklubGluZXMuaAkocmV2aXNpb24gMjA1NjQ3KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ2VsbENvbnRhaW5lcklubGluZXMuaAkod29ya2luZyBj b3B5KQpAQCAtNzMsNyArNzMsNyBAQCBpbmxpbmUgV2Vha1NldCYgQ2VsbENvbnRhaW5lcjo6d2Vh a1NldCgpCiAgICAgcmV0dXJuIG1hcmtlZEJsb2NrKCkud2Vha1NldCgpOwogfQogCi1pbmxpbmUg dm9pZCBDZWxsQ29udGFpbmVyOjpmbGlwSWZOZWNlc3NhcnkodWludDY0X3QgaGVhcFZlcnNpb24p CitpbmxpbmUgdm9pZCBDZWxsQ29udGFpbmVyOjpmbGlwSWZOZWNlc3NhcnkoSGVhcFZlcnNpb24g aGVhcFZlcnNpb24pCiB7CiAgICAgaWYgKCFpc0xhcmdlQWxsb2NhdGlvbigpKQogICAgICAgICBt YXJrZWRCbG9jaygpLmZsaXBJZk5lY2Vzc2FyeShoZWFwVmVyc2lvbik7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaGVhcC9Db25zZXJ2YXRpdmVSb290cy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ29uc2VydmF0aXZlUm9vdHMuY3BwCShyZXZpc2lv biAyMDU2NDcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9Db25zZXJ2YXRpdmVSb290 cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY3LDcgKzY3LDcgQEAgdm9pZCBDb25zZXJ2YXRpdmVS b290czo6Z3JvdygpCiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIE1hcmtIb29rPgotaW5saW5lIHZv aWQgQ29uc2VydmF0aXZlUm9vdHM6OmdlbmVyaWNBZGRQb2ludGVyKHZvaWQqIHAsIGludDY0X3Qg dmVyc2lvbiwgVGlueUJsb29tRmlsdGVyIGZpbHRlciwgTWFya0hvb2smIG1hcmtIb29rKQoraW5s aW5lIHZvaWQgQ29uc2VydmF0aXZlUm9vdHM6OmdlbmVyaWNBZGRQb2ludGVyKHZvaWQqIHAsIEhl YXBWZXJzaW9uIHZlcnNpb24sIFRpbnlCbG9vbUZpbHRlciBmaWx0ZXIsIE1hcmtIb29rJiBtYXJr SG9vaykKIHsKICAgICBtYXJrSG9vay5tYXJrKHApOwogCkBAIC05Nyw3ICs5Nyw3IEBAIHZvaWQg Q29uc2VydmF0aXZlUm9vdHM6OmdlbmVyaWNBZGRTcGFuKHYKICAgICBSRUxFQVNFX0FTU0VSVChp c1BvaW50ZXJBbGlnbmVkKGVuZCkpOwogCiAgICAgVGlueUJsb29tRmlsdGVyIGZpbHRlciA9IG1f aGVhcC5vYmplY3RTcGFjZSgpLmJsb2NrcygpLmZpbHRlcigpOyAvLyBNYWtlIGEgbG9jYWwgY29w eSBvZiBmaWx0ZXIgdG8gc2hvdyB0aGUgY29tcGlsZXIgaXQgd29uJ3QgYWxpYXMsIGFuZCBjYW4g YmUgcmVnaXN0ZXItYWxsb2NhdGVkLgotICAgIGludDY0X3QgdmVyc2lvbiA9IG1faGVhcC5vYmpl Y3RTcGFjZSgpLnZlcnNpb24oKTsKKyAgICBIZWFwVmVyc2lvbiB2ZXJzaW9uID0gbV9oZWFwLm9i amVjdFNwYWNlKCkudmVyc2lvbigpOwogICAgIGZvciAoY2hhcioqIGl0ID0gc3RhdGljX2Nhc3Q8 Y2hhcioqPihiZWdpbik7IGl0ICE9IHN0YXRpY19jYXN0PGNoYXIqKj4oZW5kKTsgKytpdCkKICAg ICAgICAgZ2VuZXJpY0FkZFBvaW50ZXIoKml0LCB2ZXJzaW9uLCBmaWx0ZXIsIG1hcmtIb29rKTsK IH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0NvbnNlcnZhdGl2ZVJvb3RzLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ29uc2VydmF0aXZlUm9v dHMuaAkocmV2aXNpb24gMjA1NjQ3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ29u c2VydmF0aXZlUm9vdHMuaAkod29ya2luZyBjb3B5KQpAQCAtNTEsNyArNTEsNyBAQCBwcml2YXRl OgogICAgIHN0YXRpYyBjb25zdCBzaXplX3Qgbm9uSW5saW5lQ2FwYWNpdHkgPSA4MTkyIC8gc2l6 ZW9mKEhlYXBDZWxsKik7CiAgICAgCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgTWFya0hvb2s+Ci0g ICAgdm9pZCBnZW5lcmljQWRkUG9pbnRlcih2b2lkKiwgaW50NjRfdCBoZWFwVmVyc2lvbiwgVGlu eUJsb29tRmlsdGVyLCBNYXJrSG9vayYpOworICAgIHZvaWQgZ2VuZXJpY0FkZFBvaW50ZXIodm9p ZCosIEhlYXBWZXJzaW9uIGhlYXBWZXJzaW9uLCBUaW55Qmxvb21GaWx0ZXIsIE1hcmtIb29rJik7 CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBNYXJrSG9vaz4KICAgICB2b2lkIGdlbmVyaWNBZGRT cGFuKHZvaWQqLCB2b2lkKiBlbmQsIE1hcmtIb29rJik7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaGVhcC9IZWFwLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvSGVhcC5oCShyZXZpc2lvbiAyMDU2NDcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVh cC9IZWFwLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMSw3ICsxMDEsNyBAQCBwdWJsaWM6CiAKICAg ICBzdGF0aWMgYm9vbCBpc0xpdmUoY29uc3Qgdm9pZCopOwogICAgIHN0YXRpYyBib29sIGlzTWFy a2VkKGNvbnN0IHZvaWQqKTsKLSAgICBzdGF0aWMgYm9vbCB0ZXN0QW5kU2V0TWFya2VkKGludDY0 X3QsIGNvbnN0IHZvaWQqKTsKKyAgICBzdGF0aWMgYm9vbCB0ZXN0QW5kU2V0TWFya2VkKEhlYXBW ZXJzaW9uLCBjb25zdCB2b2lkKik7CiAgICAgc3RhdGljIHZvaWQgc2V0TWFya2VkKGNvbnN0IHZv aWQqKTsKICAgICAKICAgICBzdGF0aWMgc2l6ZV90IGNlbGxTaXplKGNvbnN0IHZvaWQqKTsKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXBJbmxpbmVzLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcElubGluZXMuaAkocmV2aXNpb24gMjA1 NjQ3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcElubGluZXMuaAkod29ya2lu ZyBjb3B5KQpAQCAtOTQsNyArOTQsNyBAQCBBTFdBWVNfSU5MSU5FIGJvb2wgSGVhcDo6aXNNYXJr ZWQoY29uc3QgCiAgICAgcmV0dXJuIGJsb2NrLmlzTWFya2VkKGNlbGwpOwogfQogCi1BTFdBWVNf SU5MSU5FIGJvb2wgSGVhcDo6dGVzdEFuZFNldE1hcmtlZChpbnQ2NF90IHZlcnNpb24sIGNvbnN0 IHZvaWQqIHJhd0NlbGwpCitBTFdBWVNfSU5MSU5FIGJvb2wgSGVhcDo6dGVzdEFuZFNldE1hcmtl ZChIZWFwVmVyc2lvbiB2ZXJzaW9uLCBjb25zdCB2b2lkKiByYXdDZWxsKQogewogICAgIEhlYXBD ZWxsKiBjZWxsID0gYml0d2lzZV9jYXN0PEhlYXBDZWxsKj4ocmF3Q2VsbCk7CiAgICAgaWYgKGNl bGwtPmlzTGFyZ2VBbGxvY2F0aW9uKCkpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVh cC9IZWFwVXRpbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hl YXBVdGlsLmgJKHJldmlzaW9uIDIwNTY0NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L0hlYXBVdGlsLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2LDcgQEAgcHVibGljOgogICAg IC8vIGJlZm9yZSBsaXZlbmVzcyBkYXRhIGlzIGNsZWFyZWQgdG8gYmUgYWNjdXJhdGUuCiAgICAg dGVtcGxhdGU8dHlwZW5hbWUgRnVuYz4KICAgICBzdGF0aWMgdm9pZCBmaW5kR0NPYmplY3RQb2lu dGVyc0Zvck1hcmtpbmcoCi0gICAgICAgIEhlYXAmIGhlYXAsIGludDY0X3QgaGVhcFZlcnNpb24s IFRpbnlCbG9vbUZpbHRlciBmaWx0ZXIsIHZvaWQqIHBhc3NlZFBvaW50ZXIsCisgICAgICAgIEhl YXAmIGhlYXAsIEhlYXBWZXJzaW9uIGhlYXBWZXJzaW9uLCBUaW55Qmxvb21GaWx0ZXIgZmlsdGVy LCB2b2lkKiBwYXNzZWRQb2ludGVyLAogICAgICAgICBjb25zdCBGdW5jJiBmdW5jKQogICAgIHsK ICAgICAgICAgY29uc3QgSGFzaFNldDxNYXJrZWRCbG9jayo+JiBzZXQgPSBoZWFwLm9iamVjdFNw YWNlKCkuYmxvY2tzKCkuc2V0KCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9N YXJrZWRCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAv TWFya2VkQmxvY2suY3BwCShyZXZpc2lvbiAyMDU2NDcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvaGVhcC9NYXJrZWRCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg1LDkgKzg1LDkgQEAg TWFya2VkQmxvY2s6OkhhbmRsZTo6fkhhbmRsZSgpCiAKIE1hcmtlZEJsb2NrOjpNYXJrZWRCbG9j ayhWTSYgdm0sIEhhbmRsZSYgaGFuZGxlKQogICAgIDogbV9uZWVkc0Rlc3RydWN0aW9uKGhhbmRs ZS5uZWVkc0Rlc3RydWN0aW9uKCkpCisgICAgLCBtX3ZlcnNpb24odm0uaGVhcC5vYmplY3RTcGFj ZSgpLnZlcnNpb24oKSkKICAgICAsIG1faGFuZGxlKGhhbmRsZSkKICAgICAsIG1fdm0oJnZtKQot ICAgICwgbV92ZXJzaW9uKHZtLmhlYXAub2JqZWN0U3BhY2UoKS52ZXJzaW9uKCkpCiB7CiAgICAg dW5zaWduZWQgY2VsbHNQZXJCbG9jayA9IE1hcmtlZFNwYWNlOjpibG9ja1BheWxvYWQgLyBoYW5k bGUuY2VsbFNpemUoKTsKICAgICBkb3VibGUgbWFya0NvdW50QmlhcyA9IC0oT3B0aW9uczo6bWlu TWFya2VkQmxvY2tVdGlsaXphdGlvbigpICogY2VsbHNQZXJCbG9jayk7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRCbG9jay5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEJsb2NrLmgJKHJldmlzaW9uIDIwNTY0NykKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEJsb2NrLmgJKHdvcmtpbmcgY29weSkKQEAg LTQyLDYgKzQyLDcgQEAgY2xhc3MgSlNDZWxsOwogY2xhc3MgTWFya2VkQWxsb2NhdG9yOwogCiB0 eXBlZGVmIHVpbnRwdHJfdCBCaXRzOwordHlwZWRlZiB1aW50MzJfdCBIZWFwVmVyc2lvbjsKIAog Ly8gU2V0IHRvIGxvZyBzdGF0ZSB0cmFuc2l0aW9ucyBvZiBibG9ja3MuCiAjZGVmaW5lIEhFQVBf TE9HX0JMT0NLX1NUQVRFX1RSQU5TSVRJT05TIDAKQEAgLTE4NSw4ICsxODYsOCBAQCBwdWJsaWM6 CiAgICAgICAgICAgICAKICAgICAgICAgYm9vbCBuZWVkc0ZsaXAoKTsKICAgICAgICAgICAgIAot ICAgICAgICB2b2lkIGZsaXBJZk5lY2Vzc2FyeUNvbmN1cnJlbnRseSh1aW50NjRfdCBoZWFwVmVy c2lvbik7Ci0gICAgICAgIHZvaWQgZmxpcElmTmVjZXNzYXJ5KHVpbnQ2NF90IGhlYXBWZXJzaW9u KTsKKyAgICAgICAgdm9pZCBmbGlwSWZOZWNlc3NhcnlDb25jdXJyZW50bHkoSGVhcFZlcnNpb24g aGVhcFZlcnNpb24pOworICAgICAgICB2b2lkIGZsaXBJZk5lY2Vzc2FyeShIZWFwVmVyc2lvbiBo ZWFwVmVyc2lvbik7CiAgICAgICAgIHZvaWQgZmxpcElmTmVjZXNzYXJ5KCk7CiAgICAgICAgICAg ICAKICAgICAgICAgdm9pZCBhc3NlcnRGbGlwcGVkKCk7CkBAIC0yNjUsOCArMjY2LDggQEAgcHVi bGljOgogCiAgICAgYm9vbCBuZWVkc0ZsaXAoKTsKICAgICAgICAgCi0gICAgdm9pZCBmbGlwSWZO ZWNlc3NhcnlDb25jdXJyZW50bHkodWludDY0X3QgaGVhcFZlcnNpb24pOwotICAgIHZvaWQgZmxp cElmTmVjZXNzYXJ5KHVpbnQ2NF90IGhlYXBWZXJzaW9uKTsKKyAgICB2b2lkIGZsaXBJZk5lY2Vz c2FyeUNvbmN1cnJlbnRseShIZWFwVmVyc2lvbiBoZWFwVmVyc2lvbik7CisgICAgdm9pZCBmbGlw SWZOZWNlc3NhcnkoSGVhcFZlcnNpb24gaGVhcFZlcnNpb24pOwogICAgIHZvaWQgZmxpcElmTmVj ZXNzYXJ5KCk7CiAgICAgICAgIAogICAgIHZvaWQgYXNzZXJ0RmxpcHBlZCgpOwpAQCAtMzE5LDEx ICszMjAsMTEgQEAgcHJpdmF0ZToKICAgICAvLwogICAgIC8vICAgICBtX2JpYXNlZE1hcmtDb3Vu dCAhPSBtX21hcmtDb3VudEJpYXMKICAgICBpbnQxNl90IG1fbWFya0NvdW50QmlhczsKKyAgICAg ICAgCisgICAgSGVhcFZlcnNpb24gbV92ZXJzaW9uOwogICAgIAogICAgIEhhbmRsZSYgbV9oYW5k bGU7CiAgICAgVk0qIG1fdm07Ci0gICAgICAgIAotICAgIHVpbnQ2NF90IG1fdmVyc2lvbjsKIH07 CiAKIGlubGluZSBNYXJrZWRCbG9jazo6SGFuZGxlJiBNYXJrZWRCbG9jazo6aGFuZGxlKCkKQEAg LTQ2MSwyNSArNDYyLDI1IEBAIGlubGluZSBzaXplX3QgTWFya2VkQmxvY2s6OmF0b21OdW1iZXIo Y28KICAgICByZXR1cm4gKHJlaW50ZXJwcmV0X2Nhc3Q8Qml0cz4ocCkgLSByZWludGVycHJldF9j YXN0PEJpdHM+KHRoaXMpKSAvIGF0b21TaXplOwogfQogCi1pbmxpbmUgdm9pZCBNYXJrZWRCbG9j azo6ZmxpcElmTmVjZXNzYXJ5KHVpbnQ2NF90IGhlYXBWZXJzaW9uKQoraW5saW5lIHZvaWQgTWFy a2VkQmxvY2s6OmZsaXBJZk5lY2Vzc2FyeShIZWFwVmVyc2lvbiBoZWFwVmVyc2lvbikKIHsKICAg ICBpZiAoVU5MSUtFTFkoaGVhcFZlcnNpb24gIT0gbV92ZXJzaW9uKSkKICAgICAgICAgZmxpcElm TmVjZXNzYXJ5U2xvdygpOwogfQogCi1pbmxpbmUgdm9pZCBNYXJrZWRCbG9jazo6ZmxpcElmTmVj ZXNzYXJ5Q29uY3VycmVudGx5KHVpbnQ2NF90IGhlYXBWZXJzaW9uKQoraW5saW5lIHZvaWQgTWFy a2VkQmxvY2s6OmZsaXBJZk5lY2Vzc2FyeUNvbmN1cnJlbnRseShIZWFwVmVyc2lvbiBoZWFwVmVy c2lvbikKIHsKICAgICBpZiAoVU5MSUtFTFkoaGVhcFZlcnNpb24gIT0gbV92ZXJzaW9uKSkKICAg ICAgICAgZmxpcElmTmVjZXNzYXJ5Q29uY3VycmVudGx5U2xvdygpOwogICAgIFdURjo6bG9hZExv YWRGZW5jZSgpOwogfQogCi1pbmxpbmUgdm9pZCBNYXJrZWRCbG9jazo6SGFuZGxlOjpmbGlwSWZO ZWNlc3NhcnkodWludDY0X3QgaGVhcFZlcnNpb24pCitpbmxpbmUgdm9pZCBNYXJrZWRCbG9jazo6 SGFuZGxlOjpmbGlwSWZOZWNlc3NhcnkoSGVhcFZlcnNpb24gaGVhcFZlcnNpb24pCiB7CiAgICAg YmxvY2soKS5mbGlwSWZOZWNlc3NhcnkoaGVhcFZlcnNpb24pOwogfQogCi1pbmxpbmUgdm9pZCBN YXJrZWRCbG9jazo6SGFuZGxlOjpmbGlwSWZOZWNlc3NhcnlDb25jdXJyZW50bHkodWludDY0X3Qg aGVhcFZlcnNpb24pCitpbmxpbmUgdm9pZCBNYXJrZWRCbG9jazo6SGFuZGxlOjpmbGlwSWZOZWNl c3NhcnlDb25jdXJyZW50bHkoSGVhcFZlcnNpb24gaGVhcFZlcnNpb24pCiB7CiAgICAgYmxvY2so KS5mbGlwSWZOZWNlc3NhcnlDb25jdXJyZW50bHkoaGVhcFZlcnNpb24pOwogfQpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkU3BhY2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZFNwYWNlLmNwcAkocmV2aXNpb24gMjA1NjQ3 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkU3BhY2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00NjAsNyArNDYwLDE2IEBAIHZvaWQgTWFya2VkU3BhY2U6OmZsaXAoKQogICAg ICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9ibG9ja3NXaXRoTmV3T2JqZWN0cy5zaXpl KCk7ICsraSkKICAgICAgICAgICAgIG1fYmxvY2tzV2l0aE5ld09iamVjdHNbaV0tPmZsaXBGb3JF ZGVuQ29sbGVjdGlvbigpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fdmVyc2lvbisrOyAvLyBI ZW5jZWZvcnRoLCBmbGlwSWZOZWNlc3NhcnkoKSB3aWxsIHRyaWdnZXIgb24gYWxsIGJsb2Nrcy4K KyAgICAgICAgSGVhcFZlcnNpb24gbmV4dFZlcnNpb24gPSBtX3ZlcnNpb24gKyAxOworICAgICAg ICBpZiAoVU5MSUtFTFkobmV4dFZlcnNpb24gPT0gaW5pdGlhbFZlcnNpb24pKSB7CisgICAgICAg ICAgICAvLyBPaCBubyEgIFZlcnNpb24gd3JhcC1hcm91bmQhICBXZSBoYW5kbGUgdGhpcyBieSBm bGlwcGluZyBhbGwgYmxvY2tzLiBUaGlzIGhhcHBlbnMKKyAgICAgICAgICAgIC8vIHN1cGVyIHJh cmVseSwgcHJvYmFibHkgbmV2ZXIgZm9yIG1vc3QgdXNlcnMuCisgICAgICAgICAgICBmb3JFYWNo QmxvY2soCisgICAgICAgICAgICAgICAgWyZdIChNYXJrZWRCbG9jazo6SGFuZGxlKiBoYW5kbGUp IHsKKyAgICAgICAgICAgICAgICAgICAgaGFuZGxlLT5mbGlwSWZOZWNlc3NhcnkoKTsKKyAgICAg ICAgICAgICAgICB9KTsKKyAgICAgICAgfQorICAgICAgICBtX3ZlcnNpb24gPSBuZXh0VmVyc2lv bjsgLy8gSGVuY2Vmb3J0aCwgZmxpcElmTmVjZXNzYXJ5KCkgd2lsbCB0cmlnZ2VyIG9uIGFsbCBi bG9ja3MuCiAgICAgICAgIGZvciAoTGFyZ2VBbGxvY2F0aW9uKiBhbGxvY2F0aW9uIDogbV9sYXJn ZUFsbG9jYXRpb25zKQogICAgICAgICAgICAgYWxsb2NhdGlvbi0+ZmxpcCgpOwogICAgIH0KSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZFNwYWNlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkU3BhY2UuaAkocmV2aXNpb24gMjA1 NjQ3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkU3BhY2UuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDIsNiArNDIsOCBAQCBjbGFzcyBIZWFwSXRlcmF0aW9uU2NvcGU7CiBjbGFz cyBMTEludE9mZnNldHNFeHRyYWN0b3I7CiBjbGFzcyBXZWFrU2V0OwogCit0eXBlZGVmIHVpbnQz Ml90IEhlYXBWZXJzaW9uOworCiBjbGFzcyBNYXJrZWRTcGFjZSB7CiAgICAgV1RGX01BS0VfTk9O Q09QWUFCTEUoTWFya2VkU3BhY2UpOwogcHVibGljOgpAQCAtNjMsNiArNjUsOCBAQCBwdWJsaWM6 CiAKICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IG51bVNpemVDbGFzc2VzID0gbGFyZ2VDdXRvZmYg LyBzaXplU3RlcDsKICAgICAKKyAgICBzdGF0aWMgY29uc3QgSGVhcFZlcnNpb24gaW5pdGlhbFZl cnNpb24gPSA0MjsgIC8vIFRoaXMgY2FuIGJlIGFueSB2YWx1ZSwgaW5jbHVkaW5nIHJhbmRvbSBn YXJiYWdlLCBzbyBsb25nIGFzIGl0J3MgY29uc2lzdGVudCBmb3IgdGhlIGxpZmV0aW1lIG9mIHRo ZSBwcm9jZXNzLgorICAgIAogICAgIHN0YXRpYyBzaXplX3Qgc2l6ZUNsYXNzVG9JbmRleChzaXpl X3Qgc2l6ZSkKICAgICB7CiAgICAgICAgIEFTU0VSVChzaXplKTsKQEAgLTE1MSw3ICsxNTUsNyBA QCBwdWJsaWM6CiAKICAgICBib29sIGlzUGFnZWRPdXQoZG91YmxlIGRlYWRsaW5lKTsKICAgICAK LSAgICB1aW50NjRfdCB2ZXJzaW9uKCkgY29uc3QgeyByZXR1cm4gbV92ZXJzaW9uOyB9CisgICAg SGVhcFZlcnNpb24gdmVyc2lvbigpIGNvbnN0IHsgcmV0dXJuIG1fdmVyc2lvbjsgfQogCiAgICAg Y29uc3QgVmVjdG9yPE1hcmtlZEJsb2NrOjpIYW5kbGUqPiYgYmxvY2tzV2l0aE5ld09iamVjdHMo KSBjb25zdCB7IHJldHVybiBtX2Jsb2Nrc1dpdGhOZXdPYmplY3RzOyB9CiAgICAgCkBAIC0xODks NyArMTkzLDcgQEAgcHJpdmF0ZToKICAgICBTdWJzcGFjZSBtX2F1eGlsaWFyeVNwYWNlOwogCiAg ICAgSGVhcCogbV9oZWFwOwotICAgIHVpbnQ2NF90IG1fdmVyc2lvbiB7IDQyIH07IC8vIFRoaXMg Y2FuIHN0YXJ0IGF0IGFueSB2YWx1ZSwgaW5jbHVkaW5nIHJhbmRvbSBnYXJiYWdlIHZhbHVlcy4K KyAgICBIZWFwVmVyc2lvbiBtX3ZlcnNpb24geyBpbml0aWFsVmVyc2lvbiB9OwogICAgIHNpemVf dCBtX2NhcGFjaXR5OwogICAgIGJvb2wgbV9pc0l0ZXJhdGluZzsKICAgICBNYXJrZWRCbG9ja1Nl dCBtX2Jsb2NrczsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1Nsb3RWaXNpdG9y LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9TbG90VmlzaXRv ci5jcHAJKHJldmlzaW9uIDIwNTY0NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1Ns b3RWaXNpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODEsNyArODEsNyBAQCBTbG90VmlzaXRv cjo6U2xvdFZpc2l0b3IoSGVhcCYgaGVhcCkKICAgICAsIG1fYnl0ZXNDb3BpZWQoMCkKICAgICAs IG1fdmlzaXRDb3VudCgwKQogICAgICwgbV9pc0luUGFyYWxsZWxNb2RlKGZhbHNlKQotICAgICwg bV92ZXJzaW9uKDQyKQorICAgICwgbV92ZXJzaW9uKE1hcmtlZFNwYWNlOjppbml0aWFsVmVyc2lv bikKICAgICAsIG1faGVhcChoZWFwKQogI2lmICFBU1NFUlRfRElTQUJMRUQKICAgICAsIG1faXND aGVja2luZ0ZvckRlZmF1bHRNYXJrVmlvbGF0aW9uKGZhbHNlKQpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2hlYXAvU2xvdFZpc2l0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaGVhcC9TbG90VmlzaXRvci5oCShyZXZpc2lvbiAyMDU2NDcpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaGVhcC9TbG90VmlzaXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw2 ICs0Niw4IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYWs7CiBjbGFzcyBXZWFrUmVm ZXJlbmNlSGFydmVzdGVyOwogdGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgV3JpdGVCYXJyaWVy QmFzZTsKIAordHlwZWRlZiB1aW50MzJfdCBIZWFwVmVyc2lvbjsKKwogY2xhc3MgU2xvdFZpc2l0 b3IgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFNsb3RWaXNpdG9yKTsKICAgICBXVEZfTUFL RV9GQVNUX0FMTE9DQVRFRDsKQEAgLTE2MCw3ICsxNjIsNyBAQCBwcml2YXRlOgogICAgIHNpemVf dCBtX3Zpc2l0Q291bnQ7CiAgICAgYm9vbCBtX2lzSW5QYXJhbGxlbE1vZGU7CiAgICAgCi0gICAg dWludDY0X3QgbV92ZXJzaW9uOworICAgIEhlYXBWZXJzaW9uIG1fdmVyc2lvbjsKICAgICAKICAg ICBIZWFwJiBtX2hlYXA7CiAK