126593 2014-01-07 13:40:53 -0800 --showDFGDisassembly=true shouldn't show baseline JIT stubs 2015-02-26 06:35:05 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver ossy sam oldest_to_newest 965140 0 fpizlo 2014-01-07 13:40:53 -0800 Patch forthcoming. 965142 1 220545 fpizlo 2014-01-07 13:42:05 -0800 Created attachment 220545 the patch 965146 2 fpizlo 2014-01-07 13:47:14 -0800 Landed on the branch in http://trac.webkit.org/changeset/161453 967603 3 mark.lam 2014-01-13 18:42:22 -0800 Review status updated in r161938: <http://trac.webkit.org/r161938>. 220545 2014-01-07 13:42:05 -0800 2014-01-09 00:01:38 -0800 the patch blah.patch text/plain 11577 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYxNDUyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBA CisyMDE0LTAxLTA3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg LS1zaG93REZHRGlzYXNzZW1ibHk9dHJ1ZSBzaG91bGRuJ3Qgc2hvdyBiYXNlbGluZSBKSVQgc3R1 YnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjU5 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYXNz ZW1ibGVyL0xpbmtCdWZmZXIuY3BwOgorICAgICAgICAoSlNDOjpzaG91bGRTaG93RGlzYXNzZW1i bHlGb3IpOgorICAgICAgICAqIGFzc2VtYmxlci9MaW5rQnVmZmVyLmg6CisgICAgICAgICogaml0 L0pJVFByb3BlcnR5QWNjZXNzLmNwcDoKKyAgICAgICAgKEpTQzo6SklUOjpwcml2YXRlQ29tcGls ZUdldEJ5VmFsKToKKyAgICAgICAgKEpTQzo6SklUOjpwcml2YXRlQ29tcGlsZVB1dEJ5VmFsKToK KyAgICAgICAgKiBqaXQvSklUU3R1YlJvdXRpbmUuaDoKKyAgICAgICAgKiBqaXQvUmVwYXRjaC5j cHA6CisgICAgICAgIChKU0M6OmdlbmVyYXRlUHJvdG9DaGFpbkFjY2Vzc1N0dWIpOgorICAgICAg ICAoSlNDOjp0cnlDYWNoZUdldEJ5SUQpOgorICAgICAgICAoSlNDOjp0cnlCdWlsZEdldEJ5SURM aXN0KToKKyAgICAgICAgKEpTQzo6ZW1pdFB1dFJlcGxhY2VTdHViKToKKyAgICAgICAgKEpTQzo6 ZW1pdFB1dFRyYW5zaXRpb25TdHViKToKKyAgICAgICAgKEpTQzo6dHJ5UmVwYXRjaEluKToKKyAg ICAgICAgKEpTQzo6bGlua0Nsb3N1cmVDYWxsKToKKwogMjAxNC0wMS0wNyAgRmlsaXAgUGl6bG8g IDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIE1lcmdlIHRydW5rIHIxNjE0MzguCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0xpbmtCdWZmZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTGlua0J1ZmZlci5jcHAJKHJl dmlzaW9uIDE2MTQ1MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTGlua0J1 ZmZlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0 IChDKSAyMDEyLCAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHly aWdodCAoQykgMjAxMiwgMjAxMywgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI4LDExICsyOCwyMCBAQAogCiAj aWYgRU5BQkxFKEFTU0VNQkxFUikKIAorI2luY2x1ZGUgIkNvZGVCbG9jay5oIgorI2luY2x1ZGUg IkpJVENvZGUuaCIKICNpbmNsdWRlICJPcHRpb25zLmgiCiAjaW5jbHVkZSA8d3RmL0NvbXBpbGF0 aW9uVGhyZWFkLmg+CiAKIG5hbWVzcGFjZSBKU0MgewogCitib29sIHNob3VsZFNob3dEaXNhc3Nl bWJseUZvcihDb2RlQmxvY2sqIGNvZGVCbG9jaykKK3sKKyAgICBpZiAoSklUQ29kZTo6aXNPcHRp bWl6aW5nSklUKGNvZGVCbG9jay0+aml0VHlwZSgpKSAmJiBPcHRpb25zOjpzaG93REZHRGlzYXNz ZW1ibHkoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIE9wdGlvbnM6OnNob3dE aXNhc3NlbWJseSgpOworfQorCiBMaW5rQnVmZmVyOjpDb2RlUmVmIExpbmtCdWZmZXI6OmZpbmFs aXplQ29kZVdpdGhvdXREaXNhc3NlbWJseSgpCiB7CiAgICAgcGVyZm9ybUZpbmFsaXphdGlvbigp OwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9MaW5rQnVmZmVyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9MaW5rQnVmZmVyLmgJ KHJldmlzaW9uIDE2MTQ1MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTGlu a0J1ZmZlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdo dCAoQykgMjAwOSwgMjAxMCwgMjAxMiwgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDksIDIwMTAsIDIwMTIsIDIwMTMsIDIwMTQgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z CkBAIC00Miw2ICs0Miw3IEBACiAKIG5hbWVzcGFjZSBKU0MgewogCitjbGFzcyBDb2RlQmxvY2s7 CiBjbGFzcyBWTTsKIAogLy8gTGlua0J1ZmZlcjoKQEAgLTMwMiw2ICszMDMsMTEgQEAgcHJpdmF0 ZToKICAgICAgPyAoKGxpbmtCdWZmZXJSZWZlcmVuY2UpLmZpbmFsaXplQ29kZVdpdGhEaXNhc3Nl bWJseSBkYXRhTG9nRkFyZ3VtZW50c0ZvckhlYWRpbmcpIFwKICAgICAgOiAobGlua0J1ZmZlclJl ZmVyZW5jZSkuZmluYWxpemVDb2RlV2l0aG91dERpc2Fzc2VtYmx5KCkpCiAKK2Jvb2wgc2hvdWxk U2hvd0Rpc2Fzc2VtYmx5Rm9yKENvZGVCbG9jayogY29kZUJsb2NrKTsKKworI2RlZmluZSBGSU5B TElaRV9DT0RFX0ZPUihjb2RlQmxvY2ssIGxpbmtCdWZmZXJSZWZlcmVuY2UsIGRhdGFMb2dGQXJn dW1lbnRzRm9ySGVhZGluZykgIFwKKyAgICBGSU5BTElaRV9DT0RFX0lGKHNob3VsZFNob3dEaXNh c3NlbWJseUZvcihjb2RlQmxvY2spLCBsaW5rQnVmZmVyUmVmZXJlbmNlLCBkYXRhTG9nRkFyZ3Vt ZW50c0ZvckhlYWRpbmcpCisKIC8vIFVzZSB0aGlzIHRvIGZpbmFsaXplIGNvZGUsIGxpa2Ugc286 CiAvLwogLy8gQ29kZVJlZiBjb2RlID0gRklOQUxJWkVfQ09ERShsaW5rQnVmZmVyLCAoIm15IHN1 cGVyIHRoaW5neSBudW1iZXIgJWQiLCBudW1iZXIpKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nlc3MuY3BwCShyZXZpc2lvbiAxNjE0NTIpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFByb3BlcnR5QWNjZXNzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDgsIDIwMDkg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA4LCAy MDA5LCAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucwpAQCAtOTc0LDcgKzk3NCw3IEBAIHZvaWQgSklUOjpwcml2YXRlQ29t cGlsZUdldEJ5VmFsKEJ5VmFsSW4KICAgICBwYXRjaEJ1ZmZlci5saW5rKGRvbmUsIGJ5VmFsSW5m by0+YmFkVHlwZUp1bXAubGFiZWxBdE9mZnNldChieVZhbEluZm8tPmJhZFR5cGVKdW1wVG9Eb25l KSk7CiAgICAgCiAgICAgYnlWYWxJbmZvLT5zdHViUm91dGluZSA9IEZJTkFMSVpFX0NPREVfRk9S X1NUVUIoCi0gICAgICAgIHBhdGNoQnVmZmVyLAorICAgICAgICBtX2NvZGVCbG9jaywgcGF0Y2hC dWZmZXIsCiAgICAgICAgICgiQmFzZWxpbmUgZ2V0X2J5X3ZhbCBzdHViIGZvciAlcywgcmV0dXJu IHBvaW50ICVwIiwgdG9DU3RyaW5nKCptX2NvZGVCbG9jaykuZGF0YSgpLCByZXR1cm5BZGRyZXNz LnZhbHVlKCkpKTsKICAgICAKICAgICBSZXBhdGNoQnVmZmVyIHJlcGF0Y2hCdWZmZXIobV9jb2Rl QmxvY2spOwpAQCAtMTAyMywxMiArMTAyMywxMiBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVQ dXRCeVZhbChCeVZhbEluCiAgICAgYm9vbCBpc0RpcmVjdCA9IG1faW50ZXJwcmV0ZXItPmdldE9w Y29kZUlEKGN1cnJlbnRJbnN0cnVjdGlvbi0+dS5vcGNvZGUpID09IG9wX3B1dF9ieV92YWxfZGly ZWN0OwogICAgIGlmICghaXNEaXJlY3QpIHsKICAgICAgICAgYnlWYWxJbmZvLT5zdHViUm91dGlu ZSA9IEZJTkFMSVpFX0NPREVfRk9SX1NUVUIoCi0gICAgICAgICAgICBwYXRjaEJ1ZmZlciwKKyAg ICAgICAgICAgIG1fY29kZUJsb2NrLCBwYXRjaEJ1ZmZlciwKICAgICAgICAgICAgICgiQmFzZWxp bmUgcHV0X2J5X3ZhbCBzdHViIGZvciAlcywgcmV0dXJuIHBvaW50ICVwIiwgdG9DU3RyaW5nKCpt X2NvZGVCbG9jaykuZGF0YSgpLCByZXR1cm5BZGRyZXNzLnZhbHVlKCkpKTsKICAgICAgICAgCiAg ICAgfSBlbHNlIHsKICAgICAgICAgYnlWYWxJbmZvLT5zdHViUm91dGluZSA9IEZJTkFMSVpFX0NP REVfRk9SX1NUVUIoCi0gICAgICAgICAgICBwYXRjaEJ1ZmZlciwKKyAgICAgICAgICAgIG1fY29k ZUJsb2NrLCBwYXRjaEJ1ZmZlciwKICAgICAgICAgICAgICgiQmFzZWxpbmUgcHV0X2J5X3ZhbF9k aXJlY3Qgc3R1YiBmb3IgJXMsIHJldHVybiBwb2ludCAlcCIsIHRvQ1N0cmluZygqbV9jb2RlQmxv Y2spLmRhdGEoKSwgcmV0dXJuQWRkcmVzcy52YWx1ZSgpKSk7CiAgICAgfQogICAgIFJlcGF0Y2hC dWZmZXIgcmVwYXRjaEJ1ZmZlcihtX2NvZGVCbG9jayk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVFN0dWJSb3V0aW5lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2ppdC9KSVRTdHViUm91dGluZS5oCShyZXZpc2lvbiAxNjE0NTIpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJSb3V0aW5lLmgJKHdvcmtpbmcgY29weSkKQEAgLTEs NSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEyIEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMiwgMjAxNCBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTE1MCwx MSArMTUwLDggQEAgcHJvdGVjdGVkOgogfTsKIAogLy8gSGVscGVyIGZvciB0aGUgY3JlYXRpb24g b2Ygc2ltcGxlIHN0dWIgcm91dGluZXMgdGhhdCBuZWVkIG5vIGhlbHAgZnJvbSB0aGUgR0MuCi0j ZGVmaW5lIEZJTkFMSVpFX0NPREVfRk9SX1NUVUIocGF0Y2hCdWZmZXIsIGRhdGFMb2dGQXJndW1l bnRzKSBcCi0gICAgKGFkb3B0UmVmKG5ldyBKSVRTdHViUm91dGluZShGSU5BTElaRV9DT0RFKChw YXRjaEJ1ZmZlciksIGRhdGFMb2dGQXJndW1lbnRzKSkpKQotCi0jZGVmaW5lIEZJTkFMSVpFX0NP REVfRk9SX0RGR19TVFVCKHBhdGNoQnVmZmVyLCBkYXRhTG9nRkFyZ3VtZW50cykgXAotICAgIChh ZG9wdFJlZihuZXcgSklUU3R1YlJvdXRpbmUoRklOQUxJWkVfREZHX0NPREUoKHBhdGNoQnVmZmVy KSwgZGF0YUxvZ0ZBcmd1bWVudHMpKSkpCisjZGVmaW5lIEZJTkFMSVpFX0NPREVfRk9SX1NUVUIo Y29kZUJsb2NrLCBwYXRjaEJ1ZmZlciwgZGF0YUxvZ0ZBcmd1bWVudHMpIFwKKyAgICAoYWRvcHRS ZWYobmV3IEpJVFN0dWJSb3V0aW5lKEZJTkFMSVpFX0NPREVfRk9SKChjb2RlQmxvY2spLCAocGF0 Y2hCdWZmZXIpLCBkYXRhTG9nRkFyZ3VtZW50cykpKSkKIAogfSAvLyBuYW1lc3BhY2UgSlNDCiAK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcAkocmV2aXNpb24gMTYxNDUy KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTIsIDIwMTMg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDExLCAy MDEyLCAyMDEzLCAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjc1LDkgKzI3NSw5IEBAIHN0YXRpYyB2b2lkIGdl bmVyYXRlUHJvdG9DaGFpbkFjY2Vzc1N0dWIKICAgICAKICAgICBsaW5rUmVzdG9yZVNjcmF0Y2go cGF0Y2hCdWZmZXIsIG5lZWRUb1Jlc3RvcmVTY3JhdGNoLCBzdWNjZXNzLCBmYWlsLCBmYWlsdXJl Q2FzZXMsIHN1Y2Nlc3NMYWJlbCwgc2xvd0Nhc2VMYWJlbCk7CiAgICAgCi0gICAgc3R1YlJvdXRp bmUgPSBGSU5BTElaRV9DT0RFX0ZPUl9ERkdfU1RVQigKLSAgICAgICAgcGF0Y2hCdWZmZXIsCi0g ICAgICAgICgiREZHIHByb3RvdHlwZSBjaGFpbiBhY2Nlc3Mgc3R1YiBmb3IgJXMsIHJldHVybiBw b2ludCAlcCIsCisgICAgc3R1YlJvdXRpbmUgPSBGSU5BTElaRV9DT0RFX0ZPUl9TVFVCKAorICAg ICAgICBleGVjLT5jb2RlQmxvY2soKSwgcGF0Y2hCdWZmZXIsCisgICAgICAgICgiUHJvdG90eXBl IGNoYWluIGFjY2VzcyBzdHViIGZvciAlcywgcmV0dXJuIHBvaW50ICVwIiwKICAgICAgICAgICAg IHRvQ1N0cmluZygqZXhlYy0+Y29kZUJsb2NrKCkpLmRhdGEoKSwgc3VjY2Vzc0xhYmVsLmV4ZWN1 dGFibGVBZGRyZXNzKCkpKTsKIH0KIApAQCAtMzM2LDkgKzMzNiw5IEBAIHN0YXRpYyBib29sIHRy eUNhY2hlR2V0QnlJRChFeGVjU3RhdGUqIGUKICAgICAgICAgCiAgICAgICAgIGxpbmtSZXN0b3Jl U2NyYXRjaChwYXRjaEJ1ZmZlciwgbmVlZFRvUmVzdG9yZVNjcmF0Y2gsIHN0dWJJbmZvLCBzdWNj ZXNzLCBmYWlsLCBmYWlsdXJlQ2FzZXMpOwogICAgICAgICAKLSAgICAgICAgc3R1YkluZm8uc3R1 YlJvdXRpbmUgPSBGSU5BTElaRV9DT0RFX0ZPUl9ERkdfU1RVQigKLSAgICAgICAgICAgIHBhdGNo QnVmZmVyLAotICAgICAgICAgICAgKCJERkcgR2V0QnlJZCBhcnJheSBsZW5ndGggc3R1YiBmb3Ig JXMsIHJldHVybiBwb2ludCAlcCIsCisgICAgICAgIHN0dWJJbmZvLnN0dWJSb3V0aW5lID0gRklO QUxJWkVfQ09ERV9GT1JfU1RVQigKKyAgICAgICAgICAgIGV4ZWMtPmNvZGVCbG9jaygpLCBwYXRj aEJ1ZmZlciwKKyAgICAgICAgICAgICgiR2V0QnlJZCBhcnJheSBsZW5ndGggc3R1YiBmb3IgJXMs IHJldHVybiBwb2ludCAlcCIsCiAgICAgICAgICAgICAgICAgdG9DU3RyaW5nKCpleGVjLT5jb2Rl QmxvY2soKSkuZGF0YSgpLCBzdHViSW5mby5jYWxsUmV0dXJuTG9jYXRpb24ubGFiZWxBdE9mZnNl dCgKICAgICAgICAgICAgICAgICAgICAgc3R1YkluZm8ucGF0Y2guZGVsdGFDYWxsVG9Eb25lKS5l eGVjdXRhYmxlQWRkcmVzcygpKSk7CiAgICAgICAgIApAQCAtNTk5LDkgKzU5OSw5IEBAIHN0YXRp YyBib29sIHRyeUJ1aWxkR2V0QnlJRExpc3QoRXhlY1N0YXQKICAgICAgICAgCiAgICAgICAgIFJl ZlB0cjxKSVRTdHViUm91dGluZT4gc3R1YlJvdXRpbmUgPQogICAgICAgICAgICAgY3JlYXRlSklU U3R1YlJvdXRpbmUoCi0gICAgICAgICAgICAgICAgRklOQUxJWkVfREZHX0NPREUoCi0gICAgICAg ICAgICAgICAgICAgIHBhdGNoQnVmZmVyLAotICAgICAgICAgICAgICAgICAgICAoIkRGRyBHZXRC eUlkIHBvbHltb3JwaGljIGxpc3QgYWNjZXNzIGZvciAlcywgcmV0dXJuIHBvaW50ICVwIiwKKyAg ICAgICAgICAgICAgICBGSU5BTElaRV9DT0RFX0ZPUigKKyAgICAgICAgICAgICAgICAgICAgZXhl Yy0+Y29kZUJsb2NrKCksIHBhdGNoQnVmZmVyLAorICAgICAgICAgICAgICAgICAgICAoIkdldEJ5 SWQgcG9seW1vcnBoaWMgbGlzdCBhY2Nlc3MgZm9yICVzLCByZXR1cm4gcG9pbnQgJXAiLAogICAg ICAgICAgICAgICAgICAgICAgICAgdG9DU3RyaW5nKCpleGVjLT5jb2RlQmxvY2soKSkuZGF0YSgp LCBzdHViSW5mby5jYWxsUmV0dXJuTG9jYXRpb24ubGFiZWxBdE9mZnNldCgKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzdHViSW5mby5wYXRjaC5kZWx0YUNhbGxUb0RvbmUpLmV4ZWN1dGFi bGVBZGRyZXNzKCkpKSwKICAgICAgICAgICAgICAgICAqdm0sCkBAIC03NjksOSArNzY5LDkgQEAg c3RhdGljIHZvaWQgZW1pdFB1dFJlcGxhY2VTdHViKAogICAgIHBhdGNoQnVmZmVyLmxpbmsoc3Vj Y2Vzcywgc3R1YkluZm8uY2FsbFJldHVybkxvY2F0aW9uLmxhYmVsQXRPZmZzZXQoc3R1YkluZm8u cGF0Y2guZGVsdGFDYWxsVG9Eb25lKSk7CiAgICAgcGF0Y2hCdWZmZXIubGluayhmYWlsdXJlLCBm YWlsdXJlTGFiZWwpOwogICAgICAgICAgICAgCi0gICAgc3R1YlJvdXRpbmUgPSBGSU5BTElaRV9D T0RFX0ZPUl9ERkdfU1RVQigKLSAgICAgICAgcGF0Y2hCdWZmZXIsCi0gICAgICAgICgiREZHIFB1 dEJ5SWQgcmVwbGFjZSBzdHViIGZvciAlcywgcmV0dXJuIHBvaW50ICVwIiwKKyAgICBzdHViUm91 dGluZSA9IEZJTkFMSVpFX0NPREVfRk9SX1NUVUIoCisgICAgICAgIGV4ZWMtPmNvZGVCbG9jaygp LCBwYXRjaEJ1ZmZlciwKKyAgICAgICAgKCJQdXRCeUlkIHJlcGxhY2Ugc3R1YiBmb3IgJXMsIHJl dHVybiBwb2ludCAlcCIsCiAgICAgICAgICAgICB0b0NTdHJpbmcoKmV4ZWMtPmNvZGVCbG9jaygp KS5kYXRhKCksIHN0dWJJbmZvLmNhbGxSZXR1cm5Mb2NhdGlvbi5sYWJlbEF0T2Zmc2V0KAogICAg ICAgICAgICAgICAgIHN0dWJJbmZvLnBhdGNoLmRlbHRhQ2FsbFRvRG9uZSkuZXhlY3V0YWJsZUFk ZHJlc3MoKSkpOwogfQpAQCAtOTY5LDkgKzk2OSw5IEBAIHN0YXRpYyB2b2lkIGVtaXRQdXRUcmFu c2l0aW9uU3R1YigKICAgICAKICAgICBzdHViUm91dGluZSA9CiAgICAgICAgIGNyZWF0ZUpJVFN0 dWJSb3V0aW5lKAotICAgICAgICAgICAgRklOQUxJWkVfREZHX0NPREUoCi0gICAgICAgICAgICAg ICAgcGF0Y2hCdWZmZXIsCi0gICAgICAgICAgICAgICAgKCJERkcgUHV0QnlJZCAlc3RyYW5zaXRp b24gc3R1YiAoJXAgLT4gJXApIGZvciAlcywgcmV0dXJuIHBvaW50ICVwIiwKKyAgICAgICAgICAg IEZJTkFMSVpFX0NPREVfRk9SKAorICAgICAgICAgICAgICAgIGV4ZWMtPmNvZGVCbG9jaygpLCBw YXRjaEJ1ZmZlciwKKyAgICAgICAgICAgICAgICAoIlB1dEJ5SWQgJXN0cmFuc2l0aW9uIHN0dWIg KCVwIC0+ICVwKSBmb3IgJXMsIHJldHVybiBwb2ludCAlcCIsCiAgICAgICAgICAgICAgICAgICAg IHN0cnVjdHVyZS0+b3V0T2ZMaW5lQ2FwYWNpdHkoKSAhPSBvbGRTdHJ1Y3R1cmUtPm91dE9mTGlu ZUNhcGFjaXR5KCkgPyAicmVhbGxvY2F0aW5nICIgOiAiIiwKICAgICAgICAgICAgICAgICAgICAg b2xkU3RydWN0dXJlLCBzdHJ1Y3R1cmUsCiAgICAgICAgICAgICAgICAgICAgIHRvQ1N0cmluZygq ZXhlYy0+Y29kZUJsb2NrKCkpLmRhdGEoKSwgc3R1YkluZm8uY2FsbFJldHVybkxvY2F0aW9uLmxh YmVsQXRPZmZzZXQoCkBAIC0xMjQ1LDkgKzEyNDUsOSBAQCBzdGF0aWMgYm9vbCB0cnlSZXBhdGNo SW4oCiAKICAgICAgICAgbGlua1Jlc3RvcmVTY3JhdGNoKHBhdGNoQnVmZmVyLCBuZWVkVG9SZXN0 b3JlU2NyYXRjaCwgc3VjY2VzcywgZmFpbCwgZmFpbHVyZUNhc2VzLCBzdWNjZXNzTGFiZWwsIHNs b3dDYXNlTGFiZWwpOwogICAgICAgICAKLSAgICAgICAgc3R1YlJvdXRpbmUgPSBGSU5BTElaRV9D T0RFX0ZPUl9ERkdfU1RVQigKLSAgICAgICAgICAgIHBhdGNoQnVmZmVyLAotICAgICAgICAgICAg KCJERkcgSW4gKGZvdW5kID0gJXMpIHN0dWIgZm9yICVzLCByZXR1cm4gcG9pbnQgJXAiLAorICAg ICAgICBzdHViUm91dGluZSA9IEZJTkFMSVpFX0NPREVfRk9SX1NUVUIoCisgICAgICAgICAgICBl eGVjLT5jb2RlQmxvY2soKSwgcGF0Y2hCdWZmZXIsCisgICAgICAgICAgICAoIkluIChmb3VuZCA9 ICVzKSBzdHViIGZvciAlcywgcmV0dXJuIHBvaW50ICVwIiwKICAgICAgICAgICAgICAgICB3YXNG b3VuZCA/ICJ5ZXMiIDogIm5vIiwgdG9DU3RyaW5nKCpleGVjLT5jb2RlQmxvY2soKSkuZGF0YSgp LAogICAgICAgICAgICAgICAgIHN1Y2Nlc3NMYWJlbC5leGVjdXRhYmxlQWRkcmVzcygpKSk7CiAg ICAgfQpAQCAtMTQxMCw5ICsxNDEwLDkgQEAgdm9pZCBsaW5rQ2xvc3VyZUNhbGwoCiAgICAgcGF0 Y2hCdWZmZXIubGluayhzbG93LCBDb2RlTG9jYXRpb25MYWJlbCh2bS0+Z2V0Q1RJU3R1Yih2aXJ0 dWFsVGh1bmtHZW5lcmF0b3JGb3IoQ29kZUZvckNhbGwsIHJlZ2lzdGVycykpLmNvZGUoKSkpOwog ICAgIAogICAgIFJlZlB0cjxDbG9zdXJlQ2FsbFN0dWJSb3V0aW5lPiBzdHViUm91dGluZSA9IGFk b3B0UmVmKG5ldyBDbG9zdXJlQ2FsbFN0dWJSb3V0aW5lKAotICAgICAgICBGSU5BTElaRV9ERkdf Q09ERSgKLSAgICAgICAgICAgIHBhdGNoQnVmZmVyLAotICAgICAgICAgICAgKCJERkcgY2xvc3Vy ZSBjYWxsIHN0dWIgZm9yICVzLCByZXR1cm4gcG9pbnQgJXAsIHRhcmdldCAlcCAoJXMpIiwKKyAg ICAgICAgRklOQUxJWkVfQ09ERV9GT1IoCisgICAgICAgICAgICBjYWxsZXJDb2RlQmxvY2ssIHBh dGNoQnVmZmVyLAorICAgICAgICAgICAgKCJDbG9zdXJlIGNhbGwgc3R1YiBmb3IgJXMsIHJldHVy biBwb2ludCAlcCwgdGFyZ2V0ICVwICglcykiLAogICAgICAgICAgICAgICAgIHRvQ1N0cmluZygq Y2FsbGVyQ29kZUJsb2NrKS5kYXRhKCksIGNhbGxMaW5rSW5mby5jYWxsUmV0dXJuTG9jYXRpb24u bGFiZWxBdE9mZnNldCgwKS5leGVjdXRhYmxlQWRkcmVzcygpLAogICAgICAgICAgICAgICAgIGNv ZGVQdHIuZXhlY3V0YWJsZUFkZHJlc3MoKSwgdG9DU3RyaW5nKHBvaW50ZXJEdW1wKGNhbGxlZUNv ZGVCbG9jaykpLmRhdGEoKSkpLAogICAgICAgICAqdm0sIGNhbGxlckNvZGVCbG9jay0+b3duZXJF eGVjdXRhYmxlKCksIHN0cnVjdHVyZSwgZXhlY3V0YWJsZSwgY2FsbExpbmtJbmZvLmNvZGVPcmln aW4pKTsK