127256 2014-01-19 13:10:25 -0800 Convert GCThreadSharedData over to STL threading primitives 2014-01-20 09:06:30 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 969634 0 andersca 2014-01-19 13:10:25 -0800 Convert GCThreadSharedData over to STL threading primitives 969636 1 221595 andersca 2014-01-19 13:14:05 -0800 Created attachment 221595 Patch 969646 2 commit-queue 2014-01-19 15:39:55 -0800 Attachment 221595 did not pass style-queue: ERROR: Source/JavaScriptCore/heap/GCThreadSharedData.cpp:98: More than one command on the same line [whitespace/newline] [4] ERROR: Source/JavaScriptCore/heap/GCThreadSharedData.cpp:156: More than one command on the same line [whitespace/newline] [4] ERROR: Source/JavaScriptCore/heap/SlotVisitor.cpp:218: More than one command on the same line [whitespace/newline] [4] ERROR: Source/JavaScriptCore/heap/GCThread.cpp:73: More than one command on the same line [whitespace/newline] [4] ERROR: Source/JavaScriptCore/heap/GCThread.cpp:79: More than one command on the same line [whitespace/newline] [4] Total errors found: 5 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 969864 3 andersca 2014-01-20 09:06:30 -0800 Committed r162352: <http://trac.webkit.org/changeset/162352> 221595 2014-01-19 13:14:05 -0800 2014-01-19 18:53:14 -0800 Patch bug-127256-20140119131404.patch text/plain 11255 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMjk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj YTQ4NGZlYTc2ZTllZTY2ZTE2N2IwZDdkZGJlM2JhMDM4M2IzMTRmLi5iZDlmZGEwNTMwMmIxZDYx NWRlZmJjNGE1YTBkYTg1YTYyNWMyNDUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxNC0wMS0xOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCisgICAgICAgIENvbnZlcnQgR0NUaHJlYWRTaGFyZWREYXRhIG92ZXIgdG8gU1RMIHRo cmVhZGluZyBwcmltaXRpdmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjcyNTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGhlYXAvR0NUaHJlYWQuY3BwOgorICAgICAgICAoSlNDOjpHQ1RocmVhZDo6 d2FpdEZvck5leHRQaGFzZSk6CisgICAgICAgIChKU0M6OkdDVGhyZWFkOjpnY1RocmVhZE1haW4p OgorICAgICAgICAqIGhlYXAvR0NUaHJlYWRTaGFyZWREYXRhLmNwcDoKKyAgICAgICAgKEpTQzo6 R0NUaHJlYWRTaGFyZWREYXRhOjpHQ1RocmVhZFNoYXJlZERhdGEpOgorICAgICAgICAoSlNDOjpH Q1RocmVhZFNoYXJlZERhdGE6On5HQ1RocmVhZFNoYXJlZERhdGEpOgorICAgICAgICAoSlNDOjpH Q1RocmVhZFNoYXJlZERhdGE6OnN0YXJ0TmV4dFBoYXNlKToKKyAgICAgICAgKEpTQzo6R0NUaHJl YWRTaGFyZWREYXRhOjplbmRDdXJyZW50UGhhc2UpOgorICAgICAgICAoSlNDOjpHQ1RocmVhZFNo YXJlZERhdGE6OmRpZFN0YXJ0TWFya2luZyk6CisgICAgICAgIChKU0M6OkdDVGhyZWFkU2hhcmVk RGF0YTo6ZGlkRmluaXNoTWFya2luZyk6CisgICAgICAgICogaGVhcC9HQ1RocmVhZFNoYXJlZERh dGEuaDoKKyAgICAgICAgKiBoZWFwL1Nsb3RWaXNpdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6U2xv dFZpc2l0b3I6OmRvbmF0ZUtub3duUGFyYWxsZWwpOgorICAgICAgICAoSlNDOjpTbG90VmlzaXRv cjo6ZHJhaW5Gcm9tU2hhcmVkKToKKwogMjAxNC0wMS0xOCAgQW5kcmVhcyBLbGluZyAgPGFrbGlu Z0BhcHBsZS5jb20+CiAKICAgICAgICAgQ29kZUJsb2NrOiBTaXplIG1fY2FsbExpbmtJbmZvcyBh bmQgbV9ieVZhbEluZm9zIHRvIGZpdCBlYXJsaWVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2hlYXAvR0NUaHJlYWQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAv R0NUaHJlYWQuY3BwCmluZGV4IGFhODY4ZjFiMzQ4ODE0ZDgwZTdkNDEyMzlmYjNhMTQyYWUzNjZh ZWUuLjUwZjAyY2UxOWVmZjI5ZTYxMTM4Nzg1NjE5YmRlYTk5YWQzMGQxOTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0dDVGhyZWFkLmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaGVhcC9HQ1RocmVhZC5jcHAKQEAgLTY5LDE2ICs2OSwxNCBAQCBDb3B5Vmlz aXRvciogR0NUaHJlYWQ6OmNvcHlWaXNpdG9yKCkKIAogR0NQaGFzZSBHQ1RocmVhZDo6d2FpdEZv ck5leHRQaGFzZSgpCiB7Ci0gICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fc2hhcmVkLm1fcGhhc2VM b2NrKTsKLSAgICB3aGlsZSAobV9zaGFyZWQubV9nY1RocmVhZHNTaG91bGRXYWl0KQotICAgICAg ICBtX3NoYXJlZC5tX3BoYXNlQ29uZGl0aW9uLndhaXQobV9zaGFyZWQubV9waGFzZUxvY2spOwor ICAgIHN0ZDo6dW5pcXVlX2xvY2s8c3RkOjptdXRleD4gbG9jayhtX3NoYXJlZC5tX3BoYXNlTXV0 ZXgpOworICAgIG1fc2hhcmVkLm1fcGhhc2VDb25kaXRpb25WYXJpYWJsZS53YWl0KGxvY2ssIFt0 aGlzXSB7IHJldHVybiAhbV9zaGFyZWQubV9nY1RocmVhZHNTaG91bGRXYWl0OyB9KTsKIAogICAg IG1fc2hhcmVkLm1fbnVtYmVyT2ZBY3RpdmVHQ1RocmVhZHMtLTsKICAgICBpZiAoIW1fc2hhcmVk Lm1fbnVtYmVyT2ZBY3RpdmVHQ1RocmVhZHMpCi0gICAgICAgIG1fc2hhcmVkLm1fYWN0aXZpdHlD b25kaXRpb24uc2lnbmFsKCk7CisgICAgICAgIG1fc2hhcmVkLm1fYWN0aXZpdHlDb25kaXRpb25W YXJpYWJsZS5ub3RpZnlfb25lKCk7CiAKLSAgICB3aGlsZSAobV9zaGFyZWQubV9jdXJyZW50UGhh c2UgPT0gTm9QaGFzZSkKLSAgICAgICAgbV9zaGFyZWQubV9waGFzZUNvbmRpdGlvbi53YWl0KG1f c2hhcmVkLm1fcGhhc2VMb2NrKTsKKyAgICBtX3NoYXJlZC5tX3BoYXNlQ29uZGl0aW9uVmFyaWFi bGUud2FpdChsb2NrLCBbdGhpc10geyByZXR1cm4gbV9zaGFyZWQubV9jdXJyZW50UGhhc2UgIT0g Tm9QaGFzZTsgfSk7CiAgICAgbV9zaGFyZWQubV9udW1iZXJPZkFjdGl2ZUdDVGhyZWFkcysrOwog ICAgIHJldHVybiBtX3NoYXJlZC5tX2N1cnJlbnRQaGFzZTsKIH0KQEAgLTkyLDcgKzkwLDcgQEAg dm9pZCBHQ1RocmVhZDo6Z2NUaHJlYWRNYWluKCkKICAgICAvLyBXYWl0IGZvciB0aGUgbWFpbiB0 aHJlYWQgdG8gZmluaXNoIGNyZWF0aW5nIGFuZCBpbml0aWFsaXppbmcgdXMuIFRoZSBtYWluIHRo cmVhZCBncmFicyB0aGlzIGxvY2sgYmVmb3JlIAogICAgIC8vIGNyZWF0aW5nIHRoaXMgdGhyZWFk LiBXZSBhcmVuJ3QgZ3VhcmFudGVlZCB0byBoYXZlIGEgdmFsaWQgdGhyZWFkSUQgdW50aWwgdGhl IG1haW4gdGhyZWFkIHJlbGVhc2VzIHRoaXMgbG9jay4KICAgICB7Ci0gICAgICAgIE11dGV4TG9j a2VyIGxvY2tlcihtX3NoYXJlZC5tX3BoYXNlTG9jayk7CisgICAgICAgIHN0ZDo6bG9ja19ndWFy ZDxzdGQ6Om11dGV4PiBsb2NrKG1fc2hhcmVkLm1fcGhhc2VNdXRleCk7CiAgICAgfQogICAgIHsK ICAgICAgICAgUGFyYWxsZWxNb2RlRW5hYmxlciBlbmFibGVyKCptX3Nsb3RWaXNpdG9yKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0dDVGhyZWFkU2hhcmVkRGF0YS5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9HQ1RocmVhZFNoYXJlZERhdGEuY3BwCmlu ZGV4IDdkMWQ3YjRjY2VmMzM3MjNiODIyNGZkYWI0ZTNkYjVlZjNiNTlkZTQuLjA5MTQzYTE1Zjgy NThlMjcxYjkxZjgyNjZlOTgxZWIxMGUwNzg2MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9oZWFwL0dDVGhyZWFkU2hhcmVkRGF0YS5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2hlYXAvR0NUaHJlYWRTaGFyZWREYXRhLmNwcApAQCAtODMsNyArODMsNyBAQCBHQ1Ro cmVhZFNoYXJlZERhdGE6OkdDVGhyZWFkU2hhcmVkRGF0YShWTSogdm0pCiAgICAgbV9jb3B5TG9j ay5Jbml0KCk7CiAjaWYgRU5BQkxFKFBBUkFMTEVMX0dDKQogICAgIC8vIEdyYWIgdGhlIGxvY2sg c28gdGhlIG5ldyBHQyB0aHJlYWRzIGNhbiBiZSBwcm9wZXJseSBpbml0aWFsaXplZCBiZWZvcmUg dGhleSBzdGFydCBydW5uaW5nLgotICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX3BoYXNlTG9jayk7 CisgICAgc3RkOjp1bmlxdWVfbG9jazxzdGQ6Om11dGV4PiBsb2NrKG1fcGhhc2VNdXRleCk7CiAg ICAgZm9yICh1bnNpZ25lZCBpID0gMTsgaSA8IE9wdGlvbnM6Om51bWJlck9mR0NNYXJrZXJzKCk7 ICsraSkgewogICAgICAgICBtX251bWJlck9mQWN0aXZlR0NUaHJlYWRzKys7CiAgICAgICAgIFNs b3RWaXNpdG9yKiBzbG90VmlzaXRvciA9IG5ldyBTbG90VmlzaXRvcigqdGhpcyk7CkBAIC05NSw4 ICs5NSw3IEBAIEdDVGhyZWFkU2hhcmVkRGF0YTo6R0NUaHJlYWRTaGFyZWREYXRhKFZNKiB2bSkK ICAgICB9CiAKICAgICAvLyBXYWl0IGZvciBhbGwgdGhlIEdDVGhyZWFkcyB0byBnZXQgdG8gdGhl IHJpZ2h0IHBsYWNlLgotICAgIHdoaWxlIChtX251bWJlck9mQWN0aXZlR0NUaHJlYWRzKQotICAg ICAgICBtX2FjdGl2aXR5Q29uZGl0aW9uLndhaXQobV9waGFzZUxvY2spOworICAgIG1fYWN0aXZp dHlDb25kaXRpb25WYXJpYWJsZS53YWl0KGxvY2ssIFt0aGlzXSB7IHJldHVybiAhbV9udW1iZXJP ZkFjdGl2ZUdDVGhyZWFkczsgfSk7CiAjZW5kaWYKIH0KIApAQCAtMTA1LDEzICsxMDQsMTMgQEAg R0NUaHJlYWRTaGFyZWREYXRhOjp+R0NUaHJlYWRTaGFyZWREYXRhKCkKICNpZiBFTkFCTEUoUEFS QUxMRUxfR0MpICAgIAogICAgIC8vIERlc3Ryb3kgb3VyIG1hcmtpbmcgdGhyZWFkcy4KICAgICB7 Ci0gICAgICAgIE11dGV4TG9ja2VyIG1hcmtpbmdMb2NrZXIobV9tYXJraW5nTG9jayk7Ci0gICAg ICAgIE11dGV4TG9ja2VyIHBoYXNlTG9ja2VyKG1fcGhhc2VMb2NrKTsKKyAgICAgICAgc3RkOjps b2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IG1hcmtpbmdMb2NrKG1fbWFya2luZ011dGV4KTsKKyAgICAg ICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IHBoYXNlTG9jayhtX3BoYXNlTXV0ZXgpOwog ICAgICAgICBBU1NFUlQobV9jdXJyZW50UGhhc2UgPT0gTm9QaGFzZSk7CiAgICAgICAgIG1fcGFy YWxsZWxNYXJrZXJzU2hvdWxkRXhpdCA9IHRydWU7CiAgICAgICAgIG1fZ2NUaHJlYWRzU2hvdWxk V2FpdCA9IGZhbHNlOwogICAgICAgICBtX2N1cnJlbnRQaGFzZSA9IEV4aXQ7Ci0gICAgICAgIG1f cGhhc2VDb25kaXRpb24uYnJvYWRjYXN0KCk7CisgICAgICAgIG1fcGhhc2VDb25kaXRpb25WYXJp YWJsZS5ub3RpZnlfYWxsKCk7CiAgICAgfQogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBt X2djVGhyZWFkcy5zaXplKCk7ICsraSkgewogICAgICAgICB3YWl0Rm9yVGhyZWFkQ29tcGxldGlv bihtX2djVGhyZWFkc1tpXS0+dGhyZWFkSUQoKSk7CkBAIC0xMzksMjggKzEzOCwyNyBAQCB2b2lk IEdDVGhyZWFkU2hhcmVkRGF0YTo6cmVzZXQoKQogCiB2b2lkIEdDVGhyZWFkU2hhcmVkRGF0YTo6 c3RhcnROZXh0UGhhc2UoR0NQaGFzZSBwaGFzZSkKIHsKLSAgICBNdXRleExvY2tlciBwaGFzZUxv Y2tlcihtX3BoYXNlTG9jayk7CisgICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2so bV9waGFzZU11dGV4KTsKICAgICBBU1NFUlQoIW1fZ2NUaHJlYWRzU2hvdWxkV2FpdCk7CiAgICAg QVNTRVJUKG1fY3VycmVudFBoYXNlID09IE5vUGhhc2UpOwogICAgIG1fZ2NUaHJlYWRzU2hvdWxk V2FpdCA9IHRydWU7CiAgICAgbV9jdXJyZW50UGhhc2UgPSBwaGFzZTsKLSAgICBtX3BoYXNlQ29u ZGl0aW9uLmJyb2FkY2FzdCgpOworICAgIG1fcGhhc2VDb25kaXRpb25WYXJpYWJsZS5ub3RpZnlf YWxsKCk7CiB9CiAKIHZvaWQgR0NUaHJlYWRTaGFyZWREYXRhOjplbmRDdXJyZW50UGhhc2UoKQog ewogICAgIEFTU0VSVChtX2djVGhyZWFkc1Nob3VsZFdhaXQpOwotICAgIE11dGV4TG9ja2VyIGxv Y2tlcihtX3BoYXNlTG9jayk7CisgICAgc3RkOjp1bmlxdWVfbG9jazxzdGQ6Om11dGV4PiBsb2Nr KG1fcGhhc2VNdXRleCk7CiAgICAgbV9jdXJyZW50UGhhc2UgPSBOb1BoYXNlOwogICAgIG1fZ2NU aHJlYWRzU2hvdWxkV2FpdCA9IGZhbHNlOwotICAgIG1fcGhhc2VDb25kaXRpb24uYnJvYWRjYXN0 KCk7Ci0gICAgd2hpbGUgKG1fbnVtYmVyT2ZBY3RpdmVHQ1RocmVhZHMpCi0gICAgICAgIG1fYWN0 aXZpdHlDb25kaXRpb24ud2FpdChtX3BoYXNlTG9jayk7CisgICAgbV9waGFzZUNvbmRpdGlvblZh cmlhYmxlLm5vdGlmeV9hbGwoKTsKKyAgICBtX2FjdGl2aXR5Q29uZGl0aW9uVmFyaWFibGUud2Fp dChsb2NrLCBbdGhpc10geyByZXR1cm4gIW1fbnVtYmVyT2ZBY3RpdmVHQ1RocmVhZHM7IH0pOwog fQogCiB2b2lkIEdDVGhyZWFkU2hhcmVkRGF0YTo6ZGlkU3RhcnRNYXJraW5nKCkKIHsKLSAgICBN dXRleExvY2tlciBtYXJraW5nTG9ja2VyKG1fbWFya2luZ0xvY2spOworICAgIHN0ZDo6bG9ja19n dWFyZDxzdGQ6Om11dGV4PiBsb2NrKG1fbWFya2luZ011dGV4KTsKICAgICBtX3BhcmFsbGVsTWFy a2Vyc1Nob3VsZEV4aXQgPSBmYWxzZTsKICAgICBzdGFydE5leHRQaGFzZShNYXJrKTsKIH0KQEAg LTE2OCw5ICsxNjYsOSBAQCB2b2lkIEdDVGhyZWFkU2hhcmVkRGF0YTo6ZGlkU3RhcnRNYXJraW5n KCkKIHZvaWQgR0NUaHJlYWRTaGFyZWREYXRhOjpkaWRGaW5pc2hNYXJraW5nKCkKIHsKICAgICB7 Ci0gICAgICAgIE11dGV4TG9ja2VyIG1hcmtpbmdMb2NrZXIobV9tYXJraW5nTG9jayk7CisgICAg ICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrKG1fbWFya2luZ011dGV4KTsKICAg ICAgICAgbV9wYXJhbGxlbE1hcmtlcnNTaG91bGRFeGl0ID0gdHJ1ZTsKLSAgICAgICAgbV9tYXJr aW5nQ29uZGl0aW9uLmJyb2FkY2FzdCgpOworICAgICAgICBtX21hcmtpbmdDb25kaXRpb25WYXJp YWJsZS5ub3RpZnlfYWxsKCk7CiAgICAgfQogCiAgICAgQVNTRVJUKG1fY3VycmVudFBoYXNlID09 IE1hcmspOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvR0NUaHJlYWRT aGFyZWREYXRhLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9HQ1RocmVhZFNoYXJlZERh dGEuaAppbmRleCBmZjNkZDk5ZjNhMjA5NjhlMWJjYjZmNDM5NGNkOTlkM2E3ZDRlZWRjLi45MTVj MmM5OTE2NjE1ZTBmNDI1NmNjNzE2YmYxMDgxOTZjN2JiNDYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaGVhcC9HQ1RocmVhZFNoYXJlZERhdGEuaAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaGVhcC9HQ1RocmVhZFNoYXJlZERhdGEuaApAQCAtMzEsOSArMzEsOSBAQAog I2luY2x1ZGUgIk1hcmtlZEJsb2NrLmgiCiAjaW5jbHVkZSAiVW5jb25kaXRpb25hbEZpbmFsaXpl ci5oIgogI2luY2x1ZGUgIldlYWtSZWZlcmVuY2VIYXJ2ZXN0ZXIuaCIKKyNpbmNsdWRlIDxjb25k aXRpb25fdmFyaWFibGU+CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRlIDx3dGYv VENTcGluTG9jay5oPgotI2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmcuaD4KICNpbmNsdWRlIDx3dGYv VmVjdG9yLmg+CiAKIG5hbWVzcGFjZSBKU0MgewpAQCAtODYsOCArODYsOCBAQCBwcml2YXRlOgog CiAgICAgVmVjdG9yPEdDVGhyZWFkKj4gbV9nY1RocmVhZHM7CiAKLSAgICBNdXRleCBtX21hcmtp bmdMb2NrOwotICAgIFRocmVhZENvbmRpdGlvbiBtX21hcmtpbmdDb25kaXRpb247CisgICAgc3Rk OjptdXRleCBtX21hcmtpbmdNdXRleDsKKyAgICBzdGQ6OmNvbmRpdGlvbl92YXJpYWJsZSBtX21h cmtpbmdDb25kaXRpb25WYXJpYWJsZTsKICAgICBNYXJrU3RhY2tBcnJheSBtX3NoYXJlZE1hcmtT dGFjazsKICAgICB1bnNpZ25lZCBtX251bWJlck9mQWN0aXZlUGFyYWxsZWxNYXJrZXJzOwogICAg IGJvb2wgbV9wYXJhbGxlbE1hcmtlcnNTaG91bGRFeGl0OwpAQCAtMTAwLDkgKzEwMCw5IEBAIHBy aXZhdGU6CiAgICAgc2l6ZV90IG1fY29weUluZGV4OwogICAgIHN0YXRpYyBjb25zdCBzaXplX3Qg c19ibG9ja0ZyYWdtZW50TGVuZ3RoID0gMzI7CiAKLSAgICBNdXRleCBtX3BoYXNlTG9jazsKLSAg ICBUaHJlYWRDb25kaXRpb24gbV9waGFzZUNvbmRpdGlvbjsKLSAgICBUaHJlYWRDb25kaXRpb24g bV9hY3Rpdml0eUNvbmRpdGlvbjsKKyAgICBzdGQ6Om11dGV4IG1fcGhhc2VNdXRleDsKKyAgICBz dGQ6OmNvbmRpdGlvbl92YXJpYWJsZSBtX3BoYXNlQ29uZGl0aW9uVmFyaWFibGU7CisgICAgc3Rk Ojpjb25kaXRpb25fdmFyaWFibGUgbV9hY3Rpdml0eUNvbmRpdGlvblZhcmlhYmxlOwogICAgIHVu c2lnbmVkIG1fbnVtYmVyT2ZBY3RpdmVHQ1RocmVhZHM7CiAgICAgYm9vbCBtX2djVGhyZWFkc1No b3VsZFdhaXQ7CiAgICAgR0NQaGFzZSBtX2N1cnJlbnRQaGFzZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1Nsb3RWaXNpdG9yLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9oZWFwL1Nsb3RWaXNpdG9yLmNwcAppbmRleCAwNWZiMDAxYTdjNTdhZDU1NmNlZjI3Mzc5 NDdmOWE1ZDQ2OGRlN2ExLi40ZmQwZGE3MjVhMjAyNmFjYWFmNzU5NzhhOTQ0NTc0NmI3NzNhMjUy IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9TbG90VmlzaXRvci5jcHAK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvU2xvdFZpc2l0b3IuY3BwCkBAIC0xMTgs MTUgKzExOCwxNSBAQCB2b2lkIFNsb3RWaXNpdG9yOjpkb25hdGVLbm93blBhcmFsbGVsKCkKIAog ICAgIC8vIElmIHdlJ3JlIGNvbnRlbmRpbmcgb24gdGhlIGxvY2ssIGJlIGNvbnNlcnZhdGl2ZSBh bmQgYXNzdW1lIHRoYXQgYW5vdGhlcgogICAgIC8vIHRocmVhZCBpcyBhbHJlYWR5IGRvbmF0aW5n LgotICAgIE11dGV4VHJ5TG9ja2VyIGxvY2tlcihtX3NoYXJlZC5tX21hcmtpbmdMb2NrKTsKLSAg ICBpZiAoIWxvY2tlci5sb2NrZWQoKSkKKyAgICBzdGQ6OnVuaXF1ZV9sb2NrPHN0ZDo6bXV0ZXg+ IGxvY2sobV9zaGFyZWQubV9tYXJraW5nTXV0ZXgsIHN0ZDo6dHJ5X3RvX2xvY2spOworICAgIGlm ICghbG9jay5vd25zX2xvY2soKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gT3RoZXJ3aXNl LCBhc3N1bWUgdGhhdCBhIHRocmVhZCB3aWxsIGdvIGlkbGUgc29vbiwgYW5kIGRvbmF0ZS4KICAg ICBtX3N0YWNrLmRvbmF0ZVNvbWVDZWxsc1RvKG1fc2hhcmVkLm1fc2hhcmVkTWFya1N0YWNrKTsK IAogICAgIGlmIChtX3NoYXJlZC5tX251bWJlck9mQWN0aXZlUGFyYWxsZWxNYXJrZXJzIDwgT3B0 aW9uczo6bnVtYmVyT2ZHQ01hcmtlcnMoKSkKLSAgICAgICAgbV9zaGFyZWQubV9tYXJraW5nQ29u ZGl0aW9uLmJyb2FkY2FzdCgpOworICAgICAgICBtX3NoYXJlZC5tX21hcmtpbmdDb25kaXRpb25W YXJpYWJsZS5ub3RpZnlfYWxsKCk7CiB9CiAKIHZvaWQgU2xvdFZpc2l0b3I6OmRyYWluKCkKQEAg LTE4MSwxMiArMTgxLDEyIEBAIHZvaWQgU2xvdFZpc2l0b3I6OmRyYWluRnJvbVNoYXJlZChTaGFy ZWREcmFpbk1vZGUgc2hhcmVkRHJhaW5Nb2RlKQogICAgIAogI2lmIEVOQUJMRShQQVJBTExFTF9H QykKICAgICB7Ci0gICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX3NoYXJlZC5tX21hcmtpbmdM b2NrKTsKKyAgICAgICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2sobV9zaGFyZWQu bV9tYXJraW5nTXV0ZXgpOwogICAgICAgICBtX3NoYXJlZC5tX251bWJlck9mQWN0aXZlUGFyYWxs ZWxNYXJrZXJzKys7CiAgICAgfQogICAgIHdoaWxlICh0cnVlKSB7CiAgICAgICAgIHsKLSAgICAg ICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX3NoYXJlZC5tX21hcmtpbmdMb2NrKTsKKyAgICAg ICAgICAgIHN0ZDo6dW5pcXVlX2xvY2s8c3RkOjptdXRleD4gbG9jayhtX3NoYXJlZC5tX21hcmtp bmdNdXRleCk7CiAgICAgICAgICAgICBtX3NoYXJlZC5tX251bWJlck9mQWN0aXZlUGFyYWxsZWxN YXJrZXJzLS07CiAKICAgICAgICAgICAgIC8vIEhvdyB3ZSB3YWl0IGRpZmZlcnMgZGVwZW5kaW5n IG9uIGRyYWluIG1vZGUuCkBAIC0xOTcsNyArMTk3LDcgQEAgdm9pZCBTbG90VmlzaXRvcjo6ZHJh aW5Gcm9tU2hhcmVkKFNoYXJlZERyYWluTW9kZSBzaGFyZWREcmFpbk1vZGUpCiAgICAgICAgICAg ICAgICAgICAgIC8vIERpZCB3ZSByZWFjaCB0ZXJtaW5hdGlvbj8KICAgICAgICAgICAgICAgICAg ICAgaWYgKCFtX3NoYXJlZC5tX251bWJlck9mQWN0aXZlUGFyYWxsZWxNYXJrZXJzICYmIG1fc2hh cmVkLm1fc2hhcmVkTWFya1N0YWNrLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgICAgICAgICAg ICAgLy8gTGV0IGFueSBzbGVlcGluZyBzbGF2ZXMga25vdyBpdCdzIHRpbWUgZm9yIHRoZW0gdG8g cmV0dXJuOwotICAgICAgICAgICAgICAgICAgICAgICAgbV9zaGFyZWQubV9tYXJraW5nQ29uZGl0 aW9uLmJyb2FkY2FzdCgpOworICAgICAgICAgICAgICAgICAgICAgICAgbV9zaGFyZWQubV9tYXJr aW5nQ29uZGl0aW9uVmFyaWFibGUubm90aWZ5X2FsbCgpOwogICAgICAgICAgICAgICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIApA QCAtMjA2LDE3ICsyMDYsMTYgQEAgdm9pZCBTbG90VmlzaXRvcjo6ZHJhaW5Gcm9tU2hhcmVkKFNo YXJlZERyYWluTW9kZSBzaGFyZWREcmFpbk1vZGUpCiAgICAgICAgICAgICAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgIC8vIE90aGVy d2lzZSB3YWl0LgotICAgICAgICAgICAgICAgICAgICBtX3NoYXJlZC5tX21hcmtpbmdDb25kaXRp b24ud2FpdChtX3NoYXJlZC5tX21hcmtpbmdMb2NrKTsKKyAgICAgICAgICAgICAgICAgICAgbV9z aGFyZWQubV9tYXJraW5nQ29uZGl0aW9uVmFyaWFibGUud2FpdChsb2NrKTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIEFTU0VSVChzaGFy ZWREcmFpbk1vZGUgPT0gU2xhdmVEcmFpbik7CiAgICAgICAgICAgICAgICAgCiAgICAgICAgICAg ICAgICAgLy8gRGlkIHdlIGRldGVjdCB0ZXJtaW5hdGlvbj8gSWYgc28sIGxldCB0aGUgbWFzdGVy IGtub3cuCiAgICAgICAgICAgICAgICAgaWYgKCFtX3NoYXJlZC5tX251bWJlck9mQWN0aXZlUGFy YWxsZWxNYXJrZXJzICYmIG1fc2hhcmVkLm1fc2hhcmVkTWFya1N0YWNrLmlzRW1wdHkoKSkKLSAg ICAgICAgICAgICAgICAgICAgbV9zaGFyZWQubV9tYXJraW5nQ29uZGl0aW9uLmJyb2FkY2FzdCgp OwotICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgIHdoaWxlIChtX3NoYXJlZC5tX3No YXJlZE1hcmtTdGFjay5pc0VtcHR5KCkgJiYgIW1fc2hhcmVkLm1fcGFyYWxsZWxNYXJrZXJzU2hv dWxkRXhpdCkKLSAgICAgICAgICAgICAgICAgICAgbV9zaGFyZWQubV9tYXJraW5nQ29uZGl0aW9u LndhaXQobV9zaGFyZWQubV9tYXJraW5nTG9jayk7CisgICAgICAgICAgICAgICAgICAgIG1fc2hh cmVkLm1fbWFya2luZ0NvbmRpdGlvblZhcmlhYmxlLm5vdGlmeV9hbGwoKTsKKworICAgICAgICAg ICAgICAgIG1fc2hhcmVkLm1fbWFya2luZ0NvbmRpdGlvblZhcmlhYmxlLndhaXQobG9jaywgW3Ro aXNdIHsgcmV0dXJuICFtX3NoYXJlZC5tX3NoYXJlZE1hcmtTdGFjay5pc0VtcHR5KCkgfHwgbV9z aGFyZWQubV9wYXJhbGxlbE1hcmtlcnNTaG91bGRFeGl0OyB9KTsKICAgICAgICAgICAgICAgICAK ICAgICAgICAgICAgICAgICAvLyBJcyB0aGUgY3VycmVudCBwaGFzZSBkb25lPyBJZiBzbywgcmV0 dXJuIGZyb20gdGhpcyBmdW5jdGlvbi4KICAgICAgICAgICAgICAgICBpZiAobV9zaGFyZWQubV9w YXJhbGxlbE1hcmtlcnNTaG91bGRFeGl0KQo=