125969 2013-12-18 18:44:41 -0800 CStack: Fix baseline to DFG JIT OSR 2013-12-18 19:45:32 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam fpizlo ggaren mhahnenberg msaboff oliver oldest_to_newest 961227 0 mark.lam 2013-12-18 18:44:41 -0800 Patch coming. 961233 1 219603 mark.lam 2013-12-18 18:51:35 -0800 Created attachment 219603 the patch. 961244 2 mark.lam 2013-12-18 19:45:32 -0800 Thanks for the review. Landed in r160821: <http://trac.webkit.org/r160821>. 219603 2013-12-18 18:51:35 -0800 2013-12-18 19:41:40 -0800 the patch. bug-125969.patch text/plain 12150 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYwODE4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDEzLTEyLTE4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBD U3RhY2s6IEZpeCBiYXNlbGluZSB0byBERkcgSklUIE9TUi4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTk2OS4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAxLiBDaGFuZ2Ugb3BlcmF0aW9uT3B0aW1pemUo KSB0byByZXR1cm4gYSB0dXBsZSBvZiBPU1IgdGFyZ2V0IGFkZHJlc3MKKyAgICAgICAgICAgYW5k IG5ldyB0b3BPZkZyYW1lIHZhbHVlIChhcyBvcHBvc2VkIHRvIGp1c3QgdGhlIE9TUiB0YXJnZXQg YWRkcmVzcykuCisgICAgICAgIDIuIENoYW5nZSBlbWl0RW50ZXJPcHRpbWl6YXRpb25DaGVjaygp IGFuZCBlbWl0U2xvd19vcF9sb29wX2hpbnQoKSB0bworICAgICAgICAgICBlbWl0IGNvZGUgdG8g c2V0IHRoZSBzdGFja1BvaW50ZXIgd2l0aCB0aGUgcmV0dXJuZWQgdG9wT2ZGcmFtZSB2YWx1ZQor ICAgICAgICAgICBpZiB3ZSB0YWtlIHRoZSBPU1IgcGF0aC4KKworICAgICAgICAqIGppdC9KSVQu Y3BwOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRFbnRlck9wdGltaXphdGlvbkNoZWNrKToKKyAg ICAgICAgKiBqaXQvSklULmg6CisgICAgICAgICogaml0L0pJVElubGluZXMuaDoKKyAgICAgICAg KEpTQzo6SklUOjpjYWxsT3BlcmF0aW9uKToKKyAgICAgICAgKiBqaXQvSklUT3Bjb2Rlcy5jcHA6 CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdFNsb3dfb3BfbG9vcF9oaW50KToKKyAgICAgICAgKiBq aXQvSklUT3BlcmF0aW9ucy5jcHA6CisgICAgICAgICogaml0L0pJVE9wZXJhdGlvbnMuaDoKKyAg ICAgICAgKiBydW50aW1lL09wdGlvbnMuaDoKKwogMjAxMy0xMi0xOCAgTWljaGFlbCBTYWJvZmYg IDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBDU3RhY2sgQnJhbmNoOiBTdG9wIHRocmVh ZGluZyBjYWxsRnJhbWVSZWdpc3RlciB0aHJvdWdoIExMSW50U2xvd0NhbGxzCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2ppdC9KSVQuY3BwCShyZXZpc2lvbiAxNjA4MTYpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L0pJVC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMiw2ICsxMDIsNyBAQCB2 b2lkIEpJVDo6ZW1pdEVudGVyT3B0aW1pemF0aW9uQ2hlY2soKQogICAgIEFTU0VSVCghbV9ieXRl Y29kZU9mZnNldCk7CiAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25PcHRpbWl6ZSwgbV9ieXRl Y29kZU9mZnNldCk7CiAgICAgc2tpcE9wdGltaXplLmFwcGVuZChicmFuY2hUZXN0UHRyKFplcm8s IHJldHVyblZhbHVlR1BSKSk7CisgICAgbW92ZShyZXR1cm5WYWx1ZUdQUjIsIHN0YWNrUG9pbnRl clJlZ2lzdGVyKTsKICAgICBqdW1wKHJldHVyblZhbHVlR1BSKTsKICAgICBza2lwT3B0aW1pemUu bGluayh0aGlzKTsKIH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaAkocmV2aXNpb24gMTYw ODE2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaAkod29ya2luZyBjb3B5KQpA QCAtNjkwLDExICs2OTAsMTEgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIE1hY3JvQXNzZW1i bGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oV2l0aFByb2ZpbGVUYWcsIEpfSklUT3BlcmF0aW9uX0VQ YywgaW50LCBJbnN0cnVjdGlvbiopOwogICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6Q2FsbCBjYWxs T3BlcmF0aW9uKEpfSklUT3BlcmF0aW9uX0VaLCBpbnQsIGludDMyX3QpOwogICAgICAgICBNYWNy b0Fzc2VtYmxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKFBfSklUT3BlcmF0aW9uX0VKUywgR1BSUmVn LCBzaXplX3QpOwotICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKFBf SklUT3BlcmF0aW9uX0VaLCBpbnQzMl90KTsKICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkNhbGwg Y2FsbE9wZXJhdGlvbihTX0pJVE9wZXJhdGlvbl9FQ0MsIFJlZ2lzdGVySUQsIFJlZ2lzdGVySUQp OwogICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKFNfSklUT3BlcmF0 aW9uX0VKLCBSZWdpc3RlcklEKTsKICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkNhbGwgY2FsbE9w ZXJhdGlvbihTX0pJVE9wZXJhdGlvbl9FSkosIFJlZ2lzdGVySUQsIFJlZ2lzdGVySUQpOwogICAg ICAgICBNYWNyb0Fzc2VtYmxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKFNfSklUT3BlcmF0aW9uX0VP SnNzLCBSZWdpc3RlcklELCBSZWdpc3RlcklEKTsKKyAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkNh bGwgY2FsbE9wZXJhdGlvbihTcHJ0X0pJVE9wZXJhdGlvbl9FWiwgaW50MzJfdCk7CiAgICAgICAg IE1hY3JvQXNzZW1ibGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oVl9KSVRPcGVyYXRpb25fRSk7CiAg ICAgICAgIE1hY3JvQXNzZW1ibGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oVl9KSVRPcGVyYXRpb25f RUMsIFJlZ2lzdGVySUQpOwogICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6Q2FsbCBjYWxsT3BlcmF0 aW9uKFZfSklUT3BlcmF0aW9uX0VDQywgUmVnaXN0ZXJJRCwgUmVnaXN0ZXJJRCk7CkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVElubGluZXMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVElubGluZXMuaAkocmV2aXNpb24gMTYwODE2KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAg LTIxNywyMSArMjE3LDIxIEBAIEFMV0FZU19JTkxJTkUgTWFjcm9Bc3NlbWJsZXI6OkNhbGwgSklU OjoKICAgICByZXR1cm4gYXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVja1NldEpTVmFsdWVSZXN1 bHQob3BlcmF0aW9uLCBkc3QpOwogfQogCi1BTFdBWVNfSU5MSU5FIE1hY3JvQXNzZW1ibGVyOjpD YWxsIEpJVDo6Y2FsbE9wZXJhdGlvbihQX0pJVE9wZXJhdGlvbl9FWiBvcGVyYXRpb24sIGludDMy X3Qgb3ApCitBTFdBWVNfSU5MSU5FIE1hY3JvQXNzZW1ibGVyOjpDYWxsIEpJVDo6Y2FsbE9wZXJh dGlvbihTX0pJVE9wZXJhdGlvbl9FQ0Mgb3BlcmF0aW9uLCBSZWdpc3RlcklEIHJlZ09wMSwgUmVn aXN0ZXJJRCByZWdPcDIpCiB7Ci0gICAgc2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKFRydXN0 ZWRJbW0zMihvcCkpOworICAgIHNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShyZWdPcDEsIHJl Z09wMik7CiAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRoRXhjZXB0aW9uQ2hlY2sob3BlcmF0aW9u KTsKIH0KIAotQUxXQVlTX0lOTElORSBNYWNyb0Fzc2VtYmxlcjo6Q2FsbCBKSVQ6OmNhbGxPcGVy YXRpb24oU19KSVRPcGVyYXRpb25fRUNDIG9wZXJhdGlvbiwgUmVnaXN0ZXJJRCByZWdPcDEsIFJl Z2lzdGVySUQgcmVnT3AyKQorQUxXQVlTX0lOTElORSBNYWNyb0Fzc2VtYmxlcjo6Q2FsbCBKSVQ6 OmNhbGxPcGVyYXRpb24oU19KSVRPcGVyYXRpb25fRU9Kc3Mgb3BlcmF0aW9uLCBSZWdpc3RlcklE IHJlZ09wMSwgUmVnaXN0ZXJJRCByZWdPcDIpCiB7CiAgICAgc2V0dXBBcmd1bWVudHNXaXRoRXhl Y1N0YXRlKHJlZ09wMSwgcmVnT3AyKTsKICAgICByZXR1cm4gYXBwZW5kQ2FsbFdpdGhFeGNlcHRp b25DaGVjayhvcGVyYXRpb24pOwogfQogCi1BTFdBWVNfSU5MSU5FIE1hY3JvQXNzZW1ibGVyOjpD YWxsIEpJVDo6Y2FsbE9wZXJhdGlvbihTX0pJVE9wZXJhdGlvbl9FT0pzcyBvcGVyYXRpb24sIFJl Z2lzdGVySUQgcmVnT3AxLCBSZWdpc3RlcklEIHJlZ09wMikKK0FMV0FZU19JTkxJTkUgTWFjcm9B c3NlbWJsZXI6OkNhbGwgSklUOjpjYWxsT3BlcmF0aW9uKFNwcnRfSklUT3BlcmF0aW9uX0VaIG9w ZXJhdGlvbiwgaW50MzJfdCBvcCkKIHsKLSAgICBzZXR1cEFyZ3VtZW50c1dpdGhFeGVjU3RhdGUo cmVnT3AxLCByZWdPcDIpOworICAgIHNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShUcnVzdGVk SW1tMzIob3ApKTsKICAgICByZXR1cm4gYXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVjayhvcGVy YXRpb24pOwogfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5j cHAJKHJldmlzaW9uIDE2MDgxNikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bj b2Rlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMTYsNiArMTExNiw3IEBAIHZvaWQgSklUOjpl bWl0U2xvd19vcF9sb29wX2hpbnQoSW5zdHJ1Y3QKICAgICAgICAgCiAgICAgICAgIGNhbGxPcGVy YXRpb24ob3BlcmF0aW9uT3B0aW1pemUsIG1fYnl0ZWNvZGVPZmZzZXQpOwogICAgICAgICBKdW1w IG5vT3B0aW1pemVkRW50cnkgPSBicmFuY2hUZXN0UHRyKFplcm8sIHJldHVyblZhbHVlR1BSKTsK KyAgICAgICAgbW92ZShyZXR1cm5WYWx1ZUdQUjIsIHN0YWNrUG9pbnRlclJlZ2lzdGVyKTsKICAg ICAgICAganVtcChyZXR1cm5WYWx1ZUdQUik7CiAgICAgICAgIG5vT3B0aW1pemVkRW50cnkubGlu ayh0aGlzKTsKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25z LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlv bnMuY3BwCShyZXZpc2lvbiAxNjA4MTYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJ VE9wZXJhdGlvbnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMCw3ICszMCw2IEBACiAjaW5jbHVk ZSAiQXJndW1lbnRzLmgiCiAjaW5jbHVkZSAiQXJyYXlDb25zdHJ1Y3Rvci5oIgogI2luY2x1ZGUg IkNhbGxGcmFtZUlubGluZXMuaCIKLSNpbmNsdWRlICJDb21tb25TbG93UGF0aHMuaCIKICNpbmNs dWRlICJERkdDb21waWxhdGlvbk1vZGUuaCIKICNpbmNsdWRlICJERkdEcml2ZXIuaCIKICNpbmNs dWRlICJERkdPU1JFbnRyeS5oIgpAQCAtOTc0LDcgKzk3Myw3IEBAIHZvaWQgSklUX09QRVJBVElP TiBvcGVyYXRpb25EZWJ1ZyhFeGVjU3QKIH0KIAogI2lmIEVOQUJMRShERkdfSklUKQotY2hhciog SklUX09QRVJBVElPTiBvcGVyYXRpb25PcHRpbWl6ZShFeGVjU3RhdGUqIGV4ZWMsIGludDMyX3Qg Ynl0ZWNvZGVJbmRleCkKK1Nsb3dQYXRoUmV0dXJuVHlwZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGlv bk9wdGltaXplKEV4ZWNTdGF0ZSogZXhlYywgaW50MzJfdCBieXRlY29kZUluZGV4KQogewogICAg IFZNJiB2bSA9IGV4ZWMtPnZtKCk7CiAgICAgTmF0aXZlQ2FsbEZyYW1lVHJhY2VyIHRyYWNlcigm dm0sIGV4ZWMpOwpAQCAtMTAyNCw3ICsxMDIzLDcgQEAgY2hhciogSklUX09QRVJBVElPTiBvcGVy YXRpb25PcHRpbWl6ZShFeAogICAgICAgICBjb2RlQmxvY2stPnVwZGF0ZUFsbFByZWRpY3Rpb25z KCk7CiAgICAgICAgIGlmIChPcHRpb25zOjp2ZXJib3NlT1NSKCkpCiAgICAgICAgICAgICBkYXRh TG9nKCJDaG9vc2luZyBub3QgdG8gb3B0aW1pemUgIiwgKmNvZGVCbG9jaywgIiB5ZXQsIGJlY2F1 c2UgdGhlIHRocmVzaG9sZCBoYXNuJ3QgYmVlbiByZWFjaGVkLlxuIik7Ci0gICAgICAgIHJldHVy biAwOworICAgICAgICByZXR1cm4gZW5jb2RlUmVzdWx0KDAsIDApOwogICAgIH0KICAgICAKICAg ICBpZiAoY29kZUJsb2NrLT5tX3Nob3VsZEFsd2F5c0JlSW5saW5lZCkgewpAQCAtMTAzMiw3ICsx MDMxLDcgQEAgY2hhciogSklUX09QRVJBVElPTiBvcGVyYXRpb25PcHRpbWl6ZShFeAogICAgICAg ICBjb2RlQmxvY2stPm9wdGltaXplQWZ0ZXJXYXJtVXAoKTsKICAgICAgICAgaWYgKE9wdGlvbnM6 OnZlcmJvc2VPU1IoKSkKICAgICAgICAgICAgIGRhdGFMb2coIkNob29zaW5nIG5vdCB0byBvcHRp bWl6ZSAiLCAqY29kZUJsb2NrLCAiIHlldCwgYmVjYXVzZSBtX3Nob3VsZEFsd2F5c0JlSW5saW5l ZCA9PSB0cnVlLlxuIik7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gZW5jb2Rl UmVzdWx0KDAsIDApOwogICAgIH0KIAogICAgIC8vIFdlIGNhbm5vdCBiZSBpbiB0aGUgcHJvY2Vz cyBvZiBhc3luY2hyb25vdXMgY29tcGlsYXRpb24gYW5kIGFsc28gaGF2ZSBhbiBvcHRpbWl6ZWQK QEAgLTEwNzIsNyArMTA3MSw3IEBAIGNoYXIqIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uT3B0aW1p emUoRXgKICAgICAgICAgLy8gcmVwbGFjZW1lbnQuCiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFj b2RlQmxvY2stPmhhc09wdGltaXplZFJlcGxhY2VtZW50KCkpOwogICAgICAgICBjb2RlQmxvY2st PnNldE9wdGltaXphdGlvblRocmVzaG9sZEJhc2VkT25Db21waWxhdGlvblJlc3VsdChDb21waWxh dGlvbkRlZmVycmVkKTsKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBlbmNvZGVS ZXN1bHQoMCwgMCk7CiAgICAgfQogCiAgICAgaWYgKHdvcmtsaXN0U3RhdGUgPT0gREZHOjpXb3Jr bGlzdDo6Q29tcGlsZWQpIHsKQEAgLTEwODUsNyArMTA4NCw3IEBAIGNoYXIqIEpJVF9PUEVSQVRJ T04gb3BlcmF0aW9uT3B0aW1pemUoRXgKICAgICAgICAgICAgIGNvZGVCbG9jay0+dXBkYXRlQWxs UHJlZGljdGlvbnMoKTsKICAgICAgICAgICAgIGlmIChPcHRpb25zOjp2ZXJib3NlT1NSKCkpCiAg ICAgICAgICAgICAgICAgZGF0YUxvZygiQ29kZSBibG9jayAiLCAqY29kZUJsb2NrLCAiIHdhcyBj b21waWxlZCBidXQgaXQgZG9lc24ndCBoYXZlIGFuIG9wdGltaXplZCByZXBsYWNlbWVudC5cbiIp OwotICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgICAgICByZXR1cm4gZW5jb2RlUmVzdWx0 KDAsIDApOwogICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChjb2RlQmxvY2stPmhhc09wdGltaXpl ZFJlcGxhY2VtZW50KCkpIHsKICAgICAgICAgaWYgKE9wdGlvbnM6OnZlcmJvc2VPU1IoKSkKQEAg LTExMTAsNyArMTEwOSw3IEBAIGNoYXIqIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uT3B0aW1pemUo RXgKICAgICAgICAgICAgICAgICAgICAgIigiLCAqY29kZUJsb2NrLT5yZXBsYWNlbWVudCgpLCAi KSAoaW4gbG9vcCkuXG4iKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGNvZGVCbG9jay0+ cmVwbGFjZW1lbnQoKS0+amV0dGlzb24oQ291bnRSZW9wdGltaXphdGlvbik7Ci0gICAgICAgICAg ICByZXR1cm4gMDsKKyAgICAgICAgICAgIHJldHVybiBlbmNvZGVSZXN1bHQoMCwgMCk7CiAgICAg ICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBpZiAoIWNvZGVCbG9jay0+c2hvdWxkT3B0aW1p emVOb3coKSkgewpAQCAtMTExOSw3ICsxMTE4LDcgQEAgY2hhciogSklUX09QRVJBVElPTiBvcGVy YXRpb25PcHRpbWl6ZShFeAogICAgICAgICAgICAgICAgICAgICAiRGVsYXlpbmcgb3B0aW1pemF0 aW9uIGZvciAiLCAqY29kZUJsb2NrLAogICAgICAgICAgICAgICAgICAgICAiIGJlY2F1c2Ugb2Yg aW5zdWZmaWNpZW50IHByb2ZpbGluZy5cbiIpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAg cmV0dXJuIDA7CisgICAgICAgICAgICByZXR1cm4gZW5jb2RlUmVzdWx0KDAsIDApOwogICAgICAg ICB9CiAKICAgICAgICAgaWYgKE9wdGlvbnM6OnZlcmJvc2VPU1IoKSkKQEAgLTExNTIsNyArMTE1 MSw3IEBAIGNoYXIqIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uT3B0aW1pemUoRXgKICAgICAgICAg ICAgIHZtLmVuc3VyZVdvcmtsaXN0KCkpOwogICAgICAgICAKICAgICAgICAgaWYgKHJlc3VsdCAh PSBDb21waWxhdGlvblN1Y2Nlc3NmdWwpCi0gICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAg ICAgIHJldHVybiBlbmNvZGVSZXN1bHQoMCwgMCk7CiAgICAgfQogICAgIAogICAgIENvZGVCbG9j ayogb3B0aW1pemVkQ29kZUJsb2NrID0gY29kZUJsb2NrLT5yZXBsYWNlbWVudCgpOwpAQCAtMTE2 Niw3ICsxMTY1LDggQEAgY2hhciogSklUX09QRVJBVElPTiBvcGVyYXRpb25PcHRpbWl6ZShFeAog ICAgICAgICB9CiAKICAgICAgICAgY29kZUJsb2NrLT5vcHRpbWl6ZVNvb24oKTsKLSAgICAgICAg cmV0dXJuIHN0YXRpY19jYXN0PGNoYXIqPihhZGRyZXNzKTsKKyAgICAgICAgQVNTRVJUKGV4ZWMt PmNvZGVCbG9jaygpID09IG9wdGltaXplZENvZGVCbG9jayk7CisgICAgICAgIHJldHVybiBlbmNv ZGVSZXN1bHQoYWRkcmVzcywgZXhlYy0+dG9wT2ZGcmFtZSgpKTsKICAgICB9CiAKICAgICBpZiAo T3B0aW9uczo6dmVyYm9zZU9TUigpKSB7CkBAIC0xMTk1LDE0ICsxMTk1LDE0IEBAIGNoYXIqIEpJ VF9PUEVSQVRJT04gb3BlcmF0aW9uT3B0aW1pemUoRXgKICAgICAgICAgICAgICAgICAqY29kZUJs b2NrLT5yZXBsYWNlbWVudCgpLCAiIChhZnRlciBPU1IgZmFpbCkuXG4iKTsKICAgICAgICAgfQog ICAgICAgICBvcHRpbWl6ZWRDb2RlQmxvY2stPmpldHRpc29uKENvdW50UmVvcHRpbWl6YXRpb24p OwotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIGVuY29kZVJlc3VsdCgwLCAwKTsK ICAgICB9CiAKICAgICAvLyBPU1IgZmFpbGVkIHRoaXMgdGltZSwgYnV0IGl0IG1pZ2h0IHN1Y2Nl ZWQgbmV4dCB0aW1lISBMZXQgdGhlIGNvZGUgcnVuIGEgYml0CiAgICAgLy8gbG9uZ2VyIGFuZCB0 aGVuIHRyeSBhZ2Fpbi4KICAgICBjb2RlQmxvY2stPm9wdGltaXplQWZ0ZXJXYXJtVXAoKTsKICAg ICAKLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gZW5jb2RlUmVzdWx0KDAsIDApOwogfQogI2Vu ZGlmCiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5oCShy ZXZpc2lvbiAxNjA4MTYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlv bnMuaAkod29ya2luZyBjb3B5KQpAQCAtMjksNiArMjksNyBAQAogI2lmIEVOQUJMRShKSVQpCiAK ICNpbmNsdWRlICJDYWxsRnJhbWUuaCIKKyNpbmNsdWRlICJDb21tb25TbG93UGF0aHMuaCIKICNp bmNsdWRlICJKSVRFeGNlcHRpb25zLmgiCiAjaW5jbHVkZSAiSlNBcnJheS5oIgogI2luY2x1ZGUg IkpTQ0pTVmFsdWUuaCIKQEAgLTcyLDYgKzczLDcgQEAgZXh0ZXJuICJDIiB7CiAgICAgUGM6IElu c3RydWN0aW9uKiBpLmUuIGJ5dGVjb2RlIFBDCiAgICAgUjogUmVnaXN0ZXIKICAgICBTOiBzaXpl X3QKKyAgICBTcHJ0OiBTbG93UGF0aFJldHVyblR5cGUKICAgICBTc2k6IFN0cnVjdHVyZVN0dWJJ bmZvKgogICAgIFN0OiBTdHJ1Y3R1cmUqCiAgICAgVjogdm9pZApAQCAtMTMzLDYgKzEzNSw3IEBA IHR5cGVkZWYgc2l6ZV90IEpJVF9PUEVSQVRJT04gKCpTX0pJVE9wZXIKIHR5cGVkZWYgc2l6ZV90 IEpJVF9PUEVSQVRJT04gKCpTX0pJVE9wZXJhdGlvbl9FSkopKEV4ZWNTdGF0ZSosIEVuY29kZWRK U1ZhbHVlLCBFbmNvZGVkSlNWYWx1ZSk7CiB0eXBlZGVmIHNpemVfdCBKSVRfT1BFUkFUSU9OICgq U19KSVRPcGVyYXRpb25fRU9Kc3MpKEV4ZWNTdGF0ZSosIEpTT2JqZWN0KiwgSlNTdHJpbmcqKTsK IHR5cGVkZWYgc2l6ZV90IEpJVF9PUEVSQVRJT04gKCpTX0pJVE9wZXJhdGlvbl9KKShFbmNvZGVk SlNWYWx1ZSk7Cit0eXBlZGVmIFNsb3dQYXRoUmV0dXJuVHlwZSBKSVRfT1BFUkFUSU9OICgqU3By dF9KSVRPcGVyYXRpb25fRVopKEV4ZWNTdGF0ZSosIGludDMyX3QpOwogdHlwZWRlZiB2b2lkIEpJ VF9PUEVSQVRJT04gKCpWX0pJVE9wZXJhdGlvbl9FKShFeGVjU3RhdGUqKTsKIHR5cGVkZWYgdm9p ZCBKSVRfT1BFUkFUSU9OICgqVl9KSVRPcGVyYXRpb25fRUMpKEV4ZWNTdGF0ZSosIEpTQ2VsbCop OwogdHlwZWRlZiB2b2lkIEpJVF9PUEVSQVRJT04gKCpWX0pJVE9wZXJhdGlvbl9FQ2IpKEV4ZWNT dGF0ZSosIENvZGVCbG9jayopOwpAQCAtMTczLDcgKzE3Niw2IEBAIHR5cGVkZWYgY2hhciogSklU X09QRVJBVElPTiAoKlBfSklUT3BlcmEKIHR5cGVkZWYgY2hhciogSklUX09QRVJBVElPTiAoKlBf SklUT3BlcmF0aW9uX0VTdFBTKShFeGVjU3RhdGUqLCBTdHJ1Y3R1cmUqLCB2b2lkKiwgc2l6ZV90 KTsKIHR5cGVkZWYgY2hhciogSklUX09QRVJBVElPTiAoKlBfSklUT3BlcmF0aW9uX0VTdFNTKShF eGVjU3RhdGUqLCBTdHJ1Y3R1cmUqLCBzaXplX3QsIHNpemVfdCk7CiB0eXBlZGVmIGNoYXIqIEpJ VF9PUEVSQVRJT04gKCpQX0pJVE9wZXJhdGlvbl9FU3RaKShFeGVjU3RhdGUqLCBTdHJ1Y3R1cmUq LCBpbnQzMl90KTsKLXR5cGVkZWYgY2hhciogSklUX09QRVJBVElPTiAoKlBfSklUT3BlcmF0aW9u X0VaKShFeGVjU3RhdGUqLCBpbnQzMl90KTsKIHR5cGVkZWYgY2hhciogSklUX09QRVJBVElPTiAo KlBfSklUT3BlcmF0aW9uX0VaWikoRXhlY1N0YXRlKiwgaW50MzJfdCwgaW50MzJfdCk7CiB0eXBl ZGVmIFN0cmluZ0ltcGwqIEpJVF9PUEVSQVRJT04gKCpJX0pJVE9wZXJhdGlvbl9FSnNzKShFeGVj U3RhdGUqLCBKU1N0cmluZyopOwogdHlwZWRlZiBKU1N0cmluZyogSklUX09QRVJBVElPTiAoKkpz c19KSVRPcGVyYXRpb25fRVopKEV4ZWNTdGF0ZSosIGludDMyX3QpOwpAQCAtMjQxLDcgKzI0Myw3 IEBAIHZvaWQgSklUX09QRVJBVElPTiBvcGVyYXRpb25UaHJvd1N0YXRpY0UKIHZvaWQgSklUX09Q RVJBVElPTiBvcGVyYXRpb25UaHJvdyhFeGVjU3RhdGUqLCBFbmNvZGVkSlNWYWx1ZSkgV1RGX0lO VEVSTkFMOwogdm9pZCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkRlYnVnKEV4ZWNTdGF0ZSosIGlu dDMyX3QpIFdURl9JTlRFUk5BTDsKICNpZiBFTkFCTEUoREZHX0pJVCkKLWNoYXIqIEpJVF9PUEVS QVRJT04gb3BlcmF0aW9uT3B0aW1pemUoRXhlY1N0YXRlKiwgaW50MzJfdCkgV1RGX0lOVEVSTkFM OworU2xvd1BhdGhSZXR1cm5UeXBlIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uT3B0aW1pemUoRXhl Y1N0YXRlKiwgaW50MzJfdCkgV1RGX0lOVEVSTkFMOwogI2VuZGlmCiB2b2lkIEpJVF9PUEVSQVRJ T04gb3BlcmF0aW9uUHV0QnlJbmRleChFeGVjU3RhdGUqLCBFbmNvZGVkSlNWYWx1ZSwgaW50MzJf dCwgRW5jb2RlZEpTVmFsdWUpOwogI2lmIFVTRShKU1ZBTFVFNjQpCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCShyZXZpc2lvbiAxNjA4MTYpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyMCw3 ICsxMjAsNyBAQCB0eXBlZGVmIE9wdGlvblJhbmdlIG9wdGlvblJhbmdlOwogICAgIHYoYm9vbCwg cmVwb3J0Q29tcGlsZVRpbWVzLCBmYWxzZSkgXAogICAgIHYoYm9vbCwgdmVyYm9zZUNGQSwgZmFs c2UpIFwKICAgICBcCi0gICAgdihib29sLCBlbmFibGVPU1JFbnRyeVRvREZHLCBmYWxzZSkgXAor ICAgIHYoYm9vbCwgZW5hYmxlT1NSRW50cnlUb0RGRywgdHJ1ZSkgXAogICAgIFwKICAgICB2KGJv b2wsIHVzZUV4cGVyaW1lbnRhbEZUTCwgZmFsc2UpIFwKICAgICB2KGJvb2wsIHVzZUZUTFRCQUEs IHRydWUpIFwK