155587 2016-03-17 10:15:37 -0700 Make FunctionMode an enum class. 2016-03-17 13:39:34 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam commit-queue keith_miller msaboff saam oldest_to_newest 1175767 0 mark.lam 2016-03-17 10:15:37 -0700 Patch coming. 1175769 1 274300 mark.lam 2016-03-17 10:22:33 -0700 Created attachment 274300 proposed patch. 1175811 2 274311 mark.lam 2016-03-17 12:17:27 -0700 Created attachment 274311 patch for landing: fixed Win EWS build failure. Thanks for the review. Updated with minor build fixes for errors reported by VC++. 1175844 3 mark.lam 2016-03-17 13:39:34 -0700 Landed in r198349: <http://trac.webkit.org/r198349>. 274300 2016-03-17 10:22:33 -0700 2016-03-17 12:17:27 -0700 proposed patch. bug-155587.patch text/plain 5096 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk4MzQxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDE2LTAzLTE3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN YWtlIEZ1bmN0aW9uTW9kZSBhbiBlbnVtIGNsYXNzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NTg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBieXRlY29kZS9VbmxpbmtlZEZ1bmN0aW9uRXhlY3V0 YWJsZS5jcHA6CisgICAgICAgIChKU0M6OlVubGlua2VkRnVuY3Rpb25FeGVjdXRhYmxlOjpVbmxp bmtlZEZ1bmN0aW9uRXhlY3V0YWJsZSk6CisgICAgICAgICogcGFyc2VyL05vZGVDb25zdHJ1Y3Rv cnMuaDoKKyAgICAgICAgKEpTQzo6QmFzZUZ1bmNFeHByTm9kZTo6QmFzZUZ1bmNFeHByTm9kZSk6 CisgICAgICAgIChKU0M6OkZ1bmNFeHByTm9kZTo6RnVuY0V4cHJOb2RlKToKKyAgICAgICAgKEpT Qzo6RnVuY0RlY2xOb2RlOjpGdW5jRGVjbE5vZGUpOgorICAgICAgICAoSlNDOjpBcnJvd0Z1bmNF eHByTm9kZTo6QXJyb3dGdW5jRXhwck5vZGUpOgorICAgICAgICAoSlNDOjpNZXRob2REZWZpbml0 aW9uTm9kZTo6TWV0aG9kRGVmaW5pdGlvbk5vZGUpOgorICAgICAgICAqIHBhcnNlci9QYXJzZXJN b2Rlcy5oOgorICAgICAgICAoSlNDOjpmdW5jdGlvbk5hbWVJc0luU2NvcGUpOgorCiAyMDE2LTAz LTE2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBNZXRob2QgbmFt ZXMgc2hvdWxkIG5vdCBhcHBlYXIgaW4gdGhlIGxleGljYWwgc2NvcGUgb2YgdGhlIG1ldGhvZCdz IGJvZHkuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5saW5rZWRGdW5j dGlvbkV4ZWN1dGFibGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9VbmxpbmtlZEZ1bmN0aW9uRXhlY3V0YWJsZS5jcHAJKHJldmlzaW9uIDE5ODMzMikK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9VbmxpbmtlZEZ1bmN0aW9uRXhlY3V0 YWJsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk3LDcgKzk3LDcgQEAgVW5saW5rZWRGdW5jdGlv bkV4ZWN1dGFibGU6OlVubGlua2VkRnVuYwogICAgICwgbV9pc0J1aWx0aW5GdW5jdGlvbihraW5k ID09IFVubGlua2VkQnVpbHRpbkZ1bmN0aW9uKQogICAgICwgbV9jb25zdHJ1Y3RBYmlsaXR5KHN0 YXRpY19jYXN0PHVuc2lnbmVkPihjb25zdHJ1Y3RBYmlsaXR5KSkKICAgICAsIG1fY29uc3RydWN0 b3JLaW5kKHN0YXRpY19jYXN0PHVuc2lnbmVkPihub2RlLT5jb25zdHJ1Y3RvcktpbmQoKSkpCi0g ICAgLCBtX2Z1bmN0aW9uTW9kZShub2RlLT5mdW5jdGlvbk1vZGUoKSkKKyAgICAsIG1fZnVuY3Rp b25Nb2RlKHN0YXRpY19jYXN0PHVuc2lnbmVkPihub2RlLT5mdW5jdGlvbk1vZGUoKSkpCiAgICAg LCBtX3N1cGVyQmluZGluZyhzdGF0aWNfY2FzdDx1bnNpZ25lZD4obm9kZS0+c3VwZXJCaW5kaW5n KCkpKQogICAgICwgbV9kZXJpdmVkQ29udGV4dFR5cGUoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGRl cml2ZWRDb250ZXh0VHlwZSkpCiAgICAgLCBtX3NvdXJjZVBhcnNlTW9kZShzdGF0aWNfY2FzdDx1 bnNpZ25lZD4obm9kZS0+cGFyc2VNb2RlKCkpKQpAQCAtMTEwLDcgKzExMCw3IEBAIFVubGlua2Vk RnVuY3Rpb25FeGVjdXRhYmxlOjpVbmxpbmtlZEZ1bmMKICAgICAvLyBNYWtlIHN1cmUgdGhlc2Ug Yml0ZmllbGRzIGFyZSBhZGVxdWF0ZWx5IHdpZGUuCiAgICAgQVNTRVJUKG1fY29uc3RydWN0QWJp bGl0eSA9PSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oY29uc3RydWN0QWJpbGl0eSkpOwogICAgIEFT U0VSVChtX2NvbnN0cnVjdG9yS2luZCA9PSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obm9kZS0+Y29u c3RydWN0b3JLaW5kKCkpKTsKLSAgICBBU1NFUlQobV9mdW5jdGlvbk1vZGUgPT0gbm9kZS0+ZnVu Y3Rpb25Nb2RlKCkpOworICAgIEFTU0VSVChtX2Z1bmN0aW9uTW9kZSA9PSBzdGF0aWNfY2FzdDx1 bnNpZ25lZD4obm9kZS0+ZnVuY3Rpb25Nb2RlKCkpKTsKICAgICBBU1NFUlQobV9zdXBlckJpbmRp bmcgPT0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG5vZGUtPnN1cGVyQmluZGluZygpKSk7CiAgICAg QVNTRVJUKG1fZGVyaXZlZENvbnRleHRUeXBlID09IHN0YXRpY19jYXN0PHVuc2lnbmVkPihkZXJp dmVkQ29udGV4dFR5cGUpKTsKICAgICBBU1NFUlQobV9zb3VyY2VQYXJzZU1vZGUgPT0gc3RhdGlj X2Nhc3Q8dW5zaWduZWQ+KG5vZGUtPnBhcnNlTW9kZSgpKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcGFyc2VyL05vZGVDb25zdHJ1Y3RvcnMuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcGFyc2VyL05vZGVDb25zdHJ1Y3RvcnMuaAkocmV2aXNpb24gMTk4MzMy KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9Ob2RlQ29uc3RydWN0b3JzLmgJKHdv cmtpbmcgY29weSkKQEAgLTg5OCw3ICs4OTgsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICB9CiAK ICAgICBpbmxpbmUgRnVuY0V4cHJOb2RlOjpGdW5jRXhwck5vZGUoY29uc3QgSlNUb2tlbkxvY2F0 aW9uJiBsb2NhdGlvbiwgY29uc3QgSWRlbnRpZmllciYgaWRlbnQsIEZ1bmN0aW9uTWV0YWRhdGFO b2RlKiBtZXRhZGF0YSwgY29uc3QgU291cmNlQ29kZSYgc291cmNlKQotICAgICAgICA6IEJhc2VG dW5jRXhwck5vZGUobG9jYXRpb24sIGlkZW50LCBtZXRhZGF0YSwgc291cmNlLCBGdW5jdGlvbkV4 cHJlc3Npb24pCisgICAgICAgIDogQmFzZUZ1bmNFeHByTm9kZShsb2NhdGlvbiwgaWRlbnQsIG1l dGFkYXRhLCBzb3VyY2UsIEZ1bmN0aW9uTW9kZTo6RnVuY3Rpb25FeHByZXNzaW9uKQogICAgIHsK ICAgICB9CiAKQEAgLTkxMSwxNiArOTExLDE2IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICA6 IFN0YXRlbWVudE5vZGUobG9jYXRpb24pCiAgICAgICAgICwgbV9tZXRhZGF0YShtZXRhZGF0YSkK ICAgICB7Ci0gICAgICAgIG1fbWV0YWRhdGEtPmZpbmlzaFBhcnNpbmcoc291cmNlLCBpZGVudCwg RnVuY3Rpb25EZWNsYXJhdGlvbik7CisgICAgICAgIG1fbWV0YWRhdGEtPmZpbmlzaFBhcnNpbmco c291cmNlLCBpZGVudCwgRnVuY3Rpb25Nb2RlOjpGdW5jdGlvbkRlY2xhcmF0aW9uKTsKICAgICB9 CiAKICAgICBpbmxpbmUgQXJyb3dGdW5jRXhwck5vZGU6OkFycm93RnVuY0V4cHJOb2RlKGNvbnN0 IEpTVG9rZW5Mb2NhdGlvbiYgbG9jYXRpb24sIGNvbnN0IElkZW50aWZpZXImIGlkZW50LCBGdW5j dGlvbk1ldGFkYXRhTm9kZSogbWV0YWRhdGEsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSkKLSAg ICAgICAgOiBCYXNlRnVuY0V4cHJOb2RlKGxvY2F0aW9uLCBpZGVudCwgbWV0YWRhdGEsIHNvdXJj ZSwgRnVuY3Rpb25FeHByZXNzaW9uKQorICAgICAgICA6IEJhc2VGdW5jRXhwck5vZGUobG9jYXRp b24sIGlkZW50LCBtZXRhZGF0YSwgc291cmNlLCBGdW5jdGlvbk1vZGU6OkZ1bmN0aW9uRXhwcmVz c2lvbikKICAgICB7CiAgICAgfQogCiAgICAgaW5saW5lIE1ldGhvZERlZmluaXRpb25Ob2RlOjpN ZXRob2REZWZpbml0aW9uTm9kZShjb25zdCBKU1Rva2VuTG9jYXRpb24mIGxvY2F0aW9uLCBjb25z dCBJZGVudGlmaWVyJiBpZGVudCwgRnVuY3Rpb25NZXRhZGF0YU5vZGUqIG1ldGFkYXRhLCBjb25z dCBTb3VyY2VDb2RlJiBzb3VyY2UpCi0gICAgICAgIDogRnVuY0V4cHJOb2RlKGxvY2F0aW9uLCBp ZGVudCwgbWV0YWRhdGEsIHNvdXJjZSwgTWV0aG9kRGVmaW5pdGlvbikKKyAgICAgICAgOiBGdW5j RXhwck5vZGUobG9jYXRpb24sIGlkZW50LCBtZXRhZGF0YSwgc291cmNlLCBGdW5jdGlvbk1vZGU6 Ok1ldGhvZERlZmluaXRpb24pCiAgICAgewogICAgIH0KICAgICAKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyTW9kZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlck1vZGVzLmgJKHJldmlzaW9uIDE5ODMzMikKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyTW9kZXMuaAkod29ya2luZyBjb3B5KQpA QCAtNDIsNyArNDIsNyBAQCBlbnVtIGNsYXNzIFRoaXNURFpNb2RlIHsgQWx3YXlzQ2hlY2ssIENo CiBlbnVtIFByb2ZpbGVyTW9kZSB7IFByb2ZpbGVyT2ZmLCBQcm9maWxlck9uIH07CiBlbnVtIERl YnVnZ2VyTW9kZSB7IERlYnVnZ2VyT2ZmLCBEZWJ1Z2dlck9uIH07CiAKLWVudW0gRnVuY3Rpb25N b2RlIHsgRnVuY3Rpb25FeHByZXNzaW9uLCBGdW5jdGlvbkRlY2xhcmF0aW9uLCBNZXRob2REZWZp bml0aW9uIH07CitlbnVtIGNsYXNzIEZ1bmN0aW9uTW9kZSB7IEZ1bmN0aW9uRXhwcmVzc2lvbiwg RnVuY3Rpb25EZWNsYXJhdGlvbiwgTWV0aG9kRGVmaW5pdGlvbiB9OwogCiBlbnVtIGNsYXNzIFNv dXJjZVBhcnNlTW9kZSA6IHVpbnQ4X3QgewogICAgIE5vcm1hbEZ1bmN0aW9uTW9kZSwKQEAgLTEy NSw3ICsxMjUsNyBAQCBpbmxpbmUgYm9vbCBmdW5jdGlvbk5hbWVJc0luU2NvcGUoY29uc3QgCiAg ICAgaWYgKG5hbWUuaXNOdWxsKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChm dW5jdGlvbk1vZGUgIT0gRnVuY3Rpb25FeHByZXNzaW9uKQorICAgIGlmIChmdW5jdGlvbk1vZGUg IT0gRnVuY3Rpb25Nb2RlOjpGdW5jdGlvbkV4cHJlc3Npb24pCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAogICAgIHJldHVybiB0cnVlOwo= 274311 2016-03-17 12:17:27 -0700 2016-03-17 12:17:27 -0700 patch for landing: fixed Win EWS build failure. bug-155587.patch text/plain 6067 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk4MzQ1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDE2LTAzLTE3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN YWtlIEZ1bmN0aW9uTW9kZSBhbiBlbnVtIGNsYXNzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NTg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBieXRlY29kZS9VbmxpbmtlZEZ1bmN0aW9uRXhlY3V0 YWJsZS5jcHA6CisgICAgICAgIChKU0M6OlVubGlua2VkRnVuY3Rpb25FeGVjdXRhYmxlOjpVbmxp bmtlZEZ1bmN0aW9uRXhlY3V0YWJsZSk6CisgICAgICAgICogcGFyc2VyL05vZGVDb25zdHJ1Y3Rv cnMuaDoKKyAgICAgICAgKEpTQzo6QmFzZUZ1bmNFeHByTm9kZTo6QmFzZUZ1bmNFeHByTm9kZSk6 CisgICAgICAgIChKU0M6OkZ1bmNFeHByTm9kZTo6RnVuY0V4cHJOb2RlKToKKyAgICAgICAgKEpT Qzo6RnVuY0RlY2xOb2RlOjpGdW5jRGVjbE5vZGUpOgorICAgICAgICAoSlNDOjpBcnJvd0Z1bmNF eHByTm9kZTo6QXJyb3dGdW5jRXhwck5vZGUpOgorICAgICAgICAoSlNDOjpNZXRob2REZWZpbml0 aW9uTm9kZTo6TWV0aG9kRGVmaW5pdGlvbk5vZGUpOgorICAgICAgICAqIHBhcnNlci9QYXJzZXJN b2Rlcy5oOgorICAgICAgICAoSlNDOjpmdW5jdGlvbk5hbWVJc0luU2NvcGUpOgorCiAyMDE2LTAz LTE2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBNZXRob2QgbmFt ZXMgc2hvdWxkIG5vdCBhcHBlYXIgaW4gdGhlIGxleGljYWwgc2NvcGUgb2YgdGhlIG1ldGhvZCdz IGJvZHkuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5saW5rZWRGdW5j dGlvbkV4ZWN1dGFibGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9VbmxpbmtlZEZ1bmN0aW9uRXhlY3V0YWJsZS5jcHAJKHJldmlzaW9uIDE5ODM0NSkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9VbmxpbmtlZEZ1bmN0aW9uRXhlY3V0 YWJsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk3LDcgKzk3LDcgQEAgVW5saW5rZWRGdW5jdGlv bkV4ZWN1dGFibGU6OlVubGlua2VkRnVuYwogICAgICwgbV9pc0J1aWx0aW5GdW5jdGlvbihraW5k ID09IFVubGlua2VkQnVpbHRpbkZ1bmN0aW9uKQogICAgICwgbV9jb25zdHJ1Y3RBYmlsaXR5KHN0 YXRpY19jYXN0PHVuc2lnbmVkPihjb25zdHJ1Y3RBYmlsaXR5KSkKICAgICAsIG1fY29uc3RydWN0 b3JLaW5kKHN0YXRpY19jYXN0PHVuc2lnbmVkPihub2RlLT5jb25zdHJ1Y3RvcktpbmQoKSkpCi0g ICAgLCBtX2Z1bmN0aW9uTW9kZShub2RlLT5mdW5jdGlvbk1vZGUoKSkKKyAgICAsIG1fZnVuY3Rp b25Nb2RlKHN0YXRpY19jYXN0PHVuc2lnbmVkPihub2RlLT5mdW5jdGlvbk1vZGUoKSkpCiAgICAg LCBtX3N1cGVyQmluZGluZyhzdGF0aWNfY2FzdDx1bnNpZ25lZD4obm9kZS0+c3VwZXJCaW5kaW5n KCkpKQogICAgICwgbV9kZXJpdmVkQ29udGV4dFR5cGUoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGRl cml2ZWRDb250ZXh0VHlwZSkpCiAgICAgLCBtX3NvdXJjZVBhcnNlTW9kZShzdGF0aWNfY2FzdDx1 bnNpZ25lZD4obm9kZS0+cGFyc2VNb2RlKCkpKQpAQCAtMTEwLDcgKzExMCw3IEBAIFVubGlua2Vk RnVuY3Rpb25FeGVjdXRhYmxlOjpVbmxpbmtlZEZ1bmMKICAgICAvLyBNYWtlIHN1cmUgdGhlc2Ug Yml0ZmllbGRzIGFyZSBhZGVxdWF0ZWx5IHdpZGUuCiAgICAgQVNTRVJUKG1fY29uc3RydWN0QWJp bGl0eSA9PSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oY29uc3RydWN0QWJpbGl0eSkpOwogICAgIEFT U0VSVChtX2NvbnN0cnVjdG9yS2luZCA9PSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obm9kZS0+Y29u c3RydWN0b3JLaW5kKCkpKTsKLSAgICBBU1NFUlQobV9mdW5jdGlvbk1vZGUgPT0gbm9kZS0+ZnVu Y3Rpb25Nb2RlKCkpOworICAgIEFTU0VSVChtX2Z1bmN0aW9uTW9kZSA9PSBzdGF0aWNfY2FzdDx1 bnNpZ25lZD4obm9kZS0+ZnVuY3Rpb25Nb2RlKCkpKTsKICAgICBBU1NFUlQobV9zdXBlckJpbmRp bmcgPT0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG5vZGUtPnN1cGVyQmluZGluZygpKSk7CiAgICAg QVNTRVJUKG1fZGVyaXZlZENvbnRleHRUeXBlID09IHN0YXRpY19jYXN0PHVuc2lnbmVkPihkZXJp dmVkQ29udGV4dFR5cGUpKTsKICAgICBBU1NFUlQobV9zb3VyY2VQYXJzZU1vZGUgPT0gc3RhdGlj X2Nhc3Q8dW5zaWduZWQ+KG5vZGUtPnBhcnNlTW9kZSgpKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcGFyc2VyL05vZGVDb25zdHJ1Y3RvcnMuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcGFyc2VyL05vZGVDb25zdHJ1Y3RvcnMuaAkocmV2aXNpb24gMTk4MzQ1 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9Ob2RlQ29uc3RydWN0b3JzLmgJKHdv cmtpbmcgY29weSkKQEAgLTg5OCw3ICs4OTgsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICB9CiAK ICAgICBpbmxpbmUgRnVuY0V4cHJOb2RlOjpGdW5jRXhwck5vZGUoY29uc3QgSlNUb2tlbkxvY2F0 aW9uJiBsb2NhdGlvbiwgY29uc3QgSWRlbnRpZmllciYgaWRlbnQsIEZ1bmN0aW9uTWV0YWRhdGFO b2RlKiBtZXRhZGF0YSwgY29uc3QgU291cmNlQ29kZSYgc291cmNlKQotICAgICAgICA6IEJhc2VG dW5jRXhwck5vZGUobG9jYXRpb24sIGlkZW50LCBtZXRhZGF0YSwgc291cmNlLCBGdW5jdGlvbkV4 cHJlc3Npb24pCisgICAgICAgIDogQmFzZUZ1bmNFeHByTm9kZShsb2NhdGlvbiwgaWRlbnQsIG1l dGFkYXRhLCBzb3VyY2UsIEZ1bmN0aW9uTW9kZTo6RnVuY3Rpb25FeHByZXNzaW9uKQogICAgIHsK ICAgICB9CiAKQEAgLTkxMSwxNiArOTExLDE2IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICA6 IFN0YXRlbWVudE5vZGUobG9jYXRpb24pCiAgICAgICAgICwgbV9tZXRhZGF0YShtZXRhZGF0YSkK ICAgICB7Ci0gICAgICAgIG1fbWV0YWRhdGEtPmZpbmlzaFBhcnNpbmcoc291cmNlLCBpZGVudCwg RnVuY3Rpb25EZWNsYXJhdGlvbik7CisgICAgICAgIG1fbWV0YWRhdGEtPmZpbmlzaFBhcnNpbmco c291cmNlLCBpZGVudCwgRnVuY3Rpb25Nb2RlOjpGdW5jdGlvbkRlY2xhcmF0aW9uKTsKICAgICB9 CiAKICAgICBpbmxpbmUgQXJyb3dGdW5jRXhwck5vZGU6OkFycm93RnVuY0V4cHJOb2RlKGNvbnN0 IEpTVG9rZW5Mb2NhdGlvbiYgbG9jYXRpb24sIGNvbnN0IElkZW50aWZpZXImIGlkZW50LCBGdW5j dGlvbk1ldGFkYXRhTm9kZSogbWV0YWRhdGEsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSkKLSAg ICAgICAgOiBCYXNlRnVuY0V4cHJOb2RlKGxvY2F0aW9uLCBpZGVudCwgbWV0YWRhdGEsIHNvdXJj ZSwgRnVuY3Rpb25FeHByZXNzaW9uKQorICAgICAgICA6IEJhc2VGdW5jRXhwck5vZGUobG9jYXRp b24sIGlkZW50LCBtZXRhZGF0YSwgc291cmNlLCBGdW5jdGlvbk1vZGU6OkZ1bmN0aW9uRXhwcmVz c2lvbikKICAgICB7CiAgICAgfQogCiAgICAgaW5saW5lIE1ldGhvZERlZmluaXRpb25Ob2RlOjpN ZXRob2REZWZpbml0aW9uTm9kZShjb25zdCBKU1Rva2VuTG9jYXRpb24mIGxvY2F0aW9uLCBjb25z dCBJZGVudGlmaWVyJiBpZGVudCwgRnVuY3Rpb25NZXRhZGF0YU5vZGUqIG1ldGFkYXRhLCBjb25z dCBTb3VyY2VDb2RlJiBzb3VyY2UpCi0gICAgICAgIDogRnVuY0V4cHJOb2RlKGxvY2F0aW9uLCBp ZGVudCwgbWV0YWRhdGEsIHNvdXJjZSwgTWV0aG9kRGVmaW5pdGlvbikKKyAgICAgICAgOiBGdW5j RXhwck5vZGUobG9jYXRpb24sIGlkZW50LCBtZXRhZGF0YSwgc291cmNlLCBGdW5jdGlvbk1vZGU6 Ok1ldGhvZERlZmluaXRpb24pCiAgICAgewogICAgIH0KICAgICAKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9wYXJzZXIvTm9kZXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9wYXJzZXIvTm9kZXMuY3BwCShyZXZpc2lvbiAxOTgzNDUpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcGFyc2VyL05vZGVzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY2LDcgKzE2 Niw3IEBAIEZ1bmN0aW9uTWV0YWRhdGFOb2RlOjpGdW5jdGlvbk1ldGFkYXRhTm8KICAgICBBU1NF UlQobV9jb25zdHJ1Y3RvcktpbmQgPT0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGNvbnN0cnVjdG9y S2luZCkpOwogfQogCi12b2lkIEZ1bmN0aW9uTWV0YWRhdGFOb2RlOjpmaW5pc2hQYXJzaW5nKGNv bnN0IFNvdXJjZUNvZGUmIHNvdXJjZSwgY29uc3QgSWRlbnRpZmllciYgaWRlbnQsIGVudW0gRnVu Y3Rpb25Nb2RlIGZ1bmN0aW9uTW9kZSkKK3ZvaWQgRnVuY3Rpb25NZXRhZGF0YU5vZGU6OmZpbmlz aFBhcnNpbmcoY29uc3QgU291cmNlQ29kZSYgc291cmNlLCBjb25zdCBJZGVudGlmaWVyJiBpZGVu dCwgRnVuY3Rpb25Nb2RlIGZ1bmN0aW9uTW9kZSkKIHsKICAgICBtX3NvdXJjZSA9IHNvdXJjZTsK ICAgICBtX2lkZW50ID0gaWRlbnQ7CkBAIC0xODksNyArMTg5LDcgQEAgRnVuY3Rpb25Ob2RlOjpG dW5jdGlvbk5vZGUoUGFyc2VyQXJlbmEmIAogewogfQogCi12b2lkIEZ1bmN0aW9uTm9kZTo6Zmlu aXNoUGFyc2luZyhjb25zdCBJZGVudGlmaWVyJiBpZGVudCwgZW51bSBGdW5jdGlvbk1vZGUgZnVu Y3Rpb25Nb2RlKQordm9pZCBGdW5jdGlvbk5vZGU6OmZpbmlzaFBhcnNpbmcoY29uc3QgSWRlbnRp ZmllciYgaWRlbnQsIEZ1bmN0aW9uTW9kZSBmdW5jdGlvbk1vZGUpCiB7CiAgICAgQVNTRVJUKCFz b3VyY2UoKS5pc051bGwoKSk7CiAgICAgbV9pZGVudCA9IGlkZW50OwpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXJNb2Rlcy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyTW9kZXMuaAkocmV2aXNpb24gMTk4MzQ1KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXJNb2Rlcy5oCSh3b3JraW5nIGNvcHkp CkBAIC00Miw3ICs0Miw3IEBAIGVudW0gY2xhc3MgVGhpc1REWk1vZGUgeyBBbHdheXNDaGVjaywg Q2gKIGVudW0gUHJvZmlsZXJNb2RlIHsgUHJvZmlsZXJPZmYsIFByb2ZpbGVyT24gfTsKIGVudW0g RGVidWdnZXJNb2RlIHsgRGVidWdnZXJPZmYsIERlYnVnZ2VyT24gfTsKIAotZW51bSBGdW5jdGlv bk1vZGUgeyBGdW5jdGlvbkV4cHJlc3Npb24sIEZ1bmN0aW9uRGVjbGFyYXRpb24sIE1ldGhvZERl ZmluaXRpb24gfTsKK2VudW0gY2xhc3MgRnVuY3Rpb25Nb2RlIHsgRnVuY3Rpb25FeHByZXNzaW9u LCBGdW5jdGlvbkRlY2xhcmF0aW9uLCBNZXRob2REZWZpbml0aW9uIH07CiAKIGVudW0gY2xhc3Mg U291cmNlUGFyc2VNb2RlIDogdWludDhfdCB7CiAgICAgTm9ybWFsRnVuY3Rpb25Nb2RlLApAQCAt MTI1LDcgKzEyNSw3IEBAIGlubGluZSBib29sIGZ1bmN0aW9uTmFtZUlzSW5TY29wZShjb25zdCAK ICAgICBpZiAobmFtZS5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYg KGZ1bmN0aW9uTW9kZSAhPSBGdW5jdGlvbkV4cHJlc3Npb24pCisgICAgaWYgKGZ1bmN0aW9uTW9k ZSAhPSBGdW5jdGlvbk1vZGU6OkZ1bmN0aW9uRXhwcmVzc2lvbikKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgcmV0dXJuIHRydWU7Cg==