171280 2017-04-25 10:31:16 -0700 Make DFG SpeculatedType dumps easier to read. 2017-04-25 11:46:21 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam buildbot keith_miller msaboff saam oldest_to_newest 1301096 0 mark.lam 2017-04-25 10:31:16 -0700 Adding a pretty printer to insert |s between each type and changing the dumped strings to match the SpeculatedType names case-wise. 1301099 1 308114 mark.lam 2017-04-25 10:35:39 -0700 Created attachment 308114 proposed patch. 1301108 2 308114 saam 2017-04-25 10:41:54 -0700 Comment on attachment 308114 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=308114&action=review > Source/JavaScriptCore/bytecode/SpeculatedType.cpp:63 > +struct PrettyPrinter { > + PrettyPrinter(PrintStream& out) > + : out(out) > + { } > + > + template<typename T> > + void print(const T& value) > + { > + if (!isFirst) > + out.print("|"); > + out.print(value); > + isFirst = false; > + } > + > + PrintStream& out; > + bool isFirst { true }; > +}; I think you can just use CommaPrinter with "|" as the input. 1301112 3 308114 mark.lam 2017-04-25 10:48:05 -0700 Comment on attachment 308114 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=308114&action=review >> Source/JavaScriptCore/bytecode/SpeculatedType.cpp:63 >> +}; > > I think you can just use CommaPrinter with "|" as the input. I can change PrettyPrinter to use CommaPrinter to print the |, but I'll still need the PrettyPrinter. Note that dumpSpeculation() has 2 streams: the real output PrintStream, and a StringPrintStream. That means I need to keep 2 CommaPrinter instances: one for each of the streams. Using the PrinterPrinter makes it easier to track which CommaPrinter instance to use. 1301115 4 308116 mark.lam 2017-04-25 10:59:43 -0700 Created attachment 308116 patch for landing. 1301132 5 mark.lam 2017-04-25 11:46:21 -0700 Thanks for the review. Landed in r215747: <http://trac.webkit.org/r215747>. 308114 2017-04-25 10:35:39 -0700 2017-04-25 10:59:43 -0700 proposed patch. bug-171280.patch text/plain 10860 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjE1NzQyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDE3LTA0LTI1ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN YWtlIERGRyBTcGVjdWxhdGVkVHlwZSBkdW1wcyBlYXNpZXIgdG8gcmVhZC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTI4MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGluZyBhIHByZXR0eSBwcmlu dGVyIHRvIGluc2VydCB8cyBiZXR3ZWVuIGVhY2ggdHlwZSBzdHJpbmcgYW5kIGNoYW5naW5nIHRo ZQorICAgICAgICBkdW1wZWQgc3RyaW5ncyB0byBtYXRjaCB0aGUgU3BlY3VsYXRlZFR5cGUgbmFt ZXMgY2FzZS13aXNlLgorCisgICAgICAgICogYnl0ZWNvZGUvU3BlY3VsYXRlZFR5cGUuY3BwOgor ICAgICAgICAoSlNDOjpQcmV0dHlQcmludGVyOjpQcmV0dHlQcmludGVyKToKKyAgICAgICAgKEpT Qzo6UHJldHR5UHJpbnRlcjo6cHJpbnQpOgorICAgICAgICAoSlNDOjpkdW1wU3BlY3VsYXRpb24p OgorICAgICAgICAqIGJ5dGVjb2RlL1NwZWN1bGF0ZWRUeXBlLmg6CisKIDIwMTctMDQtMjUgIFph biBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFthYXJjaDY0XSBt b3ZlQ29uZGl0aW9uYWxseTMyKCksIG1vdmVDb25kaXRpb25hbGx5VGVzdDMyKCkgc2hvdWxkIG1v dmUgZnJvbS90byA2NC1iaXQgcmVnaXN0ZXJzCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvU3BlY3VsYXRlZFR5cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9TcGVjdWxhdGVkVHlwZS5jcHAJKHJldmlzaW9uIDIxNTY4OCkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TcGVjdWxhdGVkVHlwZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDExLTIwMTMs IDIwMTUtMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQg KEMpIDIwMTEtMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTQ0LDIwNyArNDQsMjI3IEBACiAKIG5hbWVzcGFjZSBK U0MgewogCi12b2lkIGR1bXBTcGVjdWxhdGlvbihQcmludFN0cmVhbSYgb3V0LCBTcGVjdWxhdGVk VHlwZSB2YWx1ZSkKLXsKK3N0cnVjdCBQcmV0dHlQcmludGVyIHsKKyAgICBQcmV0dHlQcmludGVy KFByaW50U3RyZWFtJiBvdXQpCisgICAgICAgIDogb3V0KG91dCkKKyAgICB7IH0KKyAgICAKKyAg ICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgorICAgIHZvaWQgcHJpbnQoY29uc3QgVCYgdmFsdWUpCisg ICAgeworICAgICAgICBpZiAoIWlzRmlyc3QpCisgICAgICAgICAgICBvdXQucHJpbnQoInwiKTsK KyAgICAgICAgb3V0LnByaW50KHZhbHVlKTsKKyAgICAgICAgaXNGaXJzdCA9IGZhbHNlOworICAg IH0KKyAgICAKKyAgICBQcmludFN0cmVhbSYgb3V0OworICAgIGJvb2wgaXNGaXJzdCB7IHRydWUg fTsKK307CisgICAgCit2b2lkIGR1bXBTcGVjdWxhdGlvbihQcmludFN0cmVhbSYgb3V0U3RyZWFt LCBTcGVjdWxhdGVkVHlwZSB2YWx1ZSkKK3sKKyAgICBTdHJpbmdQcmludFN0cmVhbSBzdHJTdHJl YW07CisgICAgUHJldHR5UHJpbnRlciBvdXQob3V0U3RyZWFtKTsKKyAgICBQcmV0dHlQcmludGVy IHN0ck91dChzdHJTdHJlYW0pOworICAgIAogICAgIGlmICh2YWx1ZSA9PSBTcGVjTm9uZSkgewog ICAgICAgICBvdXQucHJpbnQoIk5vbmUiKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAK LSAgICBTdHJpbmdQcmludFN0cmVhbSBteU91dDsKLSAgICAKICAgICBib29sIGlzVG9wID0gdHJ1 ZTsKICAgICAKICAgICBpZiAoKHZhbHVlICYgU3BlY0NlbGwpID09IFNwZWNDZWxsKQotICAgICAg ICBteU91dC5wcmludCgiQ2VsbCIpOworICAgICAgICBzdHJPdXQucHJpbnQoIkNlbGwiKTsKICAg ICBlbHNlIHsKICAgICAgICAgaWYgKCh2YWx1ZSAmIFNwZWNPYmplY3QpID09IFNwZWNPYmplY3Qp Ci0gICAgICAgICAgICBteU91dC5wcmludCgiT2JqZWN0Iik7CisgICAgICAgICAgICBzdHJPdXQu cHJpbnQoIk9iamVjdCIpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIGlmICh2YWx1ZSAm IFNwZWNDZWxsT3RoZXIpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIk90aGVyY2VsbCIp OworICAgICAgICAgICAgICAgIHN0ck91dC5wcmludCgiT3RoZXJDZWxsIik7CiAgICAgICAgICAg ICBlbHNlCiAgICAgICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKICAgICAKICAgICAgICAgICAg IGlmICh2YWx1ZSAmIFNwZWNPYmplY3RPdGhlcikKLSAgICAgICAgICAgICAgICBteU91dC5wcmlu dCgiT3RoZXJvYmoiKTsKKyAgICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIk90aGVyT2JqIik7 CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKICAgICAK ICAgICAgICAgICAgIGlmICh2YWx1ZSAmIFNwZWNGaW5hbE9iamVjdCkKLSAgICAgICAgICAgICAg ICBteU91dC5wcmludCgiRmluYWwiKTsKKyAgICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIkZp bmFsIik7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsK IAogICAgICAgICAgICAgaWYgKHZhbHVlICYgU3BlY0FycmF5KQotICAgICAgICAgICAgICAgIG15 T3V0LnByaW50KCJBcnJheSIpOworICAgICAgICAgICAgICAgIHN0ck91dC5wcmludCgiQXJyYXki KTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBpc1RvcCA9IGZhbHNlOwogICAg IAogICAgICAgICAgICAgaWYgKHZhbHVlICYgU3BlY0ludDhBcnJheSkKLSAgICAgICAgICAgICAg ICBteU91dC5wcmludCgiSW50OGFycmF5Iik7CisgICAgICAgICAgICAgICAgc3RyT3V0LnByaW50 KCJJbnQ4QXJyYXkiKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBpc1RvcCA9 IGZhbHNlOwogICAgIAogICAgICAgICAgICAgaWYgKHZhbHVlICYgU3BlY0ludDE2QXJyYXkpCi0g ICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIkludDE2YXJyYXkiKTsKKyAgICAgICAgICAgICAg ICBzdHJPdXQucHJpbnQoIkludDE2QXJyYXkiKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAg ICAgICAgICBpc1RvcCA9IGZhbHNlOwogICAgIAogICAgICAgICAgICAgaWYgKHZhbHVlICYgU3Bl Y0ludDMyQXJyYXkpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIkludDMyYXJyYXkiKTsK KyAgICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIkludDMyQXJyYXkiKTsKICAgICAgICAgICAg IGVsc2UKICAgICAgICAgICAgICAgICBpc1RvcCA9IGZhbHNlOwogICAgIAogICAgICAgICAgICAg aWYgKHZhbHVlICYgU3BlY1VpbnQ4QXJyYXkpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQo IlVpbnQ4YXJyYXkiKTsKKyAgICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIlVpbnQ4QXJyYXki KTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBpc1RvcCA9IGZhbHNlOwogCiAg ICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjVWludDhDbGFtcGVkQXJyYXkpCi0gICAgICAgICAg ICAgICAgbXlPdXQucHJpbnQoIlVpbnQ4Y2xhbXBlZGFycmF5Iik7CisgICAgICAgICAgICAgICAg c3RyT3V0LnByaW50KCJVaW50OENsYW1wZWRBcnJheSIpOwogICAgICAgICAgICAgZWxzZQogICAg ICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgCiAgICAgICAgICAgICBpZiAodmFsdWUg JiBTcGVjVWludDE2QXJyYXkpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIlVpbnQxNmFy cmF5Iik7CisgICAgICAgICAgICAgICAgc3RyT3V0LnByaW50KCJVaW50MTZBcnJheSIpOwogICAg ICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgCiAgICAg ICAgICAgICBpZiAodmFsdWUgJiBTcGVjVWludDMyQXJyYXkpCi0gICAgICAgICAgICAgICAgbXlP dXQucHJpbnQoIlVpbnQzMmFycmF5Iik7CisgICAgICAgICAgICAgICAgc3RyT3V0LnByaW50KCJV aW50MzJBcnJheSIpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGlzVG9wID0g ZmFsc2U7CiAgICAgCiAgICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjRmxvYXQzMkFycmF5KQot ICAgICAgICAgICAgICAgIG15T3V0LnByaW50KCJGbG9hdDMyYXJyYXkiKTsKKyAgICAgICAgICAg ICAgICBzdHJPdXQucHJpbnQoIkZsb2F0MzJhcnJheSIpOwogICAgICAgICAgICAgZWxzZQogICAg ICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgCiAgICAgICAgICAgICBpZiAodmFsdWUg JiBTcGVjRmxvYXQ2NEFycmF5KQotICAgICAgICAgICAgICAgIG15T3V0LnByaW50KCJGbG9hdDY0 YXJyYXkiKTsKKyAgICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIkZsb2F0NjRBcnJheSIpOwog ICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgCiAg ICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjRnVuY3Rpb24pCi0gICAgICAgICAgICAgICAgbXlP dXQucHJpbnQoIkZ1bmN0aW9uIik7CisgICAgICAgICAgICAgICAgc3RyT3V0LnByaW50KCJGdW5j dGlvbiIpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7 CiAgICAgCiAgICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjRGlyZWN0QXJndW1lbnRzKQotICAg ICAgICAgICAgICAgIG15T3V0LnByaW50KCJEaXJlY3Rhcmd1bWVudHMiKTsKKyAgICAgICAgICAg ICAgICBzdHJPdXQucHJpbnQoIkRpcmVjdEFyZ3VtZW50cyIpOwogICAgICAgICAgICAgZWxzZQog ICAgICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgCiAgICAgICAgICAgICBpZiAodmFs dWUgJiBTcGVjU2NvcGVkQXJndW1lbnRzKQotICAgICAgICAgICAgICAgIG15T3V0LnByaW50KCJT Y29wZWRhcmd1bWVudHMiKTsKKyAgICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIlNjb3BlZEFy Z3VtZW50cyIpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGlzVG9wID0gZmFs c2U7CiAgICAgCiAgICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjU3RyaW5nT2JqZWN0KQotICAg ICAgICAgICAgICAgIG15T3V0LnByaW50KCJTdHJpbmdvYmplY3QiKTsKKyAgICAgICAgICAgICAg ICBzdHJPdXQucHJpbnQoIlN0cmluZ09iamVjdCIpOwogICAgICAgICAgICAgZWxzZQogICAgICAg ICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgCiAgICAgICAgICAgICBpZiAodmFsdWUgJiBT cGVjUmVnRXhwT2JqZWN0KQotICAgICAgICAgICAgICAgIG15T3V0LnByaW50KCJSZWdleHBvYmpl Y3QiKTsKKyAgICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIlJlZ0V4cE9iamVjdCIpOwogICAg ICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAKICAgICAgICAg ICAgIGlmICh2YWx1ZSAmIFNwZWNNYXBPYmplY3QpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJp bnQoIk1hcG9iamVjdCIpOworICAgICAgICAgICAgICAgIHN0ck91dC5wcmludCgiTWFwT2JqZWN0 Iik7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKIAog ICAgICAgICAgICAgaWYgKHZhbHVlICYgU3BlY1NldE9iamVjdCkKLSAgICAgICAgICAgICAgICBt eU91dC5wcmludCgiU2V0b2JqZWN0Iik7CisgICAgICAgICAgICAgICAgc3RyT3V0LnByaW50KCJT ZXRPYmplY3QiKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBpc1RvcCA9IGZh bHNlOwogCiAgICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjUHJveHlPYmplY3QpCi0gICAgICAg ICAgICAgICAgbXlPdXQucHJpbnQoIlByb3h5b2JqZWN0Iik7CisgICAgICAgICAgICAgICAgc3Ry T3V0LnByaW50KCJQcm94eU9iamVjdCIpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAg ICAgIGlzVG9wID0gZmFsc2U7CiAKICAgICAgICAgICAgIGlmICh2YWx1ZSAmIFNwZWNEZXJpdmVk QXJyYXkpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIkRlcml2ZWRhcnJheSIpOworICAg ICAgICAgICAgICAgIHN0ck91dC5wcmludCgiRGVyaXZlZEFycmF5Iik7CiAgICAgICAgICAgICBl bHNlCiAgICAgICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKICAgICAgICAgfQogCiAgICAgICAg IGlmICgodmFsdWUgJiBTcGVjU3RyaW5nKSA9PSBTcGVjU3RyaW5nKQotICAgICAgICAgICAgbXlP dXQucHJpbnQoIlN0cmluZyIpOworICAgICAgICAgICAgc3RyT3V0LnByaW50KCJTdHJpbmciKTsK ICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjU3RyaW5nSWRlbnQp Ci0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIlN0cmluZ2lkZW50Iik7CisgICAgICAgICAg ICAgICAgc3RyT3V0LnByaW50KCJTdHJpbmdJZGVudCIpOwogICAgICAgICAgICAgZWxzZQogICAg ICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgICAgICAgICAKICAgICAgICAgICAgIGlm ICh2YWx1ZSAmIFNwZWNTdHJpbmdWYXIpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIlN0 cmluZ3ZhciIpOworICAgICAgICAgICAgICAgIHN0ck91dC5wcmludCgiU3RyaW5nVmFyIik7CiAg ICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKICAgICAgICAg fQogCiAgICAgICAgIGlmICh2YWx1ZSAmIFNwZWNTeW1ib2wpCi0gICAgICAgICAgICBteU91dC5w cmludCgiU3ltYm9sIik7CisgICAgICAgICAgICBzdHJPdXQucHJpbnQoIlN5bWJvbCIpOwogICAg ICAgICBlbHNlCiAgICAgICAgICAgICBpc1RvcCA9IGZhbHNlOwogICAgIH0KICAgICAKICAgICBp ZiAodmFsdWUgPT0gU3BlY0ludDMyT25seSkKLSAgICAgICAgbXlPdXQucHJpbnQoIkludDMyIik7 CisgICAgICAgIHN0ck91dC5wcmludCgiSW50MzIiKTsKICAgICBlbHNlIHsKICAgICAgICAgaWYg KHZhbHVlICYgU3BlY0Jvb2xJbnQzMikKLSAgICAgICAgICAgIG15T3V0LnByaW50KCJCb29saW50 MzIiKTsKKyAgICAgICAgICAgIHN0ck91dC5wcmludCgiQm9vbEludDMyIik7CiAgICAgICAgIGVs c2UKICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgICAgIAogICAgICAgICBpZiAodmFs dWUgJiBTcGVjTm9uQm9vbEludDMyKQotICAgICAgICAgICAgbXlPdXQucHJpbnQoIk5vbmJvb2xp bnQzMiIpOworICAgICAgICAgICAgc3RyT3V0LnByaW50KCJOb25Cb29sSW50MzIiKTsKICAgICAg ICAgZWxzZQogICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKICAgICB9CiAgICAgCiAgICAgaWYg KHZhbHVlICYgU3BlY0ludDUyT25seSkKLSAgICAgICAgbXlPdXQucHJpbnQoIkludDUyIik7Cisg ICAgICAgIHN0ck91dC5wcmludCgiSW50NTIiKTsKICAgICAgICAgCiAgICAgaWYgKCh2YWx1ZSAm IFNwZWNCeXRlY29kZURvdWJsZSkgPT0gU3BlY0J5dGVjb2RlRG91YmxlKQotICAgICAgICBteU91 dC5wcmludCgiQnl0ZWNvZGVkb3VibGUiKTsKKyAgICAgICAgc3RyT3V0LnByaW50KCJCeXRlY29k ZURvdWJsZSIpOwogICAgIGVsc2UgewogICAgICAgICBpZiAodmFsdWUgJiBTcGVjQW55SW50QXNE b3VibGUpCi0gICAgICAgICAgICBteU91dC5wcmludCgiQW55SW50QXNEb3VibGUiKTsKKyAgICAg ICAgICAgIHN0ck91dC5wcmludCgiQW55SW50QXNEb3VibGUiKTsKICAgICAgICAgZWxzZQogICAg ICAgICAgICAgaXNUb3AgPSBmYWxzZTsKICAgICAgICAgCiAgICAgICAgIGlmICh2YWx1ZSAmIFNw ZWNOb25JbnRBc0RvdWJsZSkKLSAgICAgICAgICAgIG15T3V0LnByaW50KCJOb25pbnRhc2RvdWJs ZSIpOworICAgICAgICAgICAgc3RyT3V0LnByaW50KCJOb25JbnRBc2RvdWJsZSIpOwogICAgICAg ICBlbHNlCiAgICAgICAgICAgICBpc1RvcCA9IGZhbHNlOwogICAgICAgICAKICAgICAgICAgaWYg KHZhbHVlICYgU3BlY0RvdWJsZVB1cmVOYU4pCi0gICAgICAgICAgICBteU91dC5wcmludCgiRG91 YmxlcHVyZW5hbiIpOworICAgICAgICAgICAgc3RyT3V0LnByaW50KCJEb3VibGVQdXJlTmFuIik7 CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgfQogICAgIAog ICAgIGlmICh2YWx1ZSAmIFNwZWNEb3VibGVJbXB1cmVOYU4pCi0gICAgICAgIG91dC5wcmludCgi RG91YmxlaW1wdXJlbmFuIik7CisgICAgICAgIG91dC5wcmludCgiRG91YmxlSW1wdXJlTmFuIik7 CiAgICAgCiAgICAgaWYgKHZhbHVlICYgU3BlY0Jvb2xlYW4pCi0gICAgICAgIG15T3V0LnByaW50 KCJCb29sIik7CisgICAgICAgIHN0ck91dC5wcmludCgiQm9vbCIpOwogICAgIGVsc2UKICAgICAg ICAgaXNUb3AgPSBmYWxzZTsKICAgICAKICAgICBpZiAodmFsdWUgJiBTcGVjT3RoZXIpCi0gICAg ICAgIG15T3V0LnByaW50KCJPdGhlciIpOworICAgICAgICBzdHJPdXQucHJpbnQoIk90aGVyIik7 CiAgICAgZWxzZQogICAgICAgICBpc1RvcCA9IGZhbHNlOwogICAgIAogICAgIGlmIChpc1RvcCkK ICAgICAgICAgb3V0LnByaW50KCJUb3AiKTsKICAgICBlbHNlCi0gICAgICAgIG91dC5wcmludCht eU91dC50b0NTdHJpbmcoKSk7CisgICAgICAgIG91dC5wcmludChzdHJTdHJlYW0udG9DU3RyaW5n KCkpOwogICAgIAogICAgIGlmICh2YWx1ZSAmIFNwZWNFbXB0eSkKICAgICAgICAgb3V0LnByaW50 KCJFbXB0eSIpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1NwZWN1bGF0 ZWRUeXBlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1Nw ZWN1bGF0ZWRUeXBlLmgJKHJldmlzaW9uIDIxNTY4OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9TcGVjdWxhdGVkVHlwZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBA QAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMS0yMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMS0yMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNzUsNyArNzUs NyBAQCBzdGF0aWMgY29uc3QgU3BlY3VsYXRlZFR5cGUgU3BlY0FueUludCAgCiBzdGF0aWMgY29u c3QgU3BlY3VsYXRlZFR5cGUgU3BlY0FueUludEFzRG91YmxlICAgICA9IDF1bGwgPDwgMjg7IC8v IEl0J3MgZGVmaW5pdGVseSBhbiBJbnQ1MiBhbmQgaXQncyBpbnNpZGUgYSBkb3VibGUuCiBzdGF0 aWMgY29uc3QgU3BlY3VsYXRlZFR5cGUgU3BlY05vbkludEFzRG91YmxlICAgICA9IDF1bGwgPDwg Mjk7IC8vIEl0J3MgZGVmaW5pdGVseSBub3QgYW4gSW50NTIgYnV0IGl0J3MgYSByZWFsIG51bWJl ciBhbmQgaXQncyBhIGRvdWJsZS4KIHN0YXRpYyBjb25zdCBTcGVjdWxhdGVkVHlwZSBTcGVjRG91 YmxlUmVhbCAgICAgICAgID0gU3BlY05vbkludEFzRG91YmxlIHwgU3BlY0FueUludEFzRG91Ymxl OyAvLyBJdCdzIGRlZmluaXRlbHkgYSBub24tTmFOIGRvdWJsZS4KLXN0YXRpYyBjb25zdCBTcGVj dWxhdGVkVHlwZSBTcGVjRG91YmxlUHVyZU5hTiAgICAgID0gMXVsbCA8PCAzMDsgLy8gSXQncyBk ZWZpbml0ZWx5IGEgTmFOIHRoYXQgaXMgc2FlIHRvIHRhZyAoaS5lLiBwdXJlKS4KK3N0YXRpYyBj b25zdCBTcGVjdWxhdGVkVHlwZSBTcGVjRG91YmxlUHVyZU5hTiAgICAgID0gMXVsbCA8PCAzMDsg Ly8gSXQncyBkZWZpbml0ZWx5IGEgTmFOIHRoYXQgaXMgc2FmZSB0byB0YWcgKGkuZS4gcHVyZSku CiBzdGF0aWMgY29uc3QgU3BlY3VsYXRlZFR5cGUgU3BlY0RvdWJsZUltcHVyZU5hTiAgICA9IDF1 bGwgPDwgMzE7IC8vIEl0J3MgZGVmaW5pdGVseSBhIE5hTiB0aGF0IGlzIHVuc2FmZSB0byB0YWcg KGkuZS4gaW1wdXJlKS4KIHN0YXRpYyBjb25zdCBTcGVjdWxhdGVkVHlwZSBTcGVjRG91YmxlTmFO ICAgICAgICAgID0gU3BlY0RvdWJsZVB1cmVOYU4gfCBTcGVjRG91YmxlSW1wdXJlTmFOOyAvLyBJ dCdzIGRlZmluaXRlbHkgc29tZSBraW5kIG9mIE5hTi4KIHN0YXRpYyBjb25zdCBTcGVjdWxhdGVk VHlwZSBTcGVjQnl0ZWNvZGVEb3VibGUgICAgID0gU3BlY0RvdWJsZVJlYWwgfCBTcGVjRG91Ymxl UHVyZU5hTjsgLy8gSXQncyBlaXRoZXIgYSBub24tTmFOIG9yIGEgTmFOIGRvdWJsZSwgYnV0IGl0 J3MgZGVmaW5pdGVseSBub3QgaW1wdXJlIE5hTi4K 308116 2017-04-25 10:59:43 -0700 2017-04-25 10:59:43 -0700 patch for landing. bug-171280.patch text/plain 10794 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjE1NzQ0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDE3LTA0LTI1ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN YWtlIERGRyBTcGVjdWxhdGVkVHlwZSBkdW1wcyBlYXNpZXIgdG8gcmVhZC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTI4MAorCisgICAgICAgIFJl dmlld2VkIGJ5IFNhYW0gQmFyYXRpLgorCisgICAgICAgIEFkZGluZyBhIHByZXR0eSBwcmludGVy IHRvIGluc2VydCB8cyBiZXR3ZWVuIGVhY2ggdHlwZSBzdHJpbmcgYW5kIGNoYW5naW5nIHRoZQor ICAgICAgICBkdW1wZWQgc3RyaW5ncyB0byBtYXRjaCB0aGUgU3BlY3VsYXRlZFR5cGUgbmFtZXMg Y2FzZS13aXNlLgorCisgICAgICAgICogYnl0ZWNvZGUvU3BlY3VsYXRlZFR5cGUuY3BwOgorICAg ICAgICAoSlNDOjpQcmV0dHlQcmludGVyOjpQcmV0dHlQcmludGVyKToKKyAgICAgICAgKEpTQzo6 UHJldHR5UHJpbnRlcjo6cHJpbnQpOgorICAgICAgICAoSlNDOjpkdW1wU3BlY3VsYXRpb24pOgor ICAgICAgICAqIGJ5dGVjb2RlL1NwZWN1bGF0ZWRUeXBlLmg6CisKIDIwMTctMDQtMjUgIEpGIEJh c3RpZW4gIDxqZmJhc3RpZW5AYXBwbGUuY29tPgogCiAgICAgICAgIGxvd2VyU3RhY2tBcmdzOiBj aGVjayBBcmc6OmFkZHIuaXNWYWxpZEZvcm0gd2hlbiBmYWxsaW5nIGJhY2sgdG8gU1Agb2Zmc2V0 cwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1NwZWN1bGF0ZWRUeXBlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3BlY3VsYXRl ZFR5cGUuY3BwCShyZXZpc2lvbiAyMTU3NDQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvZGUvU3BlY3VsYXRlZFR5cGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAog LyoKLSAqIENvcHlyaWdodCAoQykgMjAxMS0yMDEzLCAyMDE1LTIwMTYgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDExLTIwMTcgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00 NCwyMDcgKzQ0LDIyNSBAQAogCiBuYW1lc3BhY2UgSlNDIHsKIAotdm9pZCBkdW1wU3BlY3VsYXRp b24oUHJpbnRTdHJlYW0mIG91dCwgU3BlY3VsYXRlZFR5cGUgdmFsdWUpCi17CitzdHJ1Y3QgUHJl dHR5UHJpbnRlciB7CisgICAgUHJldHR5UHJpbnRlcihQcmludFN0cmVhbSYgb3V0KQorICAgICAg ICA6IG91dChvdXQpCisgICAgICAgICwgc2VwYXJhdG9yKCJ8IikKKyAgICB7IH0KKyAgICAKKyAg ICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgorICAgIHZvaWQgcHJpbnQoY29uc3QgVCYgdmFsdWUpCisg ICAgeworICAgICAgICBvdXQucHJpbnQoc2VwYXJhdG9yLCB2YWx1ZSk7CisgICAgfQorICAgIAor ICAgIFByaW50U3RyZWFtJiBvdXQ7CisgICAgQ29tbWFQcmludGVyIHNlcGFyYXRvcjsKK307Cisg ICAgCit2b2lkIGR1bXBTcGVjdWxhdGlvbihQcmludFN0cmVhbSYgb3V0U3RyZWFtLCBTcGVjdWxh dGVkVHlwZSB2YWx1ZSkKK3sKKyAgICBTdHJpbmdQcmludFN0cmVhbSBzdHJTdHJlYW07CisgICAg UHJldHR5UHJpbnRlciBvdXQob3V0U3RyZWFtKTsKKyAgICBQcmV0dHlQcmludGVyIHN0ck91dChz dHJTdHJlYW0pOworICAgIAogICAgIGlmICh2YWx1ZSA9PSBTcGVjTm9uZSkgewogICAgICAgICBv dXQucHJpbnQoIk5vbmUiKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAKLSAgICBTdHJp bmdQcmludFN0cmVhbSBteU91dDsKLSAgICAKICAgICBib29sIGlzVG9wID0gdHJ1ZTsKICAgICAK ICAgICBpZiAoKHZhbHVlICYgU3BlY0NlbGwpID09IFNwZWNDZWxsKQotICAgICAgICBteU91dC5w cmludCgiQ2VsbCIpOworICAgICAgICBzdHJPdXQucHJpbnQoIkNlbGwiKTsKICAgICBlbHNlIHsK ICAgICAgICAgaWYgKCh2YWx1ZSAmIFNwZWNPYmplY3QpID09IFNwZWNPYmplY3QpCi0gICAgICAg ICAgICBteU91dC5wcmludCgiT2JqZWN0Iik7CisgICAgICAgICAgICBzdHJPdXQucHJpbnQoIk9i amVjdCIpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIGlmICh2YWx1ZSAmIFNwZWNDZWxs T3RoZXIpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIk90aGVyY2VsbCIpOworICAgICAg ICAgICAgICAgIHN0ck91dC5wcmludCgiT3RoZXJDZWxsIik7CiAgICAgICAgICAgICBlbHNlCiAg ICAgICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKICAgICAKICAgICAgICAgICAgIGlmICh2YWx1 ZSAmIFNwZWNPYmplY3RPdGhlcikKLSAgICAgICAgICAgICAgICBteU91dC5wcmludCgiT3RoZXJv YmoiKTsKKyAgICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIk90aGVyT2JqIik7CiAgICAgICAg ICAgICBlbHNlCiAgICAgICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKICAgICAKICAgICAgICAg ICAgIGlmICh2YWx1ZSAmIFNwZWNGaW5hbE9iamVjdCkKLSAgICAgICAgICAgICAgICBteU91dC5w cmludCgiRmluYWwiKTsKKyAgICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIkZpbmFsIik7CiAg ICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKIAogICAgICAg ICAgICAgaWYgKHZhbHVlICYgU3BlY0FycmF5KQotICAgICAgICAgICAgICAgIG15T3V0LnByaW50 KCJBcnJheSIpOworICAgICAgICAgICAgICAgIHN0ck91dC5wcmludCgiQXJyYXkiKTsKICAgICAg ICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBpc1RvcCA9IGZhbHNlOwogICAgIAogICAgICAg ICAgICAgaWYgKHZhbHVlICYgU3BlY0ludDhBcnJheSkKLSAgICAgICAgICAgICAgICBteU91dC5w cmludCgiSW50OGFycmF5Iik7CisgICAgICAgICAgICAgICAgc3RyT3V0LnByaW50KCJJbnQ4QXJy YXkiKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBpc1RvcCA9IGZhbHNlOwog ICAgIAogICAgICAgICAgICAgaWYgKHZhbHVlICYgU3BlY0ludDE2QXJyYXkpCi0gICAgICAgICAg ICAgICAgbXlPdXQucHJpbnQoIkludDE2YXJyYXkiKTsKKyAgICAgICAgICAgICAgICBzdHJPdXQu cHJpbnQoIkludDE2QXJyYXkiKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBp c1RvcCA9IGZhbHNlOwogICAgIAogICAgICAgICAgICAgaWYgKHZhbHVlICYgU3BlY0ludDMyQXJy YXkpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIkludDMyYXJyYXkiKTsKKyAgICAgICAg ICAgICAgICBzdHJPdXQucHJpbnQoIkludDMyQXJyYXkiKTsKICAgICAgICAgICAgIGVsc2UKICAg ICAgICAgICAgICAgICBpc1RvcCA9IGZhbHNlOwogICAgIAogICAgICAgICAgICAgaWYgKHZhbHVl ICYgU3BlY1VpbnQ4QXJyYXkpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIlVpbnQ4YXJy YXkiKTsKKyAgICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIlVpbnQ4QXJyYXkiKTsKICAgICAg ICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBpc1RvcCA9IGZhbHNlOwogCiAgICAgICAgICAg ICBpZiAodmFsdWUgJiBTcGVjVWludDhDbGFtcGVkQXJyYXkpCi0gICAgICAgICAgICAgICAgbXlP dXQucHJpbnQoIlVpbnQ4Y2xhbXBlZGFycmF5Iik7CisgICAgICAgICAgICAgICAgc3RyT3V0LnBy aW50KCJVaW50OENsYW1wZWRBcnJheSIpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAg ICAgIGlzVG9wID0gZmFsc2U7CiAgICAgCiAgICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjVWlu dDE2QXJyYXkpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIlVpbnQxNmFycmF5Iik7Cisg ICAgICAgICAgICAgICAgc3RyT3V0LnByaW50KCJVaW50MTZBcnJheSIpOwogICAgICAgICAgICAg ZWxzZQogICAgICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgCiAgICAgICAgICAgICBp ZiAodmFsdWUgJiBTcGVjVWludDMyQXJyYXkpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQo IlVpbnQzMmFycmF5Iik7CisgICAgICAgICAgICAgICAgc3RyT3V0LnByaW50KCJVaW50MzJBcnJh eSIpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAg ICAgCiAgICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjRmxvYXQzMkFycmF5KQotICAgICAgICAg ICAgICAgIG15T3V0LnByaW50KCJGbG9hdDMyYXJyYXkiKTsKKyAgICAgICAgICAgICAgICBzdHJP dXQucHJpbnQoIkZsb2F0MzJhcnJheSIpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAg ICAgIGlzVG9wID0gZmFsc2U7CiAgICAgCiAgICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjRmxv YXQ2NEFycmF5KQotICAgICAgICAgICAgICAgIG15T3V0LnByaW50KCJGbG9hdDY0YXJyYXkiKTsK KyAgICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIkZsb2F0NjRBcnJheSIpOwogICAgICAgICAg ICAgZWxzZQogICAgICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgCiAgICAgICAgICAg ICBpZiAodmFsdWUgJiBTcGVjRnVuY3Rpb24pCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQo IkZ1bmN0aW9uIik7CisgICAgICAgICAgICAgICAgc3RyT3V0LnByaW50KCJGdW5jdGlvbiIpOwog ICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgCiAg ICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjRGlyZWN0QXJndW1lbnRzKQotICAgICAgICAgICAg ICAgIG15T3V0LnByaW50KCJEaXJlY3Rhcmd1bWVudHMiKTsKKyAgICAgICAgICAgICAgICBzdHJP dXQucHJpbnQoIkRpcmVjdEFyZ3VtZW50cyIpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAg ICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgCiAgICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVj U2NvcGVkQXJndW1lbnRzKQotICAgICAgICAgICAgICAgIG15T3V0LnByaW50KCJTY29wZWRhcmd1 bWVudHMiKTsKKyAgICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIlNjb3BlZEFyZ3VtZW50cyIp OwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAg CiAgICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjU3RyaW5nT2JqZWN0KQotICAgICAgICAgICAg ICAgIG15T3V0LnByaW50KCJTdHJpbmdvYmplY3QiKTsKKyAgICAgICAgICAgICAgICBzdHJPdXQu cHJpbnQoIlN0cmluZ09iamVjdCIpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAg IGlzVG9wID0gZmFsc2U7CiAgICAgCiAgICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjUmVnRXhw T2JqZWN0KQotICAgICAgICAgICAgICAgIG15T3V0LnByaW50KCJSZWdleHBvYmplY3QiKTsKKyAg ICAgICAgICAgICAgICBzdHJPdXQucHJpbnQoIlJlZ0V4cE9iamVjdCIpOwogICAgICAgICAgICAg ZWxzZQogICAgICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAKICAgICAgICAgICAgIGlmICh2 YWx1ZSAmIFNwZWNNYXBPYmplY3QpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIk1hcG9i amVjdCIpOworICAgICAgICAgICAgICAgIHN0ck91dC5wcmludCgiTWFwT2JqZWN0Iik7CiAgICAg ICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKIAogICAgICAgICAg ICAgaWYgKHZhbHVlICYgU3BlY1NldE9iamVjdCkKLSAgICAgICAgICAgICAgICBteU91dC5wcmlu dCgiU2V0b2JqZWN0Iik7CisgICAgICAgICAgICAgICAgc3RyT3V0LnByaW50KCJTZXRPYmplY3Qi KTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBpc1RvcCA9IGZhbHNlOwogCiAg ICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjUHJveHlPYmplY3QpCi0gICAgICAgICAgICAgICAg bXlPdXQucHJpbnQoIlByb3h5b2JqZWN0Iik7CisgICAgICAgICAgICAgICAgc3RyT3V0LnByaW50 KCJQcm94eU9iamVjdCIpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGlzVG9w ID0gZmFsc2U7CiAKICAgICAgICAgICAgIGlmICh2YWx1ZSAmIFNwZWNEZXJpdmVkQXJyYXkpCi0g ICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIkRlcml2ZWRhcnJheSIpOworICAgICAgICAgICAg ICAgIHN0ck91dC5wcmludCgiRGVyaXZlZEFycmF5Iik7CiAgICAgICAgICAgICBlbHNlCiAgICAg ICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKICAgICAgICAgfQogCiAgICAgICAgIGlmICgodmFs dWUgJiBTcGVjU3RyaW5nKSA9PSBTcGVjU3RyaW5nKQotICAgICAgICAgICAgbXlPdXQucHJpbnQo IlN0cmluZyIpOworICAgICAgICAgICAgc3RyT3V0LnByaW50KCJTdHJpbmciKTsKICAgICAgICAg ZWxzZSB7CiAgICAgICAgICAgICBpZiAodmFsdWUgJiBTcGVjU3RyaW5nSWRlbnQpCi0gICAgICAg ICAgICAgICAgbXlPdXQucHJpbnQoIlN0cmluZ2lkZW50Iik7CisgICAgICAgICAgICAgICAgc3Ry T3V0LnByaW50KCJTdHJpbmdJZGVudCIpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAg ICAgIGlzVG9wID0gZmFsc2U7CiAgICAgICAgICAgICAKICAgICAgICAgICAgIGlmICh2YWx1ZSAm IFNwZWNTdHJpbmdWYXIpCi0gICAgICAgICAgICAgICAgbXlPdXQucHJpbnQoIlN0cmluZ3ZhciIp OworICAgICAgICAgICAgICAgIHN0ck91dC5wcmludCgiU3RyaW5nVmFyIik7CiAgICAgICAgICAg ICBlbHNlCiAgICAgICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKICAgICAgICAgfQogCiAgICAg ICAgIGlmICh2YWx1ZSAmIFNwZWNTeW1ib2wpCi0gICAgICAgICAgICBteU91dC5wcmludCgiU3lt Ym9sIik7CisgICAgICAgICAgICBzdHJPdXQucHJpbnQoIlN5bWJvbCIpOwogICAgICAgICBlbHNl CiAgICAgICAgICAgICBpc1RvcCA9IGZhbHNlOwogICAgIH0KICAgICAKICAgICBpZiAodmFsdWUg PT0gU3BlY0ludDMyT25seSkKLSAgICAgICAgbXlPdXQucHJpbnQoIkludDMyIik7CisgICAgICAg IHN0ck91dC5wcmludCgiSW50MzIiKTsKICAgICBlbHNlIHsKICAgICAgICAgaWYgKHZhbHVlICYg U3BlY0Jvb2xJbnQzMikKLSAgICAgICAgICAgIG15T3V0LnByaW50KCJCb29saW50MzIiKTsKKyAg ICAgICAgICAgIHN0ck91dC5wcmludCgiQm9vbEludDMyIik7CiAgICAgICAgIGVsc2UKICAgICAg ICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgICAgIAogICAgICAgICBpZiAodmFsdWUgJiBTcGVj Tm9uQm9vbEludDMyKQotICAgICAgICAgICAgbXlPdXQucHJpbnQoIk5vbmJvb2xpbnQzMiIpOwor ICAgICAgICAgICAgc3RyT3V0LnByaW50KCJOb25Cb29sSW50MzIiKTsKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgaXNUb3AgPSBmYWxzZTsKICAgICB9CiAgICAgCiAgICAgaWYgKHZhbHVlICYg U3BlY0ludDUyT25seSkKLSAgICAgICAgbXlPdXQucHJpbnQoIkludDUyIik7CisgICAgICAgIHN0 ck91dC5wcmludCgiSW50NTIiKTsKICAgICAgICAgCiAgICAgaWYgKCh2YWx1ZSAmIFNwZWNCeXRl Y29kZURvdWJsZSkgPT0gU3BlY0J5dGVjb2RlRG91YmxlKQotICAgICAgICBteU91dC5wcmludCgi Qnl0ZWNvZGVkb3VibGUiKTsKKyAgICAgICAgc3RyT3V0LnByaW50KCJCeXRlY29kZURvdWJsZSIp OwogICAgIGVsc2UgewogICAgICAgICBpZiAodmFsdWUgJiBTcGVjQW55SW50QXNEb3VibGUpCi0g ICAgICAgICAgICBteU91dC5wcmludCgiQW55SW50QXNEb3VibGUiKTsKKyAgICAgICAgICAgIHN0 ck91dC5wcmludCgiQW55SW50QXNEb3VibGUiKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAg aXNUb3AgPSBmYWxzZTsKICAgICAgICAgCiAgICAgICAgIGlmICh2YWx1ZSAmIFNwZWNOb25JbnRB c0RvdWJsZSkKLSAgICAgICAgICAgIG15T3V0LnByaW50KCJOb25pbnRhc2RvdWJsZSIpOworICAg ICAgICAgICAgc3RyT3V0LnByaW50KCJOb25JbnRBc2RvdWJsZSIpOwogICAgICAgICBlbHNlCiAg ICAgICAgICAgICBpc1RvcCA9IGZhbHNlOwogICAgICAgICAKICAgICAgICAgaWYgKHZhbHVlICYg U3BlY0RvdWJsZVB1cmVOYU4pCi0gICAgICAgICAgICBteU91dC5wcmludCgiRG91YmxlcHVyZW5h biIpOworICAgICAgICAgICAgc3RyT3V0LnByaW50KCJEb3VibGVQdXJlTmFuIik7CiAgICAgICAg IGVsc2UKICAgICAgICAgICAgIGlzVG9wID0gZmFsc2U7CiAgICAgfQogICAgIAogICAgIGlmICh2 YWx1ZSAmIFNwZWNEb3VibGVJbXB1cmVOYU4pCi0gICAgICAgIG91dC5wcmludCgiRG91YmxlaW1w dXJlbmFuIik7CisgICAgICAgIG91dC5wcmludCgiRG91YmxlSW1wdXJlTmFuIik7CiAgICAgCiAg ICAgaWYgKHZhbHVlICYgU3BlY0Jvb2xlYW4pCi0gICAgICAgIG15T3V0LnByaW50KCJCb29sIik7 CisgICAgICAgIHN0ck91dC5wcmludCgiQm9vbCIpOwogICAgIGVsc2UKICAgICAgICAgaXNUb3Ag PSBmYWxzZTsKICAgICAKICAgICBpZiAodmFsdWUgJiBTcGVjT3RoZXIpCi0gICAgICAgIG15T3V0 LnByaW50KCJPdGhlciIpOworICAgICAgICBzdHJPdXQucHJpbnQoIk90aGVyIik7CiAgICAgZWxz ZQogICAgICAgICBpc1RvcCA9IGZhbHNlOwogICAgIAogICAgIGlmIChpc1RvcCkKICAgICAgICAg b3V0LnByaW50KCJUb3AiKTsKICAgICBlbHNlCi0gICAgICAgIG91dC5wcmludChteU91dC50b0NT dHJpbmcoKSk7CisgICAgICAgIG91dC5wcmludChzdHJTdHJlYW0udG9DU3RyaW5nKCkpOwogICAg IAogICAgIGlmICh2YWx1ZSAmIFNwZWNFbXB0eSkKICAgICAgICAgb3V0LnByaW50KCJFbXB0eSIp OwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1NwZWN1bGF0ZWRUeXBlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1NwZWN1bGF0ZWRU eXBlLmgJKHJldmlzaW9uIDIxNTc0NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9TcGVjdWxhdGVkVHlwZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAq IENvcHlyaWdodCAoQykgMjAxMS0yMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqIENvcHlyaWdodCAoQykgMjAxMS0yMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNzUsNyArNzUsNyBAQCBzdGF0 aWMgY29uc3QgU3BlY3VsYXRlZFR5cGUgU3BlY0FueUludCAgCiBzdGF0aWMgY29uc3QgU3BlY3Vs YXRlZFR5cGUgU3BlY0FueUludEFzRG91YmxlICAgICA9IDF1bGwgPDwgMjg7IC8vIEl0J3MgZGVm aW5pdGVseSBhbiBJbnQ1MiBhbmQgaXQncyBpbnNpZGUgYSBkb3VibGUuCiBzdGF0aWMgY29uc3Qg U3BlY3VsYXRlZFR5cGUgU3BlY05vbkludEFzRG91YmxlICAgICA9IDF1bGwgPDwgMjk7IC8vIEl0 J3MgZGVmaW5pdGVseSBub3QgYW4gSW50NTIgYnV0IGl0J3MgYSByZWFsIG51bWJlciBhbmQgaXQn cyBhIGRvdWJsZS4KIHN0YXRpYyBjb25zdCBTcGVjdWxhdGVkVHlwZSBTcGVjRG91YmxlUmVhbCAg ICAgICAgID0gU3BlY05vbkludEFzRG91YmxlIHwgU3BlY0FueUludEFzRG91YmxlOyAvLyBJdCdz IGRlZmluaXRlbHkgYSBub24tTmFOIGRvdWJsZS4KLXN0YXRpYyBjb25zdCBTcGVjdWxhdGVkVHlw ZSBTcGVjRG91YmxlUHVyZU5hTiAgICAgID0gMXVsbCA8PCAzMDsgLy8gSXQncyBkZWZpbml0ZWx5 IGEgTmFOIHRoYXQgaXMgc2FlIHRvIHRhZyAoaS5lLiBwdXJlKS4KK3N0YXRpYyBjb25zdCBTcGVj dWxhdGVkVHlwZSBTcGVjRG91YmxlUHVyZU5hTiAgICAgID0gMXVsbCA8PCAzMDsgLy8gSXQncyBk ZWZpbml0ZWx5IGEgTmFOIHRoYXQgaXMgc2FmZSB0byB0YWcgKGkuZS4gcHVyZSkuCiBzdGF0aWMg Y29uc3QgU3BlY3VsYXRlZFR5cGUgU3BlY0RvdWJsZUltcHVyZU5hTiAgICA9IDF1bGwgPDwgMzE7 IC8vIEl0J3MgZGVmaW5pdGVseSBhIE5hTiB0aGF0IGlzIHVuc2FmZSB0byB0YWcgKGkuZS4gaW1w dXJlKS4KIHN0YXRpYyBjb25zdCBTcGVjdWxhdGVkVHlwZSBTcGVjRG91YmxlTmFOICAgICAgICAg ID0gU3BlY0RvdWJsZVB1cmVOYU4gfCBTcGVjRG91YmxlSW1wdXJlTmFOOyAvLyBJdCdzIGRlZmlu aXRlbHkgc29tZSBraW5kIG9mIE5hTi4KIHN0YXRpYyBjb25zdCBTcGVjdWxhdGVkVHlwZSBTcGVj Qnl0ZWNvZGVEb3VibGUgICAgID0gU3BlY0RvdWJsZVJlYWwgfCBTcGVjRG91YmxlUHVyZU5hTjsg Ly8gSXQncyBlaXRoZXIgYSBub24tTmFOIG9yIGEgTmFOIGRvdWJsZSwgYnV0IGl0J3MgZGVmaW5p dGVseSBub3QgaW1wdXJlIE5hTi4K