152551 2015-12-24 16:54:13 -0800 Add support for aliasing JSC Options 2016-01-08 03:20:46 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 152750 1 mark.lam mark.lam benjamin commit-queue fpizlo ggaren keith_miller msaboff ossy saam oldest_to_newest 1151299 0 mark.lam 2015-12-24 16:54:13 -0800 This allows us to use old options names as well. This is for the benefit of third party tools which may have been built to rely on those old options. 1151300 1 267906 mark.lam 2015-12-24 17:17:46 -0800 Created attachment 267906 proposed patch. 1151301 2 commit-queue 2015-12-24 17:19:28 -0800 Attachment 267906 did not pass style-queue: ERROR: Source/JavaScriptCore/runtime/Options.cpp:584: Multi line control clauses should use braces. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/runtime/Options.cpp:589: Multi line control clauses should use braces. [whitespace/braces] [4] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1152389 3 ggaren 2016-01-04 10:59:04 -0800 Which tools rely on old options? Who are the third parties? 1152400 4 fpizlo 2016-01-04 11:14:16 -0800 (In reply to comment #3) > Which tools rely on old options? Who are the third parties? We often tell people to use our options. They are all internal clients. 1152769 5 mark.lam 2016-01-05 11:13:08 -0800 Thanks for the review. Landed in r194591: <http://trac.webkit.org/r194591>. 1152821 6 commit-queue 2016-01-05 12:34:37 -0800 Re-opened since this is blocked by bug 152750 1152827 7 mark.lam 2016-01-05 12:37:03 -0800 The requested was invalid. 1152829 8 mark.lam 2016-01-05 12:37:19 -0800 (In reply to comment #7) > The requested was invalid. I meant "requested rollout". 1153786 9 267906 ossy 2016-01-08 03:20:46 -0800 Comment on attachment 267906 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=267906&action=review > Source/JavaScriptCore/jsc.cpp:1973 > - JSC::Options::dumpAllOptions(stderr, JSC::Options::DumpLevel::Verbose, "All JSC runtime options:"); > + JSC::Options::dumpAllOptions(stderr, JSC::Options::DumpLevel::Overridden, "All JSC runtime options:"); Now there is no way to dump all options without modifying the source code. :-/ And in this case the help message of --options and --dumpOptions are misleading. 267906 2015-12-24 17:17:46 -0800 2016-01-05 11:07:05 -0800 proposed patch. bug-152551.patch text/plain 10228 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk0NDE2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBA CisyMDE1LTEyLTI0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgc3VwcG9ydCBmb3IgYWxpYXNpbmcgSlNDIE9wdGlvbnMuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTI1NTEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFsbG93cyB1cyB0byB1c2Ugb2xkIG9w dGlvbnMgbmFtZXMgYXMgd2VsbC4gIFRoaXMgaXMgZm9yIHRoZSBiZW5lZml0IG9mCisgICAgICAg IHRoaXJkIHBhcnR5IHRvb2xzIHdoaWNoIG1heSBoYXZlIGJlZW4gYnVpbHQgdG8gcmVseSBvbiB0 aG9zZSBvbGQgb3B0aW9ucy4gIFRoZQorICAgICAgICBvbGQgb3B0aW9uIG5hbWVzIHdpbGwgYmUg bWFwcGVkIHRvIHRoZSBjdXJyZW50IG9wdGlvbiBuYW1lcyBpbiBzZXRPcHRpb24oKS4KKworICAg ICAgICBGb3Igc29tZSBvcHRpb25zLCB0aGUgb2xkIG9wdGlvbiBuYW1lIHNwZWNpZmllcyB0aGUg aW52ZXJzZSBib29sZWFuIHZhbHVlIG9mIHRoZQorICAgICAgICBjdXJyZW50IG9wdGlvbiBuYW1l LiAgc2V0T3B0aW9uKCkgd2lsbCB0YWtlIGNhcmUgb2YgaW52ZXJ0aW5nIHRoZSB2YWx1ZSBiZWZv cmUKKyAgICAgICAgYXBwbHlpbmcgaXQgdG8gdGhlIG9wdGlvbi4KKworICAgICAgICAqIGpzYy5j cHA6CisgICAgICAgIChDb21tYW5kTGluZTo6cGFyc2VBcmd1bWVudHMpOgorICAgICAgICAtIFN3 aXRjaCB0byBkdW1waW5nIG9ubHkgb3ZlcnJpZGRlbiBvcHRpb25zIGhlcmUuICBWZXJib3NlIGR1 bXBpbmcgaXMgdG9vIG11Y2gKKyAgICAgICAgICBmb3IgY29tbW9uIHVzYWdlLgorICAgICAgICAq IHJ1bnRpbWUvT3B0aW9ucy5jcHA6CisgICAgICAgIChKU0M6Om92ZXJyaWRlT3B0aW9uV2l0aEhl dXJpc3RpYyk6CisgICAgICAgIChKU0M6Ok9wdGlvbnM6Om92ZXJyaWRlQWxpYXNlZE9wdGlvbldp dGhIZXVyaXN0aWMpOgorICAgICAgICAoSlNDOjpjb21wdXRlTnVtYmVyT2ZXb3JrZXJUaHJlYWRz KToKKyAgICAgICAgKEpTQzo6T3B0aW9uczo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChKU0M6Ok9w dGlvbnM6OnNldE9wdGlvbldpdGhvdXRBbGlhcyk6CisgICAgICAgIChKU0M6OmludmVydEJvb2xP cHRpb25WYWx1ZSk6CisgICAgICAgIChKU0M6Ok9wdGlvbnM6OnNldEFsaWFzZWRPcHRpb24pOgor ICAgICAgICAoSlNDOjpPcHRpb25zOjpzZXRPcHRpb24pOgorICAgICAgICAoSlNDOjpPcHRpb25z OjpkdW1wQWxsT3B0aW9ucyk6CisgICAgICAgIC0gU3RyaW5nLmFzY2lpKCkgY29udmVydHMgbmV3 bGluZSBjaGFyYWN0ZXJzIHRvICc/JywgYW5kIHRoaXMgd2FzIG1lc3NpbmcgdXAgdGhlCisgICAg ICAgICAgcHJpbnRpbmcgb2YgdGhlIG9wdGlvbnMuICBTd2l0Y2hlZCB0byB1c2luZyBTdHJpbmcu dXRmOCgpIGluc3RlYWQuCisgICAgICAgIChKU0M6Ok9wdGlvbnM6OmR1bXBPcHRpb24pOgorICAg ICAgICAqIHJ1bnRpbWUvT3B0aW9ucy5oOgorCiAyMDE1LTEyLTIzICBBbmRyZWFzIEtsaW5nICA8 YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBqc2MgQ0xJIHRvb2wgY3Jhc2hlcyBvbiBFT0Yu CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAkocmV2aXNpb24gMTk0NDE1KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2pzYy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5NzAsNyArMTk3MCw3IEBA IHZvaWQgQ29tbWFuZExpbmU6OnBhcnNlQXJndW1lbnRzKGludCBhcmcKICAgICAgICAgbV9hcmd1 bWVudHMuYXBwZW5kKGFyZ3ZbaV0pOwogCiAgICAgaWYgKG5lZWRUb0R1bXBPcHRpb25zKQotICAg ICAgICBKU0M6Ok9wdGlvbnM6OmR1bXBBbGxPcHRpb25zKHN0ZGVyciwgSlNDOjpPcHRpb25zOjpE dW1wTGV2ZWw6OlZlcmJvc2UsICJBbGwgSlNDIHJ1bnRpbWUgb3B0aW9uczoiKTsKKyAgICAgICAg SlNDOjpPcHRpb25zOjpkdW1wQWxsT3B0aW9ucyhzdGRlcnIsIEpTQzo6T3B0aW9uczo6RHVtcExl dmVsOjpPdmVycmlkZGVuLCAiQWxsIEpTQyBydW50aW1lIG9wdGlvbnM6Iik7CiAgICAgSlNDOjpP cHRpb25zOjplbnN1cmVPcHRpb25zQXJlQ29oZXJlbnQoKTsKICAgICBpZiAobmVlZFRvRXhpdCkK ICAgICAgICAganNjRXhpdChFWElUX1NVQ0NFU1MpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvT3B0aW9ucy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvT3B0aW9ucy5jcHAJKHJldmlzaW9uIDE5NDQxNSkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjMsNiAr MTIzLDIxIEBAIGJvb2wgb3ZlcnJpZGVPcHRpb25XaXRoSGV1cmlzdGljKFQmIHZhcmkKICAgICBy ZXR1cm4gZmFsc2U7CiB9CiAKK2Jvb2wgT3B0aW9uczo6b3ZlcnJpZGVBbGlhc2VkT3B0aW9uV2l0 aEhldXJpc3RpYyhjb25zdCBjaGFyKiBuYW1lKQoreworICAgIGNvbnN0IGNoYXIqIHN0cmluZ1Zh bHVlID0gZ2V0ZW52KG5hbWUpOworICAgIGlmICghc3RyaW5nVmFsdWUpCisgICAgICAgIHJldHVy biBmYWxzZTsKKworICAgIFN0cmluZyBhbGlhc2VkT3B0aW9uOworICAgIGFsaWFzZWRPcHRpb24g PSBTdHJpbmcoJm5hbWVbNF0pICsgIj0iICsgc3RyaW5nVmFsdWU7CisgICAgaWYgKE9wdGlvbnM6 OnNldE9wdGlvbihhbGlhc2VkT3B0aW9uLnV0ZjgoKS5kYXRhKCkpKQorICAgICAgICByZXR1cm4g dHJ1ZTsKKworICAgIGZwcmludGYoc3RkZXJyLCAiV0FSTklORzogZmFpbGVkIHRvIHBhcnNlICVz PSVzXG4iLCBuYW1lLCBzdHJpbmdWYWx1ZSk7CisgICAgcmV0dXJuIGZhbHNlOworfQorCiBzdGF0 aWMgdW5zaWduZWQgY29tcHV0ZU51bWJlck9mV29ya2VyVGhyZWFkcyhpbnQgbWF4TnVtYmVyT2ZX b3JrZXJUaHJlYWRzLCBpbnQgbWluaW11bSA9IDEpCiB7CiAgICAgaW50IGNwdXNUb1VzZSA9IHN0 ZDo6bWluKFdURjo6bnVtYmVyT2ZQcm9jZXNzb3JDb3JlcygpLCBtYXhOdW1iZXJPZldvcmtlclRo cmVhZHMpOwpAQCAtMzY2LDYgKzM4MSwxMSBAQCB2b2lkIE9wdGlvbnM6OmluaXRpYWxpemUoKQog ICAgICAgICAgICAgSlNDX09QVElPTlMoRk9SX0VBQ0hfT1BUSU9OKQogI3VuZGVmIEZPUl9FQUNI X09QVElPTgogCisjZGVmaW5lIEZPUl9FQUNIX09QVElPTihhbGlhc2VkTmFtZV8sIHVuYWxpYXNl ZE5hbWVfLCBlcXVpdmFsZW5jZV8pIFwKKyAgICAgICAgICAgIG92ZXJyaWRlQWxpYXNlZE9wdGlv bldpdGhIZXVyaXN0aWMoIkpTQ18iICNhbGlhc2VkTmFtZV8pOworICAgICAgICAgICAgSlNDX0FM SUFTRURfT1BUSU9OUyhGT1JfRUFDSF9PUFRJT04pCisjdW5kZWYgRk9SX0VBQ0hfT1BUSU9OCisK ICNpZiAwCiAgICAgICAgICAgICAgICAgOyAvLyBEZWNvbmZ1c2UgZWRpdG9ycyB0aGF0IGRvIGF1 dG8gaW5kZW50YXRpb24KICNlbmRpZgpAQCAtNTA4LDcgKzUyOCw3IEBAIGJvb2wgT3B0aW9uczo6 c2V0T3B0aW9ucyhjb25zdCBjaGFyKiBvcHQKIAogLy8gUGFyc2VzIGEgc2luZ2xlIGNvbW1hbmQg bGluZSBvcHRpb24gaW4gdGhlIGZvcm1hdCAiPG9wdGlvbk5hbWU+PTx2YWx1ZT4iCiAvLyAobm8g c3BhY2VzIGFsbG93ZWQpIGFuZCBzZXQgdGhlIHNwZWNpZmllZCBvcHRpb24gaWYgYXBwcm9wcmlh dGUuCi1ib29sIE9wdGlvbnM6OnNldE9wdGlvbihjb25zdCBjaGFyKiBhcmcpCitib29sIE9wdGlv bnM6OnNldE9wdGlvbldpdGhvdXRBbGlhcyhjb25zdCBjaGFyKiBhcmcpCiB7CiAgICAgLy8gYXJn IHNob3VsZCBsb29rIGxpa2UgdGhpczoKICAgICAvLyAgIDxqc2NPcHRpb25OYW1lPj08YXBwcm9w cmlhdGUgdmFsdWU+CkBAIC01NDAsNiArNTYwLDU3IEBAIGJvb2wgT3B0aW9uczo6c2V0T3B0aW9u KGNvbnN0IGNoYXIqIGFyZykKICAgICByZXR1cm4gZmFsc2U7IC8vIE5vIG9wdGlvbiBtYXRjaGVk LgogfQogCitzdGF0aWMgYm9vbCBpbnZlcnRCb29sT3B0aW9uVmFsdWUoY29uc3QgY2hhciogdmFs dWVTdHIsIGNvbnN0IGNoYXIqJiBpbnZlcnRlZFZhbHVlU3RyKQoreworICAgIGJvb2wgYm9vbFZh bHVlOworICAgIGlmICghcGFyc2UodmFsdWVTdHIsIGJvb2xWYWx1ZSkpCisgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICBpbnZlcnRlZFZhbHVlU3RyID0gYm9vbFZhbHVlID8gImZhbHNlIiA6ICJ0 cnVlIjsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworCitib29sIE9wdGlvbnM6OnNldEFsaWFzZWRP cHRpb24oY29uc3QgY2hhciogYXJnKQoreworICAgIC8vIGFyZyBzaG91bGQgbG9vayBsaWtlIHRo aXM6CisgICAgLy8gICA8anNjT3B0aW9uTmFtZT49PGFwcHJvcHJpYXRlIHZhbHVlPgorICAgIGNv bnN0IGNoYXIqIGVxdWFsU3RyID0gc3RyY2hyKGFyZywgJz0nKTsKKyAgICBpZiAoIWVxdWFsU3Ry KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBGb3IgZWFjaCBvcHRpb24sIGNoZWNr IGlmIHRoZSBzcGVjaWZ5IGFyZyBpcyBhIG1hdGNoLiBJZiBzbywgc2V0IHRoZSBhcmcKKyAgICAv LyBpZiB0aGUgdmFsdWUgbWFrZXMgc2Vuc2UuIE90aGVyd2lzZSwgbW92ZSBvbiB0byBjaGVja2lu ZyB0aGUgbmV4dCBvcHRpb24uCisjZGVmaW5lIEZPUl9FQUNIX09QVElPTihhbGlhc2VkTmFtZV8s IHVuYWxpYXNlZE5hbWVfLCBlcXVpdmFsZW5jZSkgXAorICAgIGlmIChzdHJsZW4oI2FsaWFzZWRO YW1lXykgPT0gc3RhdGljX2Nhc3Q8c2l6ZV90PihlcXVhbFN0ciAtIGFyZykgICAgXAorICAgICAg ICAmJiAhc3RybmNtcChhcmcsICNhbGlhc2VkTmFtZV8sIGVxdWFsU3RyIC0gYXJnKSkgeyAgICAg ICAgICAgICAgXAorICAgICAgICBTdHJpbmcgdW5hbGlhc2VkT3B0aW9uKCN1bmFsaWFzZWROYW1l Xyk7ICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICBpZiAoZXF1aXZhbGVuY2UgPT0g U2FtZU9wdGlvbikgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAg ICAgdW5hbGlhc2VkT3B0aW9uID0gdW5hbGlhc2VkT3B0aW9uICsgZXF1YWxTdHI7ICAgICAgICAg ICAgICAgXAorICAgICAgICBlbHNlIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgQVNTRVJUKGVxdWl2YWxlbmNl ID09IEludmVydGVkT3B0aW9uKTsgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAg Y29uc3QgY2hhciogaW52ZXJ0ZWRWYWx1ZVN0ciA9IG51bGxwdHI7ICAgICAgICAgICAgICAgICAg ICAgXAorICAgICAgICAgICAgaWYgKCFpbnZlcnRCb29sT3B0aW9uVmFsdWUoZXF1YWxTdHIgKyAx LCBpbnZlcnRlZFZhbHVlU3RyKSkgXAorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgdW5h bGlhc2VkT3B0aW9uID0gdW5hbGlhc2VkT3B0aW9uICsgIj0iICsgaW52ZXJ0ZWRWYWx1ZVN0cjsg XAorICAgICAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXAorICAgICAgICByZXR1cm4gc2V0T3B0aW9uV2l0aG91dEFsaWFz KHVuYWxpYXNlZE9wdGlvbi51dGY4KCkuZGF0YSgpKTsgICBcCisgICAgfQorCisgICAgSlNDX0FM SUFTRURfT1BUSU9OUyhGT1JfRUFDSF9PUFRJT04pCisjdW5kZWYgRk9SX0VBQ0hfT1BUSU9OCisK KyAgICByZXR1cm4gZmFsc2U7IC8vIE5vIG9wdGlvbiBtYXRjaGVkLgorfQorCitib29sIE9wdGlv bnM6OnNldE9wdGlvbihjb25zdCBjaGFyKiBhcmcpCit7CisgICAgYm9vbCBzdWNjZXNzID0gc2V0 T3B0aW9uV2l0aG91dEFsaWFzKGFyZyk7CisgICAgaWYgKHN1Y2Nlc3MpCisgICAgICAgIHJldHVy biB0cnVlOworICAgIHJldHVybiBzZXRBbGlhc2VkT3B0aW9uKGFyZyk7Cit9CisKKwogdm9pZCBP cHRpb25zOjpkdW1wQWxsT3B0aW9ucyhTdHJpbmdCdWlsZGVyJiBidWlsZGVyLCBEdW1wTGV2ZWwg bGV2ZWwsIGNvbnN0IGNoYXIqIHRpdGxlLAogICAgIGNvbnN0IGNoYXIqIHNlcGFyYXRvciwgY29u c3QgY2hhciogb3B0aW9uSGVhZGVyLCBjb25zdCBjaGFyKiBvcHRpb25Gb290ZXIsIER1bXBEZWZh dWx0c09wdGlvbiBkdW1wRGVmYXVsdHNPcHRpb24pCiB7CkBAIC01NjQsNyArNjM1LDcgQEAgdm9p ZCBPcHRpb25zOjpkdW1wQWxsT3B0aW9ucyhGSUxFKiBzdHJlYQogewogICAgIFN0cmluZ0J1aWxk ZXIgYnVpbGRlcjsKICAgICBkdW1wQWxsT3B0aW9ucyhidWlsZGVyLCBsZXZlbCwgdGl0bGUsIG51 bGxwdHIsICIgICAiLCAiXG4iLCBEdW1wRGVmYXVsdHMpOwotICAgIGZwcmludGYoc3RyZWFtLCAi JXMiLCBidWlsZGVyLnRvU3RyaW5nKCkuYXNjaWkoKS5kYXRhKCkpOworICAgIGZwcmludGYoc3Ry ZWFtLCAiJXMiLCBidWlsZGVyLnRvU3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiB9CiAKIHZvaWQg T3B0aW9uczo6ZHVtcE9wdGlvbihTdHJpbmdCdWlsZGVyJiBidWlsZGVyLCBEdW1wTGV2ZWwgbGV2 ZWwsIE9wdGlvbklEIGlkLApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0 aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlv bnMuaAkocmV2aXNpb24gMTk0NDE1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv T3B0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNTEsNiArMzUxLDQ1IEBAIHR5cGVkZWYgY29u c3QgY2hhciogb3B0aW9uU3RyaW5nOwogICAgIHYoYm9vbCwgZHVtcE1vZHVsZUxvYWRpbmdTdGF0 ZSwgZmFsc2UsIG51bGxwdHIpIFwKICAgICB2KGJvb2wsIGV4cG9zZUludGVybmFsTW9kdWxlTG9h ZGVyLCBmYWxzZSwgImV4cG9zZSB0aGUgaW50ZXJuYWwgbW9kdWxlIGxvYWRlciBvYmplY3QgdG8g dGhlIGdsb2JhbCBzcGFjZSBmb3IgZGVidWdnaW5nIikgXAogCitlbnVtIE9wdGlvbkVxdWl2YWxl bmNlIHsKKyAgICBTYW1lT3B0aW9uLAorICAgIEludmVydGVkT3B0aW9uLAorfTsKKworI2RlZmlu ZSBKU0NfQUxJQVNFRF9PUFRJT05TKHYpIFwKKyAgICB2KGVuYWJsZUZ1bmN0aW9uRG90QXJndW1l bnRzLCB1c2VGdW5jdGlvbkRvdEFyZ3VtZW50cywgU2FtZU9wdGlvbikgXAorICAgIHYoZW5hYmxl VGFpbENhbGxzLCB1c2VUYWlsQ2FsbHMsIFNhbWVPcHRpb24pIFwKKyAgICB2KHNob3dEaXNhc3Nl bWJseSwgZHVtcERpc2Fzc2VtYmx5LCBTYW1lT3B0aW9uKSBcCisgICAgdihzaG93REZHRGlzYXNz ZW1ibHksIGR1bXBERkdEaXNhc3NlbWJseSwgU2FtZU9wdGlvbikgXAorICAgIHYoc2hvd0ZUTERp c2Fzc2VtYmx5LCBkdW1wRlRMRGlzYXNzZW1ibHksIFNhbWVPcHRpb24pIFwKKyAgICB2KHNob3dB bGxERkdOb2RlcywgZHVtcEFsbERGR05vZGVzLCBTYW1lT3B0aW9uKSBcCisgICAgdihhbHdheXNE b0Z1bGxDb2xsZWN0aW9uLCB1c2VHZW5lcmF0aW9uYWxHQywgSW52ZXJ0ZWRPcHRpb24pIFwKKyAg ICB2KGVuYWJsZU9TUkVudHJ5VG9ERkcsIHVzZU9TUkVudHJ5VG9ERkcsIFNhbWVPcHRpb24pIFwK KyAgICB2KGVuYWJsZU9TUkVudHJ5VG9GVEwsIHVzZU9TUkVudHJ5VG9GVEwsIFNhbWVPcHRpb24p IFwKKyAgICB2KGVuYWJsZUxMVk1GYXN0SVNlbCwgdXNlTExWTUZhc3RJU2VsLCBTYW1lT3B0aW9u KSBcCisgICAgdihlbmFibGVBY2Nlc3NJbmxpbmluZywgdXNlQWNjZXNzSW5saW5pbmcsIFNhbWVP cHRpb24pIFwKKyAgICB2KGVuYWJsZVBvbHl2YXJpYW50RGV2aXJ0dWFsaXphdGlvbiwgdXNlUG9s eXZhcmlhbnREZXZpcnR1YWxpemF0aW9uLCBTYW1lT3B0aW9uKSBcCisgICAgdihlbmFibGVQb2x5 bW9ycGhpY0FjY2Vzc0lubGluaW5nLCB1c2VQb2x5bW9ycGhpY0FjY2Vzc0lubGluaW5nLCBTYW1l T3B0aW9uKSBcCisgICAgdihlbmFibGVQb2x5bW9ycGhpY0NhbGxJbmxpbmluZywgdXNlUG9seW1v cnBoaWNDYWxsSW5saW5pbmcsIFNhbWVPcHRpb24pIFwKKyAgICB2KGVuYWJsZU1vdkhpbnRSZW1v dmFsLCB1c2VNb3ZIaW50UmVtb3ZhbCwgU2FtZU9wdGlvbikgXAorICAgIHYoZW5hYmxlT2JqZWN0 QWxsb2NhdGlvblNpbmtpbmcsIHVzZU9iamVjdEFsbG9jYXRpb25TaW5raW5nLCBTYW1lT3B0aW9u KSBcCisgICAgdihlbmFibGVDb3B5QmFycmllck9wdGltaXphdGlvbiwgdXNlQ29weUJhcnJpZXJP cHRpbWl6YXRpb24sIFNhbWVPcHRpb24pIFwKKyAgICB2KGVuYWJsZUNvbmN1cnJlbnRKSVQsIHVz ZUNvbmN1cnJlbnRKSVQsIFNhbWVPcHRpb24pIFwKKyAgICB2KGVuYWJsZVByb2ZpbGVyLCB1c2VQ cm9maWxlciwgU2FtZU9wdGlvbikgXAorICAgIHYoZW5hYmxlQXJjaGl0ZWN0dXJlU3BlY2lmaWNP cHRpbWl6YXRpb25zLCB1c2VBcmNoaXRlY3R1cmVTcGVjaWZpY09wdGltaXphdGlvbnMsIFNhbWVP cHRpb24pIFwKKyAgICB2KGVuYWJsZVBvbHl2YXJpYW50Q2FsbElubGluaW5nLCB1c2VQb2x5dmFy aWFudENhbGxJbmxpbmluZywgU2FtZU9wdGlvbikgXAorICAgIHYoZW5hYmxlUG9seXZhcmlhbnRC eUlkSW5saW5pbmcsIHVzZVBvbHl2YXJpYW50QnlJZElubGluaW5nLCBTYW1lT3B0aW9uKSBcCisg ICAgdihlbmFibGVNYXhpbWFsRmx1c2hJbnNlcnRpb25QaGFzZSwgdXNlTWF4aW1hbEZsdXNoSW5z ZXJ0aW9uUGhhc2UsIFNhbWVPcHRpb24pIFwKKyAgICB2KG9iamVjdHNBcmVJbW1vcnRhbCwgdXNl SW1tb3J0YWxPYmplY3RzLCBTYW1lT3B0aW9uKSBcCisgICAgdihzaG93T2JqZWN0U3RhdGlzdGlj cywgZHVtcE9iamVjdFN0YXRpc3RpY3MsIFNhbWVPcHRpb24pIFwKKyAgICB2KGRpc2FibGVHQywg dXNlR0MsIEludmVydGVkT3B0aW9uKSBcCisgICAgdihlbmFibGVUeXBlUHJvZmlsZXIsIHVzZVR5 cGVQcm9maWxlciwgU2FtZU9wdGlvbikgXAorICAgIHYoZW5hYmxlQ29udHJvbEZsb3dQcm9maWxl ciwgdXNlQ29udHJvbEZsb3dQcm9maWxlciwgU2FtZU9wdGlvbikgXAorICAgIHYoZW5hYmxlRXhj ZXB0aW9uRnV6eiwgdXNlRXhjZXB0aW9uRnV6eiwgU2FtZU9wdGlvbikgXAorICAgIHYoZW5hYmxl RXhlY3V0YWJsZUFsbG9jYXRpb25GdXp6LCB1c2VFeGVjdXRhYmxlQWxsb2NhdGlvbkZ1enosIFNh bWVPcHRpb24pIFwKKyAgICB2KGVuYWJsZU9TUkV4aXRGdXp6LCB1c2VPU1JFeGl0RnV6eiwgU2Ft ZU9wdGlvbikgXAorICAgIHYoZW5hYmxlRG9sbGFyVk0sIHVzZURvbGxhclZNLCBTYW1lT3B0aW9u KSBcCisKIGNsYXNzIE9wdGlvbnMgewogcHVibGljOgogICAgIGVudW0gY2xhc3MgRHVtcExldmVs IHsKQEAgLTQzNyw2ICs0NzYsMTAgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCBkdW1wT3B0 aW9uKFN0cmluZ0J1aWxkZXImLCBEdW1wTGV2ZWwsIE9wdGlvbklELAogICAgICAgICBjb25zdCBj aGFyKiBvcHRpb25IZWFkZXIsIGNvbnN0IGNoYXIqIG9wdGlvbkZvb3RlciwgRHVtcERlZmF1bHRz T3B0aW9uKTsKIAorICAgIHN0YXRpYyBib29sIHNldE9wdGlvbldpdGhvdXRBbGlhcyhjb25zdCBj aGFyKiBhcmcpOworICAgIHN0YXRpYyBib29sIHNldEFsaWFzZWRPcHRpb24oY29uc3QgY2hhciog YXJnKTsKKyAgICBzdGF0aWMgYm9vbCBvdmVycmlkZUFsaWFzZWRPcHRpb25XaXRoSGV1cmlzdGlj KGNvbnN0IGNoYXIqIG5hbWUpOworCiAgICAgLy8gRGVjbGFyZSB0aGUgc2luZ2xldG9uIGluc3Rh bmNlIG9mIHRoZSBvcHRpb25zIHN0b3JlOgogICAgIEpTX0VYUE9SVERBVEEgc3RhdGljIEVudHJ5 IHNfb3B0aW9uc1tudW1iZXJPZk9wdGlvbnNdOwogICAgIHN0YXRpYyBFbnRyeSBzX2RlZmF1bHRP cHRpb25zW251bWJlck9mT3B0aW9uc107Cg==