151451 2015-11-19 11:41:11 -0800 FTL->B3 lowering should support checked int math 2015-11-19 12:03:40 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 151428 1 fpizlo fpizlo commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1143357 0 fpizlo 2015-11-19 11:41:11 -0800 Patch forthcoming. 1143358 1 265875 fpizlo 2015-11-19 11:43:28 -0800 Created attachment 265875 the patch 1143359 2 commit-queue 2015-11-19 11:46:08 -0800 Attachment 265875 did not pass style-queue: ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:9113: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1143370 3 265875 saam 2015-11-19 12:00:54 -0800 Comment on attachment 265875 the patch r=me 1143371 4 fpizlo 2015-11-19 12:03:40 -0800 Landed in http://trac.webkit.org/changeset/192649 265875 2015-11-19 11:43:28 -0800 2015-11-19 12:00:54 -0800 the patch blah.patch text/plain 15795 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkyNjQxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ5IEBA CisyMDE1LTExLTE5ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg RlRMLT5CMyBsb3dlcmluZyBzaG91bGQgc3VwcG9ydCBjaGVja2VkIGludCBtYXRoCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTE0NTEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIGxvd2VyaW5nIG9m IEFyaXRoQWRkL1N1Yi9NdWwgdG8gQ2hlY2tBZGQvU3ViL011bC4gSW5jbHVkZXMgYSBuaWNlIHJl ZmFjdG9yaW5nIG9mIHRoZSBPU1IgZXhpdAorICAgICAgICBjb2RlIHRoYXQgbWFkZSB0aGlzIGEg bG90IGVhc2llci4gQWxzbyBuZWVkZWQgdG8gaW1wbGVtZW50IGEgZmV3IG90aGVyIG9wcyBpbiBG VEw6Ok91dHB1dC4KKworICAgICAgICBJIGVuZGVkIHVwIHJlbmFtaW5nICJjaGVjayIgdG8gInNw ZWN1bGF0ZSIgaW4gRlRMOjpPdXRwdXQsIGJlY2F1c2UgaXQgYWxyZWFkeSBoYWQgYSB0aGluZyBj YWxsZWQKKyAgICAgICAgImNoZWNrIi4gVGhlIEZUTCB0ZXJtaW5vbG9neSBmb3Igc2lkZS1leGl0 IGlzICJzcGVjdWxhdGUiLCBzbyBJIHRoaW5rIHRoYXQgdGhpcyBpcyBhcHByb3ByaWF0ZS4KKwor ICAgICAgICAqIGZ0bC9GVExCM091dHB1dC5oOgorICAgICAgICAoSlNDOjpGVEw6Ok91dHB1dDo6 c2Vuc2libGVEb3VibGVUb0ludCk6CisgICAgICAgIChKU0M6OkZUTDo6T3V0cHV0OjpzaWduRXh0 KToKKyAgICAgICAgKEpTQzo6RlRMOjpPdXRwdXQ6Onplcm9FeHQpOgorICAgICAgICAoSlNDOjpG VEw6Ok91dHB1dDo6emVyb0V4dFB0cik6CisgICAgICAgIChKU0M6OkZUTDo6T3V0cHV0OjpmcFRv SW50KToKKyAgICAgICAgKEpTQzo6RlRMOjpPdXRwdXQ6OmZwVG9VSW50KToKKyAgICAgICAgKEpT Qzo6RlRMOjpPdXRwdXQ6OnVuc2lnbmVkVG9GUCk6CisgICAgICAgIChKU0M6OkZUTDo6T3V0cHV0 Ojp1bnNpZ25lZFRvRG91YmxlKToKKyAgICAgICAgKEpTQzo6RlRMOjpPdXRwdXQ6OmludENhc3Qp OgorICAgICAgICAoSlNDOjpGVEw6Ok91dHB1dDo6Y2FzdFRvSW50MzIpOgorICAgICAgICAoSlND OjpGVEw6Ok91dHB1dDo6ZnBDYXN0KToKKyAgICAgICAgKEpTQzo6RlRMOjpPdXRwdXQ6OmludFRv UHRyKToKKyAgICAgICAgKEpTQzo6RlRMOjpPdXRwdXQ6OnB0clRvSW50KToKKyAgICAgICAgKEpT Qzo6RlRMOjpPdXRwdXQ6OnVucmVhY2hhYmxlKToKKyAgICAgICAgKEpTQzo6RlRMOjpPdXRwdXQ6 OnNwZWN1bGF0ZSk6CisgICAgICAgIChKU0M6OkZUTDo6T3V0cHV0OjpzcGVjdWxhdGVBZGQpOgor ICAgICAgICAoSlNDOjpGVEw6Ok91dHB1dDo6c3BlY3VsYXRlU3ViKToKKyAgICAgICAgKEpTQzo6 RlRMOjpPdXRwdXQ6OnNwZWN1bGF0ZU11bCk6CisgICAgICAgIChKU0M6OkZUTDo6T3V0cHV0Ojp0 cmFwKToKKyAgICAgICAgKEpTQzo6RlRMOjpPdXRwdXQ6OmNoZWNrKTogRGVsZXRlZC4KKyAgICAg ICAgKiBmdGwvRlRMSklURmluYWxpemVyLmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjpKSVRGaW5h bGl6ZXI6OmZpbmFsaXplRnVuY3Rpb24pOgorICAgICAgICAqIGZ0bC9GVExMb3dlckRGR1RvTExW TS5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvTExWTTo6Y29tcGlsZUFy aXRoQWRkT3JTdWIpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdUb0xMVk06OmNv bXBpbGVBcml0aE11bCk6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvTExWTTo6 Y29tcGlsZUludmFsaWRhdGlvblBvaW50KToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2Vy REZHVG9MTFZNOjphcHBlbmRPU1JFeGl0QXJndW1lbnRzRm9yUGF0Y2hwb2ludElmV2lsbENhdGNo RXhjZXB0aW9uKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9MTFZNOjphcHBl bmRPU1JFeGl0KToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9MTFZNOjpibGVz c1NwZWN1bGF0aW9uKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9MTFZNOjpl bWl0T1NSRXhpdENhbGwpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdUb0xMVk06 OmJ1aWxkRXhpdEFyZ3VtZW50cyk6CisKIDIwMTUtMTEtMTkgIE1hcmsgTGFtICA8bWFyay5sYW1A YXBwbGUuY29tPgogCiAgICAgICAgIEpJVCBzbmlwcGV0IGdlbmVyYXRvciBKdW1wTGlzdHMgc2hv dWxkIGJlIHJldHVybmVkIGFzIHJlZmVyZW5jZXMuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZnRsL0ZUTEIzT3V0cHV0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2Z0bC9GVExCM091dHB1dC5oCShyZXZpc2lvbiAxOTI2MzgpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZnRsL0ZUTEIzT3V0cHV0LmgJKHdvcmtpbmcgY29weSkKQEAgLTE3NCw3ICsxNzQsNyBA QCBwdWJsaWM6CiAgICAgTFZhbHVlIHNlbnNpYmxlRG91YmxlVG9JbnQoTFZhbHVlKSB7IENSQVNI KCk7IH0KIAogICAgIExWYWx1ZSBzaWduRXh0KExWYWx1ZSB2YWx1ZSwgTFR5cGUgdHlwZSkgeyBD UkFTSCgpOyB9Ci0gICAgTFZhbHVlIHplcm9FeHQoTFZhbHVlIHZhbHVlLCBMVHlwZSB0eXBlKSB7 IENSQVNIKCk7IH0KKyAgICBMVmFsdWUgemVyb0V4dChMVmFsdWUgdmFsdWUsIExUeXBlIHR5cGUp IHsgcmV0dXJuIG1fYmxvY2stPmFwcGVuZE5ldzxCMzo6VmFsdWU+KG1fcHJvYywgQjM6OlpFeHQz MiwgdHlwZSwgb3JpZ2luKCksIHZhbHVlKTsgfQogICAgIExWYWx1ZSB6ZXJvRXh0UHRyKExWYWx1 ZSB2YWx1ZSkgeyBDUkFTSCgpOyB9CiAgICAgTFZhbHVlIGZwVG9JbnQoTFZhbHVlIHZhbHVlLCBM VHlwZSB0eXBlKSB7IENSQVNIKCk7IH0KICAgICBMVmFsdWUgZnBUb1VJbnQoTFZhbHVlIHZhbHVl LCBMVHlwZSB0eXBlKSB7IENSQVNIKCk7IH0KQEAgLTE4NSw3ICsxODUsNyBAQCBwdWJsaWM6CiAg ICAgTFZhbHVlIHVuc2lnbmVkVG9GUChMVmFsdWUgdmFsdWUsIExUeXBlIHR5cGUpIHsgQ1JBU0go KTsgfQogICAgIExWYWx1ZSB1bnNpZ25lZFRvRG91YmxlKExWYWx1ZSB2YWx1ZSkgeyBDUkFTSCgp OyB9CiAgICAgTFZhbHVlIGludENhc3QoTFZhbHVlIHZhbHVlLCBMVHlwZSB0eXBlKSB7IENSQVNI KCk7IH0KLSAgICBMVmFsdWUgY2FzdFRvSW50MzIoTFZhbHVlIHZhbHVlKSB7IENSQVNIKCk7IH0K KyAgICBMVmFsdWUgY2FzdFRvSW50MzIoTFZhbHVlIHZhbHVlKSB7IHJldHVybiBtX2Jsb2NrLT5h cHBlbmROZXc8QjM6OlZhbHVlPihtX3Byb2MsIEIzOjpUcnVuYywgb3JpZ2luKCksIHZhbHVlKTsg fQogICAgIExWYWx1ZSBmcENhc3QoTFZhbHVlIHZhbHVlLCBMVHlwZSB0eXBlKSB7IENSQVNIKCk7 IH0KICAgICBMVmFsdWUgaW50VG9QdHIoTFZhbHVlIHZhbHVlLCBMVHlwZSB0eXBlKSB7IENSQVNI KCk7IH0KICAgICBMVmFsdWUgcHRyVG9JbnQoTFZhbHVlIHZhbHVlLCBMVHlwZSB0eXBlKSB7IENS QVNIKCk7IH0KQEAgLTM1MCwxMiArMzUwLDM4IEBAIHB1YmxpYzoKICAgICB2b2lkIHVucmVhY2hh YmxlKCkgeyBtX2Jsb2NrLT5hcHBlbmROZXc8QjM6OkNvbnRyb2xWYWx1ZT4obV9wcm9jLCBCMzo6 T29wcywgb3JpZ2luKCkpOyB9CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jdG9yPgotICAg IHZvaWQgY2hlY2soTFZhbHVlIHZhbHVlLCBjb25zdCBTdGFja21hcEFyZ3VtZW50TGlzdCYgYXJn dW1lbnRzLCBjb25zdCBGdW5jdG9yJiBmdW5jdG9yKQorICAgIHZvaWQgc3BlY3VsYXRlKExWYWx1 ZSB2YWx1ZSwgY29uc3QgU3RhY2ttYXBBcmd1bWVudExpc3QmIGFyZ3VtZW50cywgY29uc3QgRnVu Y3RvciYgZnVuY3RvcikKICAgICB7Ci0gICAgICAgIEIzOjpDaGVja1ZhbHVlKiBjaGVjayA9IG1f YmxvY2stPmFwcGVuZE5ldzxCMzo6Q2hlY2tWYWx1ZT4obV9wcm9jLCBCMzo6Q2hlY2ssIG9yaWdp bigpLCB2YWx1ZSk7CisgICAgICAgIEIzOjpDaGVja1ZhbHVlKiBjaGVjayA9IHNwZWN1bGF0ZSh2 YWx1ZSwgYXJndW1lbnRzKTsKKyAgICAgICAgY2hlY2stPnNldEdlbmVyYXRvcihmdW5jdG9yKTsK KyAgICB9CisKKyAgICBCMzo6Q2hlY2tWYWx1ZSogc3BlY3VsYXRlKExWYWx1ZSB2YWx1ZSwgY29u c3QgU3RhY2ttYXBBcmd1bWVudExpc3QmIGFyZ3VtZW50cykKKyAgICB7CisgICAgICAgIEIzOjpD aGVja1ZhbHVlKiBjaGVjayA9IHNwZWN1bGF0ZSh2YWx1ZSk7CiAgICAgICAgIGZvciAoTFZhbHVl IHZhbHVlIDogYXJndW1lbnRzKQogICAgICAgICAgICAgY2hlY2stPmFwcGVuZChCMzo6Q29uc3Ry YWluZWRWYWx1ZSh2YWx1ZSkpOwotICAgICAgICBjaGVjay0+c2V0R2VuZXJhdG9yKGZ1bmN0b3Ip OworICAgICAgICByZXR1cm4gY2hlY2s7CisgICAgfQorCisgICAgQjM6OkNoZWNrVmFsdWUqIHNw ZWN1bGF0ZShMVmFsdWUgdmFsdWUpCisgICAgeworICAgICAgICByZXR1cm4gbV9ibG9jay0+YXBw ZW5kTmV3PEIzOjpDaGVja1ZhbHVlPihtX3Byb2MsIEIzOjpDaGVjaywgb3JpZ2luKCksIHZhbHVl KTsKKyAgICB9CisKKyAgICBCMzo6Q2hlY2tWYWx1ZSogc3BlY3VsYXRlQWRkKExWYWx1ZSBsZWZ0 LCBMVmFsdWUgcmlnaHQpCisgICAgeworICAgICAgICByZXR1cm4gbV9ibG9jay0+YXBwZW5kTmV3 PEIzOjpDaGVja1ZhbHVlPihtX3Byb2MsIEIzOjpDaGVja0FkZCwgb3JpZ2luKCksIGxlZnQsIHJp Z2h0KTsKKyAgICB9CisKKyAgICBCMzo6Q2hlY2tWYWx1ZSogc3BlY3VsYXRlU3ViKExWYWx1ZSBs ZWZ0LCBMVmFsdWUgcmlnaHQpCisgICAgeworICAgICAgICByZXR1cm4gbV9ibG9jay0+YXBwZW5k TmV3PEIzOjpDaGVja1ZhbHVlPihtX3Byb2MsIEIzOjpDaGVja1N1Yiwgb3JpZ2luKCksIGxlZnQs IHJpZ2h0KTsKKyAgICB9CisKKyAgICBCMzo6Q2hlY2tWYWx1ZSogc3BlY3VsYXRlTXVsKExWYWx1 ZSBsZWZ0LCBMVmFsdWUgcmlnaHQpCisgICAgeworICAgICAgICByZXR1cm4gbV9ibG9jay0+YXBw ZW5kTmV3PEIzOjpDaGVja1ZhbHVlPihtX3Byb2MsIEIzOjpDaGVja011bCwgb3JpZ2luKCksIGxl ZnQsIHJpZ2h0KTsKICAgICB9CiAKICAgICB2b2lkIHRyYXAoKSB7IENSQVNIKCk7IH0KSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMSklURmluYWxpemVyLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTEpJVEZpbmFsaXplci5jcHAJKHJldmlz aW9uIDE5MjYzOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMSklURmluYWxpemVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAogCiAjaW5jbHVkZSAiQ29kZUJs b2NrV2l0aEpJVFR5cGUuaCIKICNpbmNsdWRlICJERkdQbGFuLmgiCisjaW5jbHVkZSAiRlRMU3Rh dGUuaCIKICNpbmNsdWRlICJGVExUaHVua3MuaCIKICNpbmNsdWRlICJQcm9maWxlckRhdGFiYXNl LmgiCiAKQEAgLTc4LDYgKzc5LDggQEAgYm9vbCBKSVRGaW5hbGl6ZXI6OmZpbmFsaXplKCkKIAog Ym9vbCBKSVRGaW5hbGl6ZXI6OmZpbmFsaXplRnVuY3Rpb24oKQogeworICAgIGJvb2wgZHVtcERp c2Fzc2VtYmx5ID0gc2hvdWxkRHVtcERpc2Fzc2VtYmx5KCkgfHwgT3B0aW9uczo6YXN5bmNEaXNh c3NlbWJseSgpOworICAgIAogI2lmIEZUTF9VU0VTX0IzCiAgICAgZm9yIChPU1JFeGl0Q29tcGls YXRpb25JbmZvJiBpbmZvIDogb3NyRXhpdCkgewogICAgICAgICBiM0NvZGVMaW5rQnVmZmVyLT5s aW5rKApAQCAtODcsOCArOTAsOCBAQCBib29sIEpJVEZpbmFsaXplcjo6ZmluYWxpemVGdW5jdGlv bigpCiAgICAgfQogICAgIAogICAgIGppdENvZGUtPmluaXRpYWxpemVCM0NvZGUoCi0gICAgICAg IEZJTkFMSVpFX0RGR19DT0RFKAotICAgICAgICAgICAgKmIzQ29kZUxpbmtCdWZmZXIsCisgICAg ICAgIEZJTkFMSVpFX0NPREVfSUYoCisgICAgICAgICAgICBkdW1wRGlzYXNzZW1ibHksICpiM0Nv ZGVMaW5rQnVmZmVyLAogICAgICAgICAgICAgKCJGVEwgQjMgY29kZSBmb3IgJXMiLCB0b0NTdHJp bmcoQ29kZUJsb2NrV2l0aEpJVFR5cGUobV9wbGFuLmNvZGVCbG9jaywgSklUQ29kZTo6RlRMSklU KSkuZGF0YSgpKSkpOwogCiAjZWxzZSAvLyBGVExfVVNFU19CMwpAQCAtMTA3LDggKzExMCw4IEBA IGJvb2wgSklURmluYWxpemVyOjpmaW5hbGl6ZUZ1bmN0aW9uKCkKICAgICAgICAgfQogICAgICAg ICAKICAgICAgICAgaml0Q29kZS0+aW5pdGlhbGl6ZUV4aXRUaHVua3MoCi0gICAgICAgICAgICBG SU5BTElaRV9ERkdfQ09ERSgKLSAgICAgICAgICAgICAgICAqZXhpdFRodW5rc0xpbmtCdWZmZXIs CisgICAgICAgICAgICBGSU5BTElaRV9DT0RFX0lGKAorICAgICAgICAgICAgICAgIGR1bXBEaXNh c3NlbWJseSwgKmV4aXRUaHVua3NMaW5rQnVmZmVyLAogICAgICAgICAgICAgICAgICgiRlRMIGV4 aXQgdGh1bmtzIGZvciAlcyIsIHRvQ1N0cmluZyhDb2RlQmxvY2tXaXRoSklUVHlwZShtX3BsYW4u Y29kZUJsb2NrLCBKSVRDb2RlOjpGVExKSVQpKS5kYXRhKCkpKSk7CiAgICAgfSAvLyBlbHNlIHRo aXMgZnVuY3Rpb24gaGFkIG5vIE9TUiBleGl0cywgc28gbm8gZXhpdCB0aHVua3MuCiAgICAgCkBA IC0xMjMsMzEgKzEyNiwzMSBAQCBib29sIEpJVEZpbmFsaXplcjo6ZmluYWxpemVGdW5jdGlvbigp CiAgICAgICAgICAgICAgICAgICAgIG1fcGxhbi52bS5nZXRDVElTdHViKGxhenlTbG93UGF0aEdl bmVyYXRpb25UaHVua0dlbmVyYXRvcikuY29kZSgpKSk7CiAgICAgICAgIH0KICAgICAgICAgCi0g ICAgICAgIGppdENvZGUtPmFkZEhhbmRsZShGSU5BTElaRV9ERkdfQ09ERSgKLSAgICAgICAgICAg ICpzaWRlQ29kZUxpbmtCdWZmZXIsCisgICAgICAgIGppdENvZGUtPmFkZEhhbmRsZShGSU5BTEla RV9DT0RFX0lGKAorICAgICAgICAgICAgZHVtcERpc2Fzc2VtYmx5LCAqc2lkZUNvZGVMaW5rQnVm ZmVyLAogICAgICAgICAgICAgKCJGVEwgc2lkZSBjb2RlIGZvciAlcyIsCiAgICAgICAgICAgICAg ICAgdG9DU3RyaW5nKENvZGVCbG9ja1dpdGhKSVRUeXBlKG1fcGxhbi5jb2RlQmxvY2ssIEpJVENv ZGU6OkZUTEpJVCkpLmRhdGEoKSkpCiAgICAgICAgICAgICAuZXhlY3V0YWJsZU1lbW9yeSgpKTsK ICAgICB9CiAgICAgCiAgICAgaWYgKGhhbmRsZUV4Y2VwdGlvbnNMaW5rQnVmZmVyKSB7Ci0gICAg ICAgIGppdENvZGUtPmFkZEhhbmRsZShGSU5BTElaRV9ERkdfQ09ERSgKLSAgICAgICAgICAgICpo YW5kbGVFeGNlcHRpb25zTGlua0J1ZmZlciwKKyAgICAgICAgaml0Q29kZS0+YWRkSGFuZGxlKEZJ TkFMSVpFX0NPREVfSUYoCisgICAgICAgICAgICBkdW1wRGlzYXNzZW1ibHksICpoYW5kbGVFeGNl cHRpb25zTGlua0J1ZmZlciwKICAgICAgICAgICAgICgiRlRMIGV4Y2VwdGlvbiBoYW5kbGVyIGZv ciAlcyIsCiAgICAgICAgICAgICAgICAgdG9DU3RyaW5nKENvZGVCbG9ja1dpdGhKSVRUeXBlKG1f cGxhbi5jb2RlQmxvY2ssIEpJVENvZGU6OkZUTEpJVCkpLmRhdGEoKSkpCiAgICAgICAgICAgICAu ZXhlY3V0YWJsZU1lbW9yeSgpKTsKICAgICB9CiAKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgb3V0T2ZMaW5lQ29kZUluZm9zLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIGppdENvZGUtPmFk ZEhhbmRsZShGSU5BTElaRV9ERkdfQ09ERSgKLSAgICAgICAgICAgICpvdXRPZkxpbmVDb2RlSW5m b3NbaV0ubV9saW5rQnVmZmVyLAorICAgICAgICBqaXRDb2RlLT5hZGRIYW5kbGUoRklOQUxJWkVf Q09ERV9JRigKKyAgICAgICAgICAgIGR1bXBEaXNhc3NlbWJseSwgKm91dE9mTGluZUNvZGVJbmZv c1tpXS5tX2xpbmtCdWZmZXIsCiAgICAgICAgICAgICAoIkZUTCBvdXQgb2YgbGluZSBjb2RlIGZv ciAlcyIsIG91dE9mTGluZUNvZGVJbmZvc1tpXS5tX2NvZGVEZXNjcmlwdGlvbikpLmV4ZWN1dGFi bGVNZW1vcnkoKSk7CiAgICAgfQogI2VuZGlmIC8vIEZUTF9VU0VTX0IzCiAKICAgICBqaXRDb2Rl LT5pbml0aWFsaXplQXJpdHlDaGVja0VudHJ5cG9pbnQoCi0gICAgICAgIEZJTkFMSVpFX0RGR19D T0RFKAotICAgICAgICAgICAgKmVudHJ5cG9pbnRMaW5rQnVmZmVyLAorICAgICAgICBGSU5BTEla RV9DT0RFX0lGKAorICAgICAgICAgICAgZHVtcERpc2Fzc2VtYmx5LCAqZW50cnlwb2ludExpbmtC dWZmZXIsCiAgICAgICAgICAgICAoIkZUTCBlbnRyeXBvaW50IHRodW5rIGZvciAlcyB3aXRoIExM Vk0gZ2VuZXJhdGVkIGNvZGUgYXQgJXAiLCB0b0NTdHJpbmcoQ29kZUJsb2NrV2l0aEpJVFR5cGUo bV9wbGFuLmNvZGVCbG9jaywgSklUQ29kZTo6RlRMSklUKSkuZGF0YSgpLCBmdW5jdGlvbikpKTsK ICAgICAKICAgICBtX3BsYW4uY29kZUJsb2NrLT5zZXRKSVRDb2RlKGppdENvZGUpOwpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAJKHJl dmlzaW9uIDE5MjYzOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdU b0xMVk0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDk2LDYgKzE0OTYsMTIgQEAgcHJpdmF0ZToK ICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KIAorI2lmIEZUTF9VU0VTX0Iz CisgICAgICAgICAgICBCMzo6Q2hlY2tWYWx1ZSogcmVzdWx0ID0KKyAgICAgICAgICAgICAgICBp c1N1YiA/IG1fb3V0LnNwZWN1bGF0ZVN1YihsZWZ0LCByaWdodCkgOiBtX291dC5zcGVjdWxhdGVB ZGQobGVmdCwgcmlnaHQpOworICAgICAgICAgICAgYmxlc3NTcGVjdWxhdGlvbihyZXN1bHQsIE92 ZXJmbG93LCBub1ZhbHVlKCksIG51bGxwdHIsIG1fb3JpZ2luKTsKKyAgICAgICAgICAgIHNldElu dDMyKHJlc3VsdCk7CisjZWxzZSAvLyBGVExfVVNFU19CMwogICAgICAgICAgICAgTFZhbHVlIHJl c3VsdDsKICAgICAgICAgICAgIGlmICghaXNTdWIpIHsKICAgICAgICAgICAgICAgICByZXN1bHQg PSBtX291dC5hZGRXaXRoT3ZlcmZsb3czMihsZWZ0LCByaWdodCk7CkBAIC0xNTMwLDYgKzE1MzYs NyBAQCBwcml2YXRlOgogCiAgICAgICAgICAgICBzcGVjdWxhdGUoT3ZlcmZsb3csIG5vVmFsdWUo KSwgMCwgbV9vdXQuZXh0cmFjdFZhbHVlKHJlc3VsdCwgMSkpOwogICAgICAgICAgICAgc2V0SW50 MzIobV9vdXQuZXh0cmFjdFZhbHVlKHJlc3VsdCwgMCkpOworI2VuZGlmIC8vIEZUTF9VU0VTX0Iz CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICAgICAgCkBAIC0xNTQyLDkg KzE1NDksMTUgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICBzZXRJbnQ1Mihpc1N1YiA/IG1f b3V0LnN1YihsZWZ0LCByaWdodCkgOiBtX291dC5hZGQobGVmdCwgcmlnaHQpLCBraW5kKTsKICAg ICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIAorCiAgICAg ICAgICAgICBMVmFsdWUgbGVmdCA9IGxvd0ludDUyKG1fbm9kZS0+Y2hpbGQxKCkpOwogICAgICAg ICAgICAgTFZhbHVlIHJpZ2h0ID0gbG93SW50NTIobV9ub2RlLT5jaGlsZDIoKSk7CisjaWYgRlRM X1VTRVNfQjMKKyAgICAgICAgICAgIEIzOjpDaGVja1ZhbHVlKiByZXN1bHQgPQorICAgICAgICAg ICAgICAgIGlzU3ViID8gbV9vdXQuc3BlY3VsYXRlU3ViKGxlZnQsIHJpZ2h0KSA6IG1fb3V0LnNw ZWN1bGF0ZUFkZChsZWZ0LCByaWdodCk7CisgICAgICAgICAgICBibGVzc1NwZWN1bGF0aW9uKHJl c3VsdCwgT3ZlcmZsb3csIG5vVmFsdWUoKSwgbnVsbHB0ciwgbV9vcmlnaW4pOworICAgICAgICAg ICAgc2V0SW50NTIocmVzdWx0KTsKKyNlbHNlIC8vIEZUTF9VU0VTX0IzCiAKICAgICAgICAgICAg IExWYWx1ZSByZXN1bHQ7CiAgICAgICAgICAgICBpZiAoIWlzU3ViKSB7CkBAIC0xNTgwLDYgKzE1 OTMsNyBAQCBwcml2YXRlOgogCiAgICAgICAgICAgICBzcGVjdWxhdGUoSW50NTJPdmVyZmxvdywg bm9WYWx1ZSgpLCAwLCBtX291dC5leHRyYWN0VmFsdWUocmVzdWx0LCAxKSk7CiAgICAgICAgICAg ICBzZXRJbnQ1MihtX291dC5leHRyYWN0VmFsdWUocmVzdWx0LCAwKSk7CisjZW5kaWYgLy8gRlRM X1VTRVNfQjMKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgICAgICAKQEAg LTE2NTYsOSArMTY3MCwxNSBAQCBwcml2YXRlOgogICAgICAgICAgICAgaWYgKCFzaG91bGRDaGVj a092ZXJmbG93KG1fbm9kZS0+YXJpdGhNb2RlKCkpKQogICAgICAgICAgICAgICAgIHJlc3VsdCA9 IG1fb3V0Lm11bChsZWZ0LCByaWdodCk7CiAgICAgICAgICAgICBlbHNlIHsKKyNpZiBGVExfVVNF U19CMworICAgICAgICAgICAgICAgIEIzOjpDaGVja1ZhbHVlKiBzcGVjdWxhdGlvbiA9IG1fb3V0 LnNwZWN1bGF0ZU11bChsZWZ0LCByaWdodCk7CisgICAgICAgICAgICAgICAgYmxlc3NTcGVjdWxh dGlvbihzcGVjdWxhdGlvbiwgT3ZlcmZsb3csIG5vVmFsdWUoKSwgbnVsbHB0ciwgbV9vcmlnaW4p OworICAgICAgICAgICAgICAgIHJlc3VsdCA9IHNwZWN1bGF0aW9uOworI2Vsc2UgLy8gRlRMX1VT RVNfQjMKICAgICAgICAgICAgICAgICBMVmFsdWUgb3ZlcmZsb3dSZXN1bHQgPSBtX291dC5tdWxX aXRoT3ZlcmZsb3czMihsZWZ0LCByaWdodCk7CiAgICAgICAgICAgICAgICAgc3BlY3VsYXRlKE92 ZXJmbG93LCBub1ZhbHVlKCksIDAsIG1fb3V0LmV4dHJhY3RWYWx1ZShvdmVyZmxvd1Jlc3VsdCwg MSkpOwogICAgICAgICAgICAgICAgIHJlc3VsdCA9IG1fb3V0LmV4dHJhY3RWYWx1ZShvdmVyZmxv d1Jlc3VsdCwgMCk7CisjZW5kaWYgLy8gRlRMX1VTRVNfQjMKICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIAogICAgICAgICAgICAgaWYgKHNob3VsZENoZWNrTmVnYXRpdmVaZXJvKG1fbm9kZS0+ YXJpdGhNb2RlKCkpKSB7CkBAIC0xNjg0LDkgKzE3MDQsMTQgQEAgcHJpdmF0ZToKICAgICAgICAg ICAgIExWYWx1ZSBsZWZ0ID0gbG93V2hpY2hldmVySW50NTIobV9ub2RlLT5jaGlsZDEoKSwga2lu ZCk7CiAgICAgICAgICAgICBMVmFsdWUgcmlnaHQgPSBsb3dJbnQ1MihtX25vZGUtPmNoaWxkMigp LCBvcHBvc2l0ZShraW5kKSk7CiAKKyNpZiBGVExfVVNFU19CMworICAgICAgICAgICAgQjM6OkNo ZWNrVmFsdWUqIHJlc3VsdCA9IG1fb3V0LnNwZWN1bGF0ZU11bChsZWZ0LCByaWdodCk7CisgICAg ICAgICAgICBibGVzc1NwZWN1bGF0aW9uKHJlc3VsdCwgT3ZlcmZsb3csIG5vVmFsdWUoKSwgbnVs bHB0ciwgbV9vcmlnaW4pOworI2Vsc2UgLy8gRlRMX1VTRVNfQjMKICAgICAgICAgICAgIExWYWx1 ZSBvdmVyZmxvd1Jlc3VsdCA9IG1fb3V0Lm11bFdpdGhPdmVyZmxvdzY0KGxlZnQsIHJpZ2h0KTsK ICAgICAgICAgICAgIHNwZWN1bGF0ZShJbnQ1Mk92ZXJmbG93LCBub1ZhbHVlKCksIDAsIG1fb3V0 LmV4dHJhY3RWYWx1ZShvdmVyZmxvd1Jlc3VsdCwgMSkpOwogICAgICAgICAgICAgTFZhbHVlIHJl c3VsdCA9IG1fb3V0LmV4dHJhY3RWYWx1ZShvdmVyZmxvd1Jlc3VsdCwgMCk7CisjZW5kaWYgLy8g RlRMX1VTRVNfQjMKIAogICAgICAgICAgICAgaWYgKHNob3VsZENoZWNrTmVnYXRpdmVaZXJvKG1f bm9kZS0+YXJpdGhNb2RlKCkpKSB7CiAgICAgICAgICAgICAgICAgTEJhc2ljQmxvY2sgc2xvd0Nh c2UgPSBGVExfTkVXX0JMT0NLKG1fb3V0LCAoIkFyaXRoTXVsIHNsb3cgY2FzZSIpKTsKQEAgLTUx NTMsOSArNTE3OCw4IEBAIHByaXZhdGU6CiAgICAgICAgIAogICAgICAgICBPU1JFeGl0RGVzY3Jp cHRvciYgZXhpdERlc2NyaXB0b3IgPSBtX2Z0bFN0YXRlLmppdENvZGUtPm9zckV4aXREZXNjcmlw dG9ycy5sYXN0KCk7CiAgICAgICAgIAotICAgICAgICBTdGFja21hcEFyZ3VtZW50TGlzdCBhcmd1 bWVudHM7Ci0gICAgICAgIAotICAgICAgICBidWlsZEV4aXRBcmd1bWVudHMoZXhpdERlc2NyaXB0 b3IsIGFyZ3VtZW50cywgRm9ybWF0dGVkVmFsdWUoKSwgZXhpdERlc2NyaXB0b3IubV9jb2RlT3Jp Z2luKTsKKyAgICAgICAgU3RhY2ttYXBBcmd1bWVudExpc3QgYXJndW1lbnRzID0KKyAgICAgICAg ICAgIGJ1aWxkRXhpdEFyZ3VtZW50cyhleGl0RGVzY3JpcHRvciwgRm9ybWF0dGVkVmFsdWUoKSwg ZXhpdERlc2NyaXB0b3IubV9jb2RlT3JpZ2luKTsKICAgICAgICAgY2FsbFN0YWNrbWFwKGV4aXRE ZXNjcmlwdG9yLCBhcmd1bWVudHMpOwogICAgICAgICAKICAgICAgICAgZXhpdERlc2NyaXB0b3Iu bV9pc0ludmFsaWRhdGlvblBvaW50ID0gdHJ1ZTsKQEAgLTg5ODEsOCArOTAwNSw4IEBAIHByaXZh dGU6CiAgICAgICAgIGV4aXREZXNjcmlwdG9yLm1fYmFzZWxpbmVFeGNlcHRpb25IYW5kbGVyID0g KmV4Y2VwdGlvbkhhbmRsZXI7CiAgICAgICAgIGV4aXREZXNjcmlwdG9yLm1fc3RhY2ttYXBJRCA9 IG1fc3RhY2ttYXBJRHMgLSAxOwogCi0gICAgICAgIFN0YWNrbWFwQXJndW1lbnRMaXN0IGZyZXNo TGlzdDsKLSAgICAgICAgYnVpbGRFeGl0QXJndW1lbnRzKGV4aXREZXNjcmlwdG9yLCBmcmVzaExp c3QsIG5vVmFsdWUoKSwgZXhpdERlc2NyaXB0b3IubV9jb2RlT3JpZ2luLCBvZmZzZXRPZkV4aXRB cmd1bWVudHMpOworICAgICAgICBTdGFja21hcEFyZ3VtZW50TGlzdCBmcmVzaExpc3QgPQorICAg ICAgICAgICAgYnVpbGRFeGl0QXJndW1lbnRzKGV4aXREZXNjcmlwdG9yLCBub1ZhbHVlKCksIGV4 aXREZXNjcmlwdG9yLm1fY29kZU9yaWdpbiwgb2Zmc2V0T2ZFeGl0QXJndW1lbnRzKTsKICAgICAg ICAgYXJndW1lbnRzLmFwcGVuZFZlY3RvcihmcmVzaExpc3QpOwogICAgIH0KIApAQCAtOTA0Niwy MiArOTA3MCwxMyBAQCBwcml2YXRlOgogICAgICAgICBpZiAoZmFpbENvbmRpdGlvbiA9PSBtX291 dC5ib29sZWFuRmFsc2UpCiAgICAgICAgICAgICByZXR1cm47CiAKKyNpZiBGVExfVVNFU19CMwor ICAgICAgICBibGVzc1NwZWN1bGF0aW9uKAorICAgICAgICAgICAgbV9vdXQuc3BlY3VsYXRlKGZh aWxDb25kaXRpb24pLCBraW5kLCBsb3dWYWx1ZSwgaGlnaFZhbHVlLCBvcmlnaW4sIGlzRXhjZXB0 aW9uSGFuZGxlcik7CisjZWxzZSAvLyBGVExfVVNFU19CMwogICAgICAgICBhcHBlbmRPU1JFeGl0 RGVzY3JpcHRvcihraW5kLCBpc0V4Y2VwdGlvbkhhbmRsZXIgPyBFeGNlcHRpb25UeXBlOjpDQ2Fs bEV4Y2VwdGlvbiA6IEV4Y2VwdGlvblR5cGU6Ok5vbmUsIGxvd1ZhbHVlLCBoaWdoVmFsdWUsIG9y aWdpbik7CiAgICAgICAgIE9TUkV4aXREZXNjcmlwdG9yJiBleGl0RGVzY3JpcHRvciA9IG1fZnRs U3RhdGUuaml0Q29kZS0+b3NyRXhpdERlc2NyaXB0b3JzLmxhc3QoKTsKIAotI2lmIEZUTF9VU0VT X0IzCi0gICAgICAgIFN0YWNrbWFwQXJndW1lbnRMaXN0IGFyZ3VtZW50czsKLQotICAgICAgICBD b2RlT3JpZ2luIGNvZGVPcmlnaW4gPSBleGl0RGVzY3JpcHRvci5tX2NvZGVPcmlnaW47Ci0KLSAg ICAgICAgYnVpbGRFeGl0QXJndW1lbnRzKGV4aXREZXNjcmlwdG9yLCBhcmd1bWVudHMsIGxvd1Zh bHVlLCBjb2RlT3JpZ2luKTsKLQotICAgICAgICBtX291dC5jaGVjaygKLSAgICAgICAgICAgIGZh aWxDb25kaXRpb24sIGFyZ3VtZW50cywKLSAgICAgICAgICAgIFsmXSAoQ0NhbGxIZWxwZXJzJiBq aXQsIGNvbnN0IEIzOjpTdGFja21hcEdlbmVyYXRpb25QYXJhbXMmKSB7Ci0gICAgICAgICAgICAg ICAgaml0Lm9vcHMoKTsKLSAgICAgICAgICAgIH0pOwotI2Vsc2UgLy8gRlRMX1VTRVNfQjMKICAg ICAgICAgaWYgKGZhaWxDb25kaXRpb24gPT0gbV9vdXQuYm9vbGVhblRydWUpIHsKICAgICAgICAg ICAgIGVtaXRPU1JFeGl0Q2FsbChleGl0RGVzY3JpcHRvciwgbG93VmFsdWUpOwogICAgICAgICAg ICAgcmV0dXJuOwpAQCAtOTA4NSw2ICs5MTAwLDIyIEBAIHByaXZhdGU6CiAjZW5kaWYgLy8gRlRM X1VTRVNfQjMKICAgICB9CiAKKyNpZiBGVExfVVNFU19CMworICAgIHZvaWQgYmxlc3NTcGVjdWxh dGlvbihCMzo6U3RhY2ttYXBWYWx1ZSogdmFsdWUsIEV4aXRLaW5kIGtpbmQsIEZvcm1hdHRlZFZh bHVlIGxvd1ZhbHVlLCBOb2RlKiBoaWdoVmFsdWUsIE5vZGVPcmlnaW4gb3JpZ2luLCBib29sIGlz RXhjZXB0aW9uSGFuZGxlciA9IGZhbHNlKQorICAgIHsKKyAgICAgICAgYXBwZW5kT1NSRXhpdERl c2NyaXB0b3Ioa2luZCwgaXNFeGNlcHRpb25IYW5kbGVyID8gRXhjZXB0aW9uVHlwZTo6Q0NhbGxF eGNlcHRpb24gOiBFeGNlcHRpb25UeXBlOjpOb25lLCBsb3dWYWx1ZSwgaGlnaFZhbHVlLCBvcmln aW4pOworICAgICAgICBPU1JFeGl0RGVzY3JpcHRvciYgZXhpdERlc2NyaXB0b3IgPSBtX2Z0bFN0 YXRlLmppdENvZGUtPm9zckV4aXREZXNjcmlwdG9ycy5sYXN0KCk7CisgICAgICAgIENvZGVPcmln aW4gY29kZU9yaWdpbiA9IGV4aXREZXNjcmlwdG9yLm1fY29kZU9yaWdpbjsKKyAgICAgICAgU3Rh Y2ttYXBBcmd1bWVudExpc3QgYXJndW1lbnRzID0gYnVpbGRFeGl0QXJndW1lbnRzKGV4aXREZXNj cmlwdG9yLCBsb3dWYWx1ZSwgY29kZU9yaWdpbik7CisgICAgICAgIGZvciAoTFZhbHVlIGNoaWxk IDogYXJndW1lbnRzKQorICAgICAgICAgICAgdmFsdWUtPmFwcGVuZChjaGlsZCk7CisgICAgICAg IHZhbHVlLT5zZXRHZW5lcmF0b3IoCisgICAgICAgICAgICBbJl0gKENDYWxsSGVscGVycyYgaml0 LCBjb25zdCBCMzo6U3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zJikgeworICAgICAgICAgICAgICAg IGppdC5vb3BzKCk7CisgICAgICAgICAgICB9KTsKKyAgICB9CisjZW5kaWYKKwogI2lmICFGVExf VVNFU19CMwogICAgIHZvaWQgZW1pdE9TUkV4aXRDYWxsKE9TUkV4aXREZXNjcmlwdG9yJiBleGl0 RGVzY3JpcHRvciwgRm9ybWF0dGVkVmFsdWUgbG93VmFsdWUpCiAgICAgewpAQCAtOTA5Nyw2ICs5 MTI4LDE2IEBAIHByaXZhdGU6CiAgICAgICAgIGNhbGxTdGFja21hcChleGl0RGVzY3JpcHRvciwg YXJndW1lbnRzKTsKICAgICB9CiAjZW5kaWYKKworICAgIFN0YWNrbWFwQXJndW1lbnRMaXN0IGJ1 aWxkRXhpdEFyZ3VtZW50cygKKyAgICAgICAgT1NSRXhpdERlc2NyaXB0b3ImIGV4aXREZXNjcmlw dG9yLCBGb3JtYXR0ZWRWYWx1ZSBsb3dWYWx1ZSwgQ29kZU9yaWdpbiBjb2RlT3JpZ2luLAorICAg ICAgICB1bnNpZ25lZCBvZmZzZXRPZkV4aXRBcmd1bWVudHNJblN0YWNrbWFwTG9jYXRpb25zID0g MCkKKyAgICB7CisgICAgICAgIFN0YWNrbWFwQXJndW1lbnRMaXN0IHJlc3VsdDsKKyAgICAgICAg YnVpbGRFeGl0QXJndW1lbnRzKAorICAgICAgICAgICAgZXhpdERlc2NyaXB0b3IsIHJlc3VsdCwg bG93VmFsdWUsIGNvZGVPcmlnaW4sIG9mZnNldE9mRXhpdEFyZ3VtZW50c0luU3RhY2ttYXBMb2Nh dGlvbnMpOworICAgICAgICByZXR1cm4gcmVzdWx0OworICAgIH0KICAgICAKICAgICB2b2lkIGJ1 aWxkRXhpdEFyZ3VtZW50cygKICAgICAgICAgT1NSRXhpdERlc2NyaXB0b3ImIGV4aXREZXNjcmlw dG9yLCBTdGFja21hcEFyZ3VtZW50TGlzdCYgYXJndW1lbnRzLCBGb3JtYXR0ZWRWYWx1ZSBsb3dW YWx1ZSwK