129755 2014-03-05 13:31:26 -0800 More FTL ARM fixes 2014-03-05 13:56:41 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 112840 1 fpizlo fpizlo barraclough commit-queue ggaren mark.lam mhahnenberg mmirman msaboff nrotem oliver sam oldest_to_newest 987372 0 fpizlo 2014-03-05 13:31:26 -0800 Patch forthcoming. 987373 1 225908 fpizlo 2014-03-05 13:33:41 -0800 Created attachment 225908 the patch 987375 2 commit-queue 2014-03-05 13:36:23 -0800 Attachment 225908 did not pass style-queue: ERROR: Source/JavaScriptCore/ftl/FTLDataSection.h:39: The parameter name "size" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 13 files If any of these errors are false positives, please file a bug against check-webkit-style. 987376 3 225908 ggaren 2014-03-05 13:40:47 -0800 Comment on attachment 225908 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=225908&action=review r=me > Source/JavaScriptCore/ChangeLog:11 > + - Temporarily switch to allocating all MCJIT memory in the executable pool on non-x86 > + platforms. Can you file a bug about undoing this? > Source/JavaScriptCore/ftl/FTLDataSection.h:39 > + DataSection(VM&, CodeBlock*, size_t size, unsigned alignment); Nix "size", please. 987379 4 fpizlo 2014-03-05 13:46:38 -0800 (In reply to comment #3) > (From update of attachment 225908 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=225908&action=review > > r=me > > > Source/JavaScriptCore/ChangeLog:11 > > + - Temporarily switch to allocating all MCJIT memory in the executable pool on non-x86 > > + platforms. > > Can you file a bug about undoing this? https://bugs.webkit.org/show_bug.cgi?id=129756 I added a fixme that references it also. > > > Source/JavaScriptCore/ftl/FTLDataSection.h:39 > > + DataSection(VM&, CodeBlock*, size_t size, unsigned alignment); > > Nix "size", please. 987387 5 fpizlo 2014-03-05 13:56:41 -0800 Landed in http://trac.webkit.org/changeset/165129 225908 2014-03-05 13:33:41 -0800 2014-03-05 13:40:47 -0800 the patch blah.patch text/plain 15403 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY1MTI0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ5IEBA CisyMDE0LTAzLTA1ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg TW9yZSBGVEwgQVJNIGZpeGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjk3NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KyAgICAgICAgCisgICAgICAgIC0gQmUgbW9yZSBkZWZlbnNpdmUgYWJvdXQgaW5saW5lIGNhY2hl cyB0aGF0IGhhdmUgZGVnZW5lcmF0ZSBjaGFpbnMuCisgICAgICAgIAorICAgICAgICAtIFRlbXBv cmFyaWx5IHN3aXRjaCB0byBhbGxvY2F0aW5nIGFsbCBNQ0pJVCBtZW1vcnkgaW4gdGhlIGV4ZWN1 dGFibGUgcG9vbCBvbiBub24teDg2CisgICAgICAgICAgcGxhdGZvcm1zLgorICAgICAgICAKKyAg ICAgICAgLSBEb24ndCBldmVuIGVtaXQgaW50cmluc2ljIGRlY2xhcmF0aW9ucyBvbiBub24teDg2 IHBsYXRmb3Jtcy4KKyAgICAgICAgCisgICAgICAgIC0gTW9yZSBkZWJ1ZyBwcmludGluZyBzdXBw b3J0LgorICAgICAgICAKKyAgICAgICAgLSBEb24ndCB1c2Ugdm1DYWxsKCkgaW4gdGhlIHByb2xv Z3VlLiBUaGlzIHNob3VsZCBoYXZlIGNyYXNoZWQgb24gYWxsIHBsYXRmb3JtcyBhbGwgdGhlIHRp bWUKKyAgICAgICAgICBidXQgc29tZWhvdyBpdCBnZXRzIGx1Y2t5IG9uIHg4Ni4KKworICAgICAg ICAqIGJ5dGVjb2RlL0dldEJ5SWRTdGF0dXMuY3BwOgorICAgICAgICAoSlNDOjpHZXRCeUlkU3Rh dHVzOjphcHBlbmRWYXJpYW50KToKKyAgICAgICAgKEpTQzo6R2V0QnlJZFN0YXR1czo6Y29tcHV0 ZUZvckNoYWluKToKKyAgICAgICAgKEpTQzo6R2V0QnlJZFN0YXR1czo6Y29tcHV0ZUZvclN0dWJJ bmZvKToKKyAgICAgICAgKiBieXRlY29kZS9HZXRCeUlkU3RhdHVzLmg6CisgICAgICAgICogYnl0 ZWNvZGUvUHV0QnlJZFN0YXR1cy5jcHA6CisgICAgICAgIChKU0M6OlB1dEJ5SWRTdGF0dXM6OmFw cGVuZFZhcmlhbnQpOgorICAgICAgICAoSlNDOjpQdXRCeUlkU3RhdHVzOjpjb21wdXRlRm9yU3R1 YkluZm8pOgorICAgICAgICAqIGJ5dGVjb2RlL1B1dEJ5SWRTdGF0dXMuaDoKKyAgICAgICAgKiBi eXRlY29kZS9TdHJ1Y3R1cmVTZXQuaDoKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlU2V0OjpvdmVy bGFwcyk6CisgICAgICAgICogZnRsL0ZUTENvbXBpbGUuY3BwOgorICAgICAgICAoSlNDOjpGVEw6 Om1tQWxsb2NhdGVEYXRhU2VjdGlvbik6CisgICAgICAgICogZnRsL0ZUTERhdGFTZWN0aW9uLmNw cDoKKyAgICAgICAgKEpTQzo6RlRMOjpEYXRhU2VjdGlvbjo6RGF0YVNlY3Rpb24pOgorICAgICAg ICAoSlNDOjpGVEw6OkRhdGFTZWN0aW9uOjp+RGF0YVNlY3Rpb24pOgorICAgICAgICAqIGZ0bC9G VExEYXRhU2VjdGlvbi5oOgorICAgICAgICAqIGZ0bC9GVExMb3dlckRGR1RvTExWTS5jcHA6Cisg ICAgICAgIChKU0M6OkZUTDo6TG93ZXJERkdUb0xMVk06Omxvd2VyKToKKyAgICAgICAgKiBmdGwv RlRMT3V0cHV0Lmg6CisgICAgICAgIChKU0M6OkZUTDo6T3V0cHV0Ojpkb3VibGVTaW4pOgorICAg ICAgICAoSlNDOjpGVEw6Ok91dHB1dDo6ZG91YmxlQ29zKToKKyAgICAgICAgKiBydW50aW1lL0pT Q0pTVmFsdWUuY3BwOgorICAgICAgICAoSlNDOjpKU1ZhbHVlOjpkdW1wSW5Db250ZXh0KToKKyAg ICAgICAgKiBydW50aW1lL0pTQ2VsbC5oOgorICAgICAgICAoSlNDOjpKU0NlbGw6OnN0cnVjdHVy ZUlEKToKKwogMjAxNC0wMy0wNSAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4K IAogICAgICAgICBKU0RhdGFWaWV3UHJvdG90eXBlOjpnZXREYXRhKCkgYW5kIHNldERhdGEoKSBj cmFzaCBvbiBwbGF0Zm9ybXMgdGhhdCBkb24ndCBhbGxvdyB1bmFsaWduZWQgYWNjZXNzZXMKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9HZXRCeUlkU3RhdHVzLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5j cHAJKHJldmlzaW9uIDE2NTEwOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9H ZXRCeUlkU3RhdHVzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsMTYgQEAKIAogbmFt ZXNwYWNlIEpTQyB7CiAKK2Jvb2wgR2V0QnlJZFN0YXR1czo6YXBwZW5kVmFyaWFudChjb25zdCBH ZXRCeUlkVmFyaWFudCYgdmFyaWFudCkKK3sKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg bV92YXJpYW50cy5zaXplKCk7ICsraSkgeworICAgICAgICBpZiAobV92YXJpYW50c1tpXS5zdHJ1 Y3R1cmVTZXQoKS5vdmVybGFwcyh2YXJpYW50LnN0cnVjdHVyZVNldCgpKSkKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgbV92YXJpYW50cy5hcHBlbmQodmFyaWFudCk7Cisg ICAgcmV0dXJuIHRydWU7Cit9CisKICNpZiBFTkFCTEUoREZHX0pJVCkKIGJvb2wgR2V0QnlJZFN0 YXR1czo6aGFzRXhpdFNpdGUoY29uc3QgQ29uY3VycmVudEpJVExvY2tlciYgbG9ja2VyLCBDb2Rl QmxvY2sqIHByb2ZpbGVkQmxvY2ssIHVuc2lnbmVkIGJ5dGVjb2RlSW5kZXgsIEV4aXRpbmdKSVRU eXBlIGppdFR5cGUpCiB7CkBAIC0xMTksOSArMTI5LDcgQEAgYm9vbCBHZXRCeUlkU3RhdHVzOjpj b21wdXRlRm9yQ2hhaW4oQ29kZQogICAgIGlmICghaXNWYWxpZE9mZnNldChvZmZzZXQpKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgCi0gICAgbV92YXJpYW50cy5hcHBlbmQoCi0gICAgICAg IEdldEJ5SWRWYXJpYW50KFN0cnVjdHVyZVNldChjaGFpbi0+aGVhZCgpKSwgb2Zmc2V0LCBzcGVj aWZpY1ZhbHVlLCBjaGFpbikpOwotICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBhcHBlbmRW YXJpYW50KEdldEJ5SWRWYXJpYW50KFN0cnVjdHVyZVNldChjaGFpbi0+aGVhZCgpKSwgb2Zmc2V0 LCBzcGVjaWZpY1ZhbHVlLCBjaGFpbikpOwogI2Vsc2UgLy8gRU5BQkxFKEpJVCkKICAgICBVTlVT RURfUEFSQU0ocHJvZmlsZWRCbG9jayk7CiAgICAgVU5VU0VEX1BBUkFNKHVpZCk7CkBAIC0yMDIs NyArMjEwLDcgQEAgR2V0QnlJZFN0YXR1cyBHZXRCeUlkU3RhdHVzOjpjb21wdXRlRm9yUwogICAg ICAgICAKICAgICAgICAgdmFyaWFudC5tX3N0cnVjdHVyZVNldC5hZGQoc3RydWN0dXJlKTsKICAg ICAgICAgdmFyaWFudC5tX3NwZWNpZmljVmFsdWUgPSBKU1ZhbHVlKHNwZWNpZmljVmFsdWUpOwot ICAgICAgICByZXN1bHQubV92YXJpYW50cy5hcHBlbmQodmFyaWFudCk7CisgICAgICAgIHJlc3Vs dC5hcHBlbmRWYXJpYW50KHZhcmlhbnQpOwogICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0K ICAgICAgICAgCkBAIC0yNTYsOCArMjY0LDggQEAgR2V0QnlJZFN0YXR1cyBHZXRCeUlkU3RhdHVz Ojpjb21wdXRlRm9yUwogICAgICAgICAgICAgaWYgKGZvdW5kKQogICAgICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICAgICAgCi0gICAgICAgICAgICByZXN1bHQubV92YXJpYW50cy5hcHBl bmQoCi0gICAgICAgICAgICAgICAgR2V0QnlJZFZhcmlhbnQoU3RydWN0dXJlU2V0KHN0cnVjdHVy ZSksIG15T2Zmc2V0LCBzcGVjaWZpY1ZhbHVlKSk7CisgICAgICAgICAgICBpZiAoIXJlc3VsdC5h cHBlbmRWYXJpYW50KEdldEJ5SWRWYXJpYW50KFN0cnVjdHVyZVNldChzdHJ1Y3R1cmUpLCBteU9m ZnNldCwgc3BlY2lmaWNWYWx1ZSkpKQorICAgICAgICAgICAgICAgIHJldHVybiBHZXRCeUlkU3Rh dHVzKFRha2VzU2xvd1BhdGgsIHRydWUpOwogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICBy ZXR1cm4gcmVzdWx0OwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0dldEJ5 SWRTdGF0dXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv R2V0QnlJZFN0YXR1cy5oCShyZXZpc2lvbiAxNjUxMDgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5oCSh3b3JraW5nIGNvcHkpCkBAIC05OSw2ICs5OSw4 IEBAIHByaXZhdGU6CiAgICAgYm9vbCBjb21wdXRlRm9yQ2hhaW4oQ29kZUJsb2NrKiwgU3RyaW5n SW1wbCogdWlkLCBQYXNzUmVmUHRyPEludGVuZGVkU3RydWN0dXJlQ2hhaW4+KTsKICAgICBzdGF0 aWMgR2V0QnlJZFN0YXR1cyBjb21wdXRlRnJvbUxMSW50KENvZGVCbG9jayosIHVuc2lnbmVkIGJ5 dGVjb2RlSW5kZXgsIFN0cmluZ0ltcGwqIHVpZCk7CiAgICAgCisgICAgYm9vbCBhcHBlbmRWYXJp YW50KGNvbnN0IEdldEJ5SWRWYXJpYW50Jik7CisgICAgCiAgICAgU3RhdGUgbV9zdGF0ZTsKICAg ICBWZWN0b3I8R2V0QnlJZFZhcmlhbnQsIDE+IG1fdmFyaWFudHM7CiAgICAgYm9vbCBtX3dhc1Nl ZW5JbkpJVDsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9QdXRCeUlkU3Rh dHVzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUHV0 QnlJZFN0YXR1cy5jcHAJKHJldmlzaW9uIDE2NTEwOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9QdXRCeUlkU3RhdHVzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzcsNiArMzcs MTYgQEAKIAogbmFtZXNwYWNlIEpTQyB7CiAKK2Jvb2wgUHV0QnlJZFN0YXR1czo6YXBwZW5kVmFy aWFudChjb25zdCBQdXRCeUlkVmFyaWFudCYgdmFyaWFudCkKK3sKKyAgICBmb3IgKHVuc2lnbmVk IGkgPSAwOyBpIDwgbV92YXJpYW50cy5zaXplKCk7ICsraSkgeworICAgICAgICBpZiAobV92YXJp YW50c1tpXS5vbGRTdHJ1Y3R1cmUoKSA9PSB2YXJpYW50Lm9sZFN0cnVjdHVyZSgpKQorICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICBtX3ZhcmlhbnRzLmFwcGVuZCh2YXJpYW50 KTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogI2lmIEVOQUJMRShERkdfSklUKQogYm9vbCBQdXRC eUlkU3RhdHVzOjpoYXNFeGl0U2l0ZShjb25zdCBDb25jdXJyZW50SklUTG9ja2VyJiBsb2NrZXIs IENvZGVCbG9jayogcHJvZmlsZWRCbG9jaywgdW5zaWduZWQgYnl0ZWNvZGVJbmRleCwgRXhpdGlu Z0pJVFR5cGUgZXhpdFR5cGUpCiB7CkBAIC0xNzYsNyArMTg2LDggQEAgUHV0QnlJZFN0YXR1cyBQ dXRCeUlkU3RhdHVzOjpjb21wdXRlRm9yUwogICAgICAgICAgICAgICAgIFByb3BlcnR5T2Zmc2V0 IG9mZnNldCA9IHN0cnVjdHVyZS0+Z2V0Q29uY3VycmVudGx5KCpwcm9maWxlZEJsb2NrLT52bSgp LCB1aWQpOwogICAgICAgICAgICAgICAgIGlmICghaXNWYWxpZE9mZnNldChvZmZzZXQpKQogICAg ICAgICAgICAgICAgICAgICByZXR1cm4gUHV0QnlJZFN0YXR1cyhUYWtlc1Nsb3dQYXRoKTsKLSAg ICAgICAgICAgICAgICByZXN1bHQubV92YXJpYW50cy5hcHBlbmQoUHV0QnlJZFZhcmlhbnQ6OnJl cGxhY2Uoc3RydWN0dXJlLCBvZmZzZXQpKTsKKyAgICAgICAgICAgICAgICBpZiAoIXJlc3VsdC5h cHBlbmRWYXJpYW50KFB1dEJ5SWRWYXJpYW50OjpyZXBsYWNlKHN0cnVjdHVyZSwgb2Zmc2V0KSkp CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBQdXRCeUlkU3RhdHVzKFRha2VzU2xvd1BhdGgp OwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgICAg IApAQCAtMTg1LDExICsxOTYsMTMgQEAgUHV0QnlJZFN0YXR1cyBQdXRCeUlkU3RhdHVzOjpjb21w dXRlRm9yUwogICAgICAgICAgICAgICAgICAgICBhY2Nlc3MubmV3U3RydWN0dXJlKCktPmdldENv bmN1cnJlbnRseSgqcHJvZmlsZWRCbG9jay0+dm0oKSwgdWlkKTsKICAgICAgICAgICAgICAgICBp ZiAoIWlzVmFsaWRPZmZzZXQob2Zmc2V0KSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFB1 dEJ5SWRTdGF0dXMoVGFrZXNTbG93UGF0aCk7Ci0gICAgICAgICAgICAgICAgcmVzdWx0Lm1fdmFy aWFudHMuYXBwZW5kKFB1dEJ5SWRWYXJpYW50Ojp0cmFuc2l0aW9uKAorICAgICAgICAgICAgICAg IGJvb2wgb2sgPSByZXN1bHQuYXBwZW5kVmFyaWFudChQdXRCeUlkVmFyaWFudDo6dHJhbnNpdGlv bigKICAgICAgICAgICAgICAgICAgICAgYWNjZXNzLm9sZFN0cnVjdHVyZSgpLCBhY2Nlc3MubmV3 U3RydWN0dXJlKCksCiAgICAgICAgICAgICAgICAgICAgIGFjY2Vzcy5jaGFpbigpID8gYWRvcHRS ZWYobmV3IEludGVuZGVkU3RydWN0dXJlQ2hhaW4oCiAgICAgICAgICAgICAgICAgICAgICAgICBw cm9maWxlZEJsb2NrLCBhY2Nlc3Mub2xkU3RydWN0dXJlKCksIGFjY2Vzcy5jaGFpbigpKSkgOiAw LAogICAgICAgICAgICAgICAgICAgICBvZmZzZXQpKTsKKyAgICAgICAgICAgICAgICBpZiAoIW9r KQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gUHV0QnlJZFN0YXR1cyhUYWtlc1Nsb3dQYXRo KTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KIApJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1B1dEJ5SWRTdGF0dXMuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUHV0QnlJZFN0YXR1cy5oCShyZXZpc2lvbiAx NjUxMDgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUHV0QnlJZFN0YXR1cy5o CSh3b3JraW5nIGNvcHkpCkBAIC05NSw2ICs5NSw4IEBAIHByaXZhdGU6CiAjZW5kaWYKICAgICBz dGF0aWMgUHV0QnlJZFN0YXR1cyBjb21wdXRlRnJvbUxMSW50KENvZGVCbG9jayosIHVuc2lnbmVk IGJ5dGVjb2RlSW5kZXgsIFN0cmluZ0ltcGwqIHVpZCk7CiAgICAgCisgICAgYm9vbCBhcHBlbmRW YXJpYW50KGNvbnN0IFB1dEJ5SWRWYXJpYW50Jik7CisgICAgCiAgICAgU3RhdGUgbV9zdGF0ZTsK ICAgICBWZWN0b3I8UHV0QnlJZFZhcmlhbnQsIDE+IG1fdmFyaWFudHM7CiB9OwpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1N0cnVjdHVyZVNldC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TdHJ1Y3R1cmVTZXQuaAkocmV2aXNpb24g MTY1MTA4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1N0cnVjdHVyZVNldC5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMTUsNiArMTE1LDE1IEBAIHB1YmxpYzoKICAgICAgICAgcmV0 dXJuIG90aGVyLmlzU3Vic2V0T2YoKnRoaXMpOwogICAgIH0KICAgICAKKyAgICBib29sIG92ZXJs YXBzKGNvbnN0IFN0cnVjdHVyZVNldCYgb3RoZXIpIGNvbnN0CisgICAgeworICAgICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IG1fc3RydWN0dXJlcy5zaXplKCk7ICsraSkgeworICAgICAgICAg ICAgaWYgKG90aGVyLmNvbnRhaW5zKG1fc3RydWN0dXJlc1tpXSkpCisgICAgICAgICAgICAgICAg cmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAg ICAKICAgICBzaXplX3Qgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3RydWN0dXJlcy5zaXplKCk7 IH0KICAgICAKICAgICAvLyBDYWxsIHRoaXMgaWYgeW91IGtub3cgdGhhdCB0aGUgc3RydWN0dXJl IHNldCBtdXN0IGNvbnNpc3Qgb2YgZXhhY3RseQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2Z0bC9GVExDb21waWxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZnRsL0ZUTENvbXBpbGUuY3BwCShyZXZpc2lvbiAxNjUxMDgpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZnRsL0ZUTENvbXBpbGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MSw3ICs4MSw4IEBA IHN0YXRpYyB1aW50OF90KiBtbUFsbG9jYXRlRGF0YVNlY3Rpb24oCiAKICAgICBTdGF0ZSYgc3Rh dGUgPSAqc3RhdGljX2Nhc3Q8U3RhdGUqPihvcGFxdWVTdGF0ZSk7CiAgICAgCi0gICAgUmVmUHRy PERhdGFTZWN0aW9uPiBzZWN0aW9uID0gYWRvcHRSZWYobmV3IERhdGFTZWN0aW9uKHNpemUsIGFs aWdubWVudCkpOworICAgIFJlZlB0cjxEYXRhU2VjdGlvbj4gc2VjdGlvbiA9IGFkb3B0UmVmKG5l dyBEYXRhU2VjdGlvbigKKyAgICAgICAgc3RhdGUuZ3JhcGgubV92bSwgc3RhdGUuZ3JhcGgubV9j b2RlQmxvY2ssIHNpemUsIGFsaWdubWVudCkpOwogICAgIAogICAgIGlmICghc3RyY21wKHNlY3Rp b25OYW1lLCAiX19sbHZtX3N0YWNrbWFwcyIpKQogICAgICAgICBzdGF0ZS5zdGFja21hcHNTZWN0 aW9uID0gc2VjdGlvbjsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMRGF0YVNl Y3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMRGF0 YVNlY3Rpb24uY3BwCShyZXZpc2lvbiAxNjUxMDgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZnRsL0ZUTERhdGFTZWN0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQsOSArMzQsMjggQEAK IAogbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBGVEwgewogCi1EYXRhU2VjdGlvbjo6RGF0YVNl Y3Rpb24oc2l6ZV90IHNpemUsIHVuc2lnbmVkIGFsaWdubWVudCkKKyNpZiBDUFUoQVJNNjQpCitz dGF0aWMgY29uc3QgYm9vbCB1c2VFeGVjdXRhYmxlTWVtb3J5ID0gdHJ1ZTsKKyNlbHNlCitzdGF0 aWMgY29uc3QgYm9vbCB1c2VFeGVjdXRhYmxlTWVtb3J5ID0gZmFsc2U7CisjZW5kaWYKKworRGF0 YVNlY3Rpb246OkRhdGFTZWN0aW9uKFZNJiB2bSwgQ29kZUJsb2NrKiBjb2RlQmxvY2ssIHNpemVf dCBzaXplLCB1bnNpZ25lZCBhbGlnbm1lbnQpCiAgICAgOiBtX3NpemUoc2l6ZSkKIHsKKyAgICBp ZiAodXNlRXhlY3V0YWJsZU1lbW9yeSkgeworICAgICAgICBSRUxFQVNFX0FTU0VSVChhbGlnbm1l bnQgPCBqaXRBbGxvY2F0aW9uR3JhbnVsZSk7CisgICAgICAgIAorICAgICAgICBSZWZQdHI8RXhl Y3V0YWJsZU1lbW9yeUhhbmRsZT4gcmVzdWx0ID0KKyAgICAgICAgICAgIHZtLmV4ZWN1dGFibGVB bGxvY2F0b3IuYWxsb2NhdGUoCisgICAgICAgICAgICAgICAgdm0sIHNpemUsIGNvZGVCbG9jaywg SklUQ29tcGlsYXRpb25NdXN0U3VjY2VlZCk7CisgICAgICAgIG1fYmFzZSA9IHJlc3VsdC0+c3Rh cnQoKTsKKyAgICAgICAgbV9zaXplID0gcmVzdWx0LT5zaXplSW5CeXRlcygpOworICAgICAgICAK KyAgICAgICAgbV9hbGxvY2F0aW9uQmFzZSA9IHJlc3VsdC5yZWxlYXNlKCkubGVha1JlZigpOwor ICAgICAgICByZXR1cm47CisgICAgfQorICAgIAogICAgIFJFTEVBU0VfQVNTRVJUKFdURjo6Yml0 Q291bnQoYWxpZ25tZW50KSA9PSAxKTsKICAgICAKICAgICBjb25zdCB1bnNpZ25lZCBuYXRpdmVB bGlnbm1lbnQgPSA4OwpAQCAtNTUsNyArNzQsMTAgQEAgRGF0YVNlY3Rpb246OkRhdGFTZWN0aW9u KHNpemVfdCBzaXplLCB1bgogCiBEYXRhU2VjdGlvbjo6fkRhdGFTZWN0aW9uKCkKIHsKLSAgICBm YXN0RnJlZShtX2FsbG9jYXRpb25CYXNlKTsKKyAgICBpZiAodXNlRXhlY3V0YWJsZU1lbW9yeSkK KyAgICAgICAgc3RhdGljX2Nhc3Q8RXhlY3V0YWJsZU1lbW9yeUhhbmRsZSo+KG1fYWxsb2NhdGlv bkJhc2UpLT5kZXJlZigpOworICAgIGVsc2UKKyAgICAgICAgZmFzdEZyZWUobV9hbGxvY2F0aW9u QmFzZSk7CiB9CiAKIH0gfSAvLyBuYW1lc3BhY2UgSlNDOjpGVEwKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9mdGwvRlRMRGF0YVNlY3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZnRsL0ZUTERhdGFTZWN0aW9uLmgJKHJldmlzaW9uIDE2NTEwOCkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMRGF0YVNlY3Rpb24uaAkod29ya2luZyBjb3B5KQpA QCAtMjgsMTMgKzI4LDE1IEBACiAKICNpZiBFTkFCTEUoRlRMX0pJVCkKIAorI2luY2x1ZGUgIkNv ZGVCbG9jay5oIgorI2luY2x1ZGUgIlZNLmgiCiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4K IAogbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBGVEwgewogCiBjbGFzcyBEYXRhU2VjdGlvbiA6 IHB1YmxpYyBSZWZDb3VudGVkPERhdGFTZWN0aW9uPiB7CiBwdWJsaWM6Ci0gICAgRGF0YVNlY3Rp b24oc2l6ZV90IHNpemUsIHVuc2lnbmVkIGFsaWdubWVudCk7CisgICAgRGF0YVNlY3Rpb24oVk0m LCBDb2RlQmxvY2sqLCBzaXplX3Qgc2l6ZSwgdW5zaWduZWQgYWxpZ25tZW50KTsKICAgICB+RGF0 YVNlY3Rpb24oKTsKICAgICAKICAgICB2b2lkKiBiYXNlKCkgeyByZXR1cm4gbV9iYXNlOyB9Cklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNw cAkocmV2aXNpb24gMTY1MTA4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dl ckRGR1RvTExWTS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMiw2ICsxMDIsOSBAQCBwdWJsaWM6 CiAgICAgICAgICAgICBhZGRUYXJnZXREZXBlbmRlbnRGdW5jdGlvbkF0dHIobV9mdGxTdGF0ZS5m dW5jdGlvbiwgInRhcmdldC1mZWF0dXJlcyIsICItYXZ4Iik7CiAgICAgICAgIH0KICAgICAgICAg CisgICAgICAgIGlmICh2ZXJib3NlQ29tcGlsYXRpb25FbmFibGVkKCkpCisgICAgICAgICAgICBk YXRhTG9nKCJGdW5jdGlvbiByZWFkeSwgYmVnaW5uaW5nIGxvd2VyaW5nLlxuIik7CisgICAgICAg IAogICAgICAgICBtX291dC5pbml0aWFsaXplKG1fZnRsU3RhdGUubW9kdWxlLCBtX2Z0bFN0YXRl LmZ1bmN0aW9uLCBtX2hlYXBzKTsKICAgICAgICAgCiAgICAgICAgIG1fcHJvbG9ndWUgPSBGVExf TkVXX0JMT0NLKG1fb3V0LCAoIlByb2xvZ3VlIikpOwpAQCAtMTQxLDcgKzE0NCw3IEBAIHB1Ymxp YzoKICAgICAgICAgICAgIGRpZE92ZXJmbG93U3RhY2soKSwgcmFyZWx5KHN0YWNrT3ZlcmZsb3cp LCB1c3VhbGx5KGxvd0Jsb2NrKG1fZ3JhcGguYmxvY2soMCkpKSk7CiAgICAgICAgIAogICAgICAg ICBtX291dC5hcHBlbmRUbyhzdGFja092ZXJmbG93LCBtX2hhbmRsZUV4Y2VwdGlvbnMpOwotICAg ICAgICB2bUNhbGwobV9vdXQub3BlcmF0aW9uKG9wZXJhdGlvblRocm93U3RhY2tPdmVyZmxvd0Vy cm9yKSwgbV9jYWxsRnJhbWUsIG1fb3V0LmNvbnN0SW50UHRyKGNvZGVCbG9jaygpKSwgTm9FeGNl cHRpb25zKTsKKyAgICAgICAgbV9vdXQuY2FsbChtX291dC5vcGVyYXRpb24ob3BlcmF0aW9uVGhy b3dTdGFja092ZXJmbG93RXJyb3IpLCBtX2NhbGxGcmFtZSwgbV9vdXQuY29uc3RJbnRQdHIoY29k ZUJsb2NrKCkpKTsKICAgICAgICAgbV9mdGxTdGF0ZS5oYW5kbGVTdGFja092ZXJmbG93RXhjZXB0 aW9uU3RhY2ttYXBJRCA9IG1fc3RhY2ttYXBJRHMrKzsKICAgICAgICAgbV9vdXQuY2FsbCgKICAg ICAgICAgICAgIG1fb3V0LnN0YWNrbWFwSW50cmluc2ljKCksIG1fb3V0LmNvbnN0SW50NjQobV9m dGxTdGF0ZS5oYW5kbGVTdGFja092ZXJmbG93RXhjZXB0aW9uU3RhY2ttYXBJRCksCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTE91dHB1dC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMT3V0cHV0LmgJKHJldmlzaW9uIDE2NTEwOCkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMT3V0cHV0LmgJKHdvcmtpbmcgY29weSkKQEAgLTMz LDYgKzMzLDcgQEAKICNpbmNsdWRlICJGVExBYnN0cmFjdEhlYXBSZXBvc2l0b3J5LmgiCiAjaW5j bHVkZSAiRlRMQ29tbW9uVmFsdWVzLmgiCiAjaW5jbHVkZSAiRlRMSW50cmluc2ljUmVwb3NpdG9y eS5oIgorI2luY2x1ZGUgIkZUTFN0YXRlLmgiCiAjaW5jbHVkZSAiRlRMU3dpdGNoQ2FzZS5oIgog I2luY2x1ZGUgIkZUTFR5cGVkUG9pbnRlci5oIgogI2luY2x1ZGUgIkZUTFdlaWdodC5oIgpAQCAt MTcwLDEyICsxNzEsMTIgQEAgcHVibGljOgogCiAgICAgTFZhbHVlIGRvdWJsZVNpbihMVmFsdWUg dmFsdWUpCiAgICAgewotICAgICAgICByZXR1cm4gY2FsbChpbnRyaW5zaWNPck9wZXJhdGlvbihk b3VibGVTaW5JbnRyaW5zaWMoKSwgc2luKSwgdmFsdWUpOworICAgICAgICByZXR1cm4gY2FsbChp c1g4NigpID8gZG91YmxlU2luSW50cmluc2ljKCkgOiBvcGVyYXRpb24oc2luKSwgdmFsdWUpOwog ICAgICAgICAKICAgICB9CiAgICAgTFZhbHVlIGRvdWJsZUNvcyhMVmFsdWUgdmFsdWUpCiAgICAg ewotICAgICAgICByZXR1cm4gY2FsbChpbnRyaW5zaWNPck9wZXJhdGlvbihkb3VibGVDb3NJbnRy aW5zaWMoKSwgY29zKSwgdmFsdWUpOworICAgICAgICByZXR1cm4gY2FsbChpc1g4NigpID8gZG91 YmxlQ29zSW50cmluc2ljKCkgOiBvcGVyYXRpb24oY29zKSwgdmFsdWUpOwogICAgIH0KIAogICAg IExWYWx1ZSBkb3VibGVTcXJ0KExWYWx1ZSB2YWx1ZSkKQEAgLTM1NCwyMSArMzU1LDYgQEAgcHVi bGljOgogICAgICAgICByZXR1cm4gaW50VG9QdHIoY29uc3RJbnRQdHIoZnVuY3Rpb24pLCBwb2lu dGVyVHlwZShvcGVyYXRpb25UeXBlKGZ1bmN0aW9uKSkpOwogICAgIH0KICAgICAKLSAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBGdW5jdGlvblR5cGU+Ci0gICAgTFZhbHVlIGludHJpbnNpY09yT3BlcmF0 aW9uKExWYWx1ZSBpbnRyaW5zaWMsIEZ1bmN0aW9uVHlwZSBmdW5jdGlvbikKLSAgICB7Ci0gICAg ICAgIGlmIChpc1g4NigpKQotICAgICAgICAgICAgcmV0dXJuIGludHJpbnNpYzsKLSAgICAgICAg Ci0gICAgICAgIC8vIExMVk0ncyBiZWhhdmlvciB3aXRoIHJlc3BlY3QgdG8gbWF0aCBpbnRyaW5z aWNzIHRoYXQgbG93ZXIgdG8gY2FsbHMgaXMgcHJldHR5IG9kZAotICAgICAgICAvLyBvbiBoYXJk d2FyZSB0aGF0IHJlcXVpcmVzIHJlYWwgZWZmb3J0IGR1cmluZyByZWxvY2F0aW9uLgotICAgICAg ICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5NDk1Ci0gICAg ICAgIAotICAgICAgICAvLyBGSVhNRTogQXQgbGVhc3QgbWFyayB0aGVzZSBwdXJlLgotICAgICAg ICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5NDk0Ci0gICAg ICAgIHJldHVybiBvcGVyYXRpb24oZnVuY3Rpb24pOwotICAgIH0KLSAgICAKICAgICB2b2lkIGp1 bXAoTEJhc2ljQmxvY2sgZGVzdGluYXRpb24pIHsgYnVpbGRCcihtX2J1aWxkZXIsIGRlc3RpbmF0 aW9uKTsgfQogICAgIHZvaWQgYnJhbmNoKExWYWx1ZSBjb25kaXRpb24sIExCYXNpY0Jsb2NrIHRh a2VuLCBXZWlnaHQgdGFrZW5XZWlnaHQsIExCYXNpY0Jsb2NrIG5vdFRha2VuLCBXZWlnaHQgbm90 VGFrZW5XZWlnaHQpOwogICAgIHZvaWQgYnJhbmNoKExWYWx1ZSBjb25kaXRpb24sIFdlaWdodGVk VGFyZ2V0IHRha2VuLCBXZWlnaHRlZFRhcmdldCBub3RUYWtlbikKQEAgLTQzMCw3ICs0MTYsNyBA QCBwdWJsaWM6CiB9OwogCiAjZGVmaW5lIEZUTF9ORVdfQkxPQ0sob3V0cHV0LCBuYW1lQXJndW1l bnRzKSBcCi0gICAgKExJS0VMWSghOjpKU0M6OkRGRzo6dmVyYm9zZUNvbXBpbGF0aW9uRW5hYmxl ZCgpKSBcCisgICAgKExJS0VMWSghdmVyYm9zZUNvbXBpbGF0aW9uRW5hYmxlZCgpKSBcCiAgICAg PyAob3V0cHV0KS5uZXdCbG9jaygpIFwKICAgICA6IChvdXRwdXQpLm5ld0Jsb2NrKCh0b0NTdHJp bmcgbmFtZUFyZ3VtZW50cykuZGF0YSgpKSkKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNDSlNWYWx1ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSlNDSlNWYWx1ZS5jcHAJKHJldmlzaW9uIDE2NTEwOCkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ0pTVmFsdWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y MjksNiArMjI5LDkgQEAgdm9pZCBKU1ZhbHVlOjpkdW1wSW5Db250ZXh0KFByaW50U3RyZWFtJgog ICAgICAgICAgICAgb3V0LnByaW50KCJDZWxsOiAiLCBSYXdQb2ludGVyKGFzQ2VsbCgpKSk7CiAg ICAgICAgICAgICBvdXQucHJpbnQoIiAoIiwgaW5Db250ZXh0KCphc0NlbGwoKS0+c3RydWN0dXJl KCksIGNvbnRleHQpLCAiKSIpOwogICAgICAgICB9CisjaWYgVVNFKEpTVkFMVUU2NCkKKyAgICAg ICAgb3V0LnByaW50KCIsIElEOiAiLCBhc0NlbGwoKS0+c3RydWN0dXJlSUQoKSk7CisjZW5kaWYK ICAgICB9IGVsc2UgaWYgKGlzVHJ1ZSgpKQogICAgICAgICBvdXQucHJpbnQoIlRydWUiKTsKICAg ICBlbHNlIGlmIChpc0ZhbHNlKCkpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU0NlbGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U0NlbGwuaAkocmV2aXNpb24gMTY1MTA4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNDZWxsLmgJKHdvcmtpbmcgY29weSkKQEAgLTk2LDYgKzk2LDcgQEAgcHVibGljOgogCiAg ICAgSlNUeXBlIHR5cGUoKSBjb25zdDsKICAgICBJbmRleGluZ1R5cGUgaW5kZXhpbmdUeXBlKCkg Y29uc3Q7CisgICAgU3RydWN0dXJlSUQgc3RydWN0dXJlSUQoKSBjb25zdCB7IHJldHVybiBtX3N0 cnVjdHVyZUlEOyB9CiAgICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUoKSBjb25zdDsKICAgICBTdHJ1 Y3R1cmUqIHN0cnVjdHVyZShWTSYpIGNvbnN0OwogICAgIHZvaWQgc2V0U3RydWN0dXJlKFZNJiwg U3RydWN0dXJlKik7Cg==