151463 2015-11-19 14:10:49 -0800 FTL->B3 lowering should support integer comparisons with the opcode abstracted and a few other things 2015-11-19 14:18:36 -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 1143438 0 fpizlo 2015-11-19 14:10:49 -0800 Patch forthcoming. 1143439 1 265902 fpizlo 2015-11-19 14:12:09 -0800 Created attachment 265902 the patch 1143441 2 commit-queue 2015-11-19 14:15:00 -0800 Attachment 265902 did not pass style-queue: ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:4526: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:4675: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:4678: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:4687: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:4690: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:4699: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:4702: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:4711: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:4714: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 9 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1143443 3 265902 ggaren 2015-11-19 14:15:59 -0800 Comment on attachment 265902 the patch r=me 1143444 4 fpizlo 2015-11-19 14:18:36 -0800 Landed in http://trac.webkit.org/changeset/192659 265902 2015-11-19 14:12:09 -0800 2015-11-19 14:15:59 -0800 the patch blah.patch text/plain 10364 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkyNjU4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBA CisyMDE1LTExLTE5ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg RlRMLT5CMyBsb3dlcmluZyBzaG91bGQgc3VwcG9ydCBpbnRlZ2VyIGNvbXBhcmlzb25zIHdpdGgg dGhlIG9wY29kZSBhYnN0cmFjdGVkIGFuZCBhIGZldyBvdGhlciB0aGluZ3MKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTQ2MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZnRsL0ZUTEIzT3V0cHV0Lmg6 CisgICAgICAgIChKU0M6OkZUTDo6T3V0cHV0OjpzaWduRXh0KToKKyAgICAgICAgKEpTQzo6RlRM OjpPdXRwdXQ6Onplcm9FeHQpOgorICAgICAgICAoSlNDOjpGVEw6Ok91dHB1dDo6emVyb0V4dFB0 cik6CisgICAgICAgIChKU0M6OkZUTDo6T3V0cHV0OjpmcFRvSW50KToKKyAgICAgICAgKEpTQzo6 RlRMOjpPdXRwdXQ6OmZwVG9VSW50KToKKyAgICAgICAgKEpTQzo6RlRMOjpPdXRwdXQ6OmZwVG9J bnQzMik6CisgICAgICAgIChKU0M6OkZUTDo6T3V0cHV0OjpiYXNlSW5kZXgpOgorICAgICAgICAo SlNDOjpGVEw6Ok91dHB1dDo6YWJzb2x1dGUpOgorICAgICAgICAoSlNDOjpGVEw6Ok91dHB1dDo6 bG9hZDMyTm9uTmVnYXRpdmUpOgorICAgICAgICAoSlNDOjpGVEw6Ok91dHB1dDo6ZXF1YWwpOgor ICAgICAgICAoSlNDOjpGVEw6Ok91dHB1dDo6bm90RXF1YWwpOgorICAgICAgICAoSlNDOjpGVEw6 Ok91dHB1dDo6YWJvdmUpOgorICAgICAgICAoSlNDOjpGVEw6Ok91dHB1dDo6bGVzc1RoYW4pOgor ICAgICAgICAoSlNDOjpGVEw6Ok91dHB1dDo6bGVzc1RoYW5PckVxdWFsKToKKyAgICAgICAgKEpT Qzo6RlRMOjpPdXRwdXQ6OmRvdWJsZUVxdWFsKToKKyAgICAgICAgKEpTQzo6RlRMOjpPdXRwdXQ6 OmRvdWJsZU5vdEVxdWFsT3JVbm9yZGVyZWQpOgorICAgICAgICAoSlNDOjpGVEw6Ok91dHB1dDo6 ZG91YmxlTGVzc1RoYW4pOgorICAgICAgICAoSlNDOjpGVEw6Ok91dHB1dDo6aWNtcCk6IERlbGV0 ZWQuCisgICAgICAgIChKU0M6OkZUTDo6T3V0cHV0OjpmY21wKTogRGVsZXRlZC4KKyAgICAgICAg KiBmdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93 ZXJERkdUb0xMVk06OmNvbXBpbGVDb21wYXJlRXEpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6 TG93ZXJERkdUb0xMVk06OmNvbXBpbGVDb21wYXJlTGVzcyk6CisgICAgICAgIChKU0M6OkZUTDo6 REZHOjpMb3dlckRGR1RvTExWTTo6Y29tcGlsZUNvbXBhcmVMZXNzRXEpOgorICAgICAgICAoSlND OjpGVEw6OkRGRzo6TG93ZXJERkdUb0xMVk06OmNvbXBpbGVDb21wYXJlR3JlYXRlcik6CisgICAg ICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvTExWTTo6Y29tcGlsZUNvbXBhcmVHcmVhdGVy RXEpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdUb0xMVk06OmNvbXBpbGVMb2dp Y2FsTm90KToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9MTFZNOjpiYXNlSW5k ZXgpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdUb0xMVk06OmNvbXBhcmUpOgor ICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdUb0xMVk06OnNwZWN1bGF0ZVRydXRoeU9i amVjdCk6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvTExWTTo6bm9uU3BlY3Vs YXRpdmVDb21wYXJlKToKKwogMjAxNS0xMS0xOSAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWlu QGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBXaGVuIHRoZSBpdGVyYXRlZCBhbGxvY2F0b3Ig aXMgZm9yY2VkIHRvIHNwaWxsLCBudWtlIHRoZSBNb3ZlcyB0aGF0IHdlcmUgYWxyZWFkeSBwcm92 ZW4gdG8gYmUgdXNlbGVzcwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExCM091 dHB1dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMQjNPdXRw dXQuaAkocmV2aXNpb24gMTkyNjU2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExC M091dHB1dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzUsNyArMTc1LDcgQEAgcHVibGljOgogCiAg ICAgTFZhbHVlIHNpZ25FeHQoTFZhbHVlIHZhbHVlLCBMVHlwZSB0eXBlKSB7IENSQVNIKCk7IH0K ICAgICBMVmFsdWUgemVyb0V4dChMVmFsdWUgdmFsdWUsIExUeXBlIHR5cGUpIHsgcmV0dXJuIG1f YmxvY2stPmFwcGVuZE5ldzxCMzo6VmFsdWU+KG1fcHJvYywgQjM6OlpFeHQzMiwgdHlwZSwgb3Jp Z2luKCksIHZhbHVlKTsgfQotICAgIExWYWx1ZSB6ZXJvRXh0UHRyKExWYWx1ZSB2YWx1ZSkgeyBD UkFTSCgpOyB9CisgICAgTFZhbHVlIHplcm9FeHRQdHIoTFZhbHVlIHZhbHVlKSB7IHJldHVybiB6 ZXJvRXh0KHZhbHVlLCBCMzo6SW50NjQpOyB9CiAgICAgTFZhbHVlIGZwVG9JbnQoTFZhbHVlIHZh bHVlLCBMVHlwZSB0eXBlKSB7IENSQVNIKCk7IH0KICAgICBMVmFsdWUgZnBUb1VJbnQoTFZhbHVl IHZhbHVlLCBMVHlwZSB0eXBlKSB7IENSQVNIKCk7IH0KICAgICBMVmFsdWUgZnBUb0ludDMyKExW YWx1ZSB2YWx1ZSkgeyBDUkFTSCgpOyB9CkBAIC0yNDcsOCArMjQ3LDE0IEBAIHB1YmxpYzoKIAog ICAgIExWYWx1ZSBiYXNlSW5kZXgoTFZhbHVlIGJhc2UsIExWYWx1ZSBpbmRleCwgU2NhbGUsIHB0 cmRpZmZfdCBvZmZzZXQgPSAwKSB7IENSQVNIKCk7IH0KIAotICAgIFR5cGVkUG9pbnRlciBiYXNl SW5kZXgoY29uc3QgQWJzdHJhY3RIZWFwJiBoZWFwLCBMVmFsdWUgYmFzZSwgTFZhbHVlIGluZGV4 LCBTY2FsZSBzY2FsZSwgcHRyZGlmZl90IG9mZnNldCA9IDApIHsgQ1JBU0goKTsgfQotICAgIFR5 cGVkUG9pbnRlciBiYXNlSW5kZXgoSW5kZXhlZEFic3RyYWN0SGVhcCYgaGVhcCwgTFZhbHVlIGJh c2UsIExWYWx1ZSBpbmRleCwgSlNWYWx1ZSBpbmRleEFzQ29uc3RhbnQgPSBKU1ZhbHVlKCksIHB0 cmRpZmZfdCBvZmZzZXQgPSAwKSB7IENSQVNIKCk7IH0KKyAgICBUeXBlZFBvaW50ZXIgYmFzZUlu ZGV4KGNvbnN0IEFic3RyYWN0SGVhcCYgaGVhcCwgTFZhbHVlIGJhc2UsIExWYWx1ZSBpbmRleCwg U2NhbGUgc2NhbGUsIHB0cmRpZmZfdCBvZmZzZXQgPSAwKQorICAgIHsKKyAgICAgICAgcmV0dXJu IFR5cGVkUG9pbnRlcihoZWFwLCBiYXNlSW5kZXgoYmFzZSwgaW5kZXgsIHNjYWxlLCBvZmZzZXQp KTsKKyAgICB9CisgICAgVHlwZWRQb2ludGVyIGJhc2VJbmRleChJbmRleGVkQWJzdHJhY3RIZWFw JiBoZWFwLCBMVmFsdWUgYmFzZSwgTFZhbHVlIGluZGV4LCBKU1ZhbHVlIGluZGV4QXNDb25zdGFu dCA9IEpTVmFsdWUoKSwgcHRyZGlmZl90IG9mZnNldCA9IDApCisgICAgeworICAgICAgICByZXR1 cm4gaGVhcC5iYXNlSW5kZXgoKnRoaXMsIGJhc2UsIGluZGV4LCBpbmRleEFzQ29uc3RhbnQsIG9m ZnNldCk7CisgICAgfQogCiAgICAgVHlwZWRQb2ludGVyIGFic29sdXRlKHZvaWQqIGFkZHJlc3Mp CiAgICAgewpAQCAtMjc2LDcgKzI4Miw2IEBAIHB1YmxpYzoKICAgICBMVmFsdWUgbG9hZDMyTm9u TmVnYXRpdmUoVHlwZWRQb2ludGVyIHBvaW50ZXIpIHsgcmV0dXJuIGxvYWQzMihwb2ludGVyKTsg fQogICAgIExWYWx1ZSBsb2FkMzJOb25OZWdhdGl2ZShMVmFsdWUgYmFzZSwgY29uc3QgQWJzdHJh Y3RGaWVsZCYgZmllbGQpIHsgcmV0dXJuIGxvYWQzMihiYXNlLCBmaWVsZCk7IH0KIAotICAgIExW YWx1ZSBpY21wKExJbnRQcmVkaWNhdGUgY29uZCwgTFZhbHVlIGxlZnQsIExWYWx1ZSByaWdodCkg eyBDUkFTSCgpOyB9CiAgICAgTFZhbHVlIGVxdWFsKExWYWx1ZSBsZWZ0LCBMVmFsdWUgcmlnaHQp IHsgcmV0dXJuIG1fYmxvY2stPmFwcGVuZE5ldzxCMzo6VmFsdWU+KG1fcHJvYywgQjM6OkVxdWFs LCBvcmlnaW4oKSwgbGVmdCwgcmlnaHQpOyB9CiAgICAgTFZhbHVlIG5vdEVxdWFsKExWYWx1ZSBs ZWZ0LCBMVmFsdWUgcmlnaHQpIHsgcmV0dXJuIG1fYmxvY2stPmFwcGVuZE5ldzxCMzo6VmFsdWU+ KG1fcHJvYywgQjM6Ok5vdEVxdWFsLCBvcmlnaW4oKSwgbGVmdCwgcmlnaHQpOyB9CiAgICAgTFZh bHVlIGFib3ZlKExWYWx1ZSBsZWZ0LCBMVmFsdWUgcmlnaHQpIHsgcmV0dXJuIG1fYmxvY2stPmFw cGVuZE5ldzxCMzo6VmFsdWU+KG1fcHJvYywgQjM6OkFib3ZlLCBvcmlnaW4oKSwgbGVmdCwgcmln aHQpOyB9CkBAIC0yODgsNyArMjkzLDYgQEAgcHVibGljOgogICAgIExWYWx1ZSBsZXNzVGhhbihM VmFsdWUgbGVmdCwgTFZhbHVlIHJpZ2h0KSB7IHJldHVybiBtX2Jsb2NrLT5hcHBlbmROZXc8QjM6 OlZhbHVlPihtX3Byb2MsIEIzOjpMZXNzVGhhbiwgb3JpZ2luKCksIGxlZnQsIHJpZ2h0KTsgfQog ICAgIExWYWx1ZSBsZXNzVGhhbk9yRXF1YWwoTFZhbHVlIGxlZnQsIExWYWx1ZSByaWdodCkgeyBy ZXR1cm4gbV9ibG9jay0+YXBwZW5kTmV3PEIzOjpWYWx1ZT4obV9wcm9jLCBCMzo6TGVzc0VxdWFs LCBvcmlnaW4oKSwgbGVmdCwgcmlnaHQpOyB9CiAKLSAgICBMVmFsdWUgZmNtcChMUmVhbFByZWRp Y2F0ZSBjb25kLCBMVmFsdWUgbGVmdCwgTFZhbHVlIHJpZ2h0KSB7IENSQVNIKCk7IH0KICAgICBM VmFsdWUgZG91YmxlRXF1YWwoTFZhbHVlIGxlZnQsIExWYWx1ZSByaWdodCkgeyByZXR1cm4gbV9i bG9jay0+YXBwZW5kTmV3PEIzOjpWYWx1ZT4obV9wcm9jLCBCMzo6RXF1YWwsIG9yaWdpbigpLCBs ZWZ0LCByaWdodCk7IH0KICAgICBMVmFsdWUgZG91YmxlTm90RXF1YWxPclVub3JkZXJlZChMVmFs dWUgbGVmdCwgTFZhbHVlIHJpZ2h0KSB7IHJldHVybiBtX2Jsb2NrLT5hcHBlbmROZXc8QjM6OlZh bHVlPihtX3Byb2MsIEIzOjpOb3RFcXVhbCwgb3JpZ2luKCksIGxlZnQsIHJpZ2h0KTsgfQogICAg IExWYWx1ZSBkb3VibGVMZXNzVGhhbihMVmFsdWUgbGVmdCwgTFZhbHVlIHJpZ2h0KSB7IHJldHVy biBtX2Jsb2NrLT5hcHBlbmROZXc8QjM6OlZhbHVlPihtX3Byb2MsIEIzOjpMZXNzVGhhbiwgb3Jp Z2luKCksIGxlZnQsIHJpZ2h0KTsgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9G VExMb3dlckRGR1RvTExWTS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAJKHJldmlzaW9uIDE5MjY1NikKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC00NTIyLDcgKzQ1MjIsMTEgQEAgcHJpdmF0ZToKICAgICAgICAgfQogICAgICAgICAKICAgICAg ICAgaWYgKG1fbm9kZS0+aXNCaW5hcnlVc2VLaW5kKFVudHlwZWRVc2UpKSB7Ci0gICAgICAgICAg ICBub25TcGVjdWxhdGl2ZUNvbXBhcmUoTExWTUludEVRLCBvcGVyYXRpb25Db21wYXJlRXEpOwor ICAgICAgICAgICAgbm9uU3BlY3VsYXRpdmVDb21wYXJlKAorICAgICAgICAgICAgICAgIFsmXSAo TFZhbHVlIGxlZnQsIExWYWx1ZSByaWdodCkgeworICAgICAgICAgICAgICAgICAgICByZXR1cm4g bV9vdXQuZXF1YWwobGVmdCwgcmlnaHQpOworICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAg ICAgICAgb3BlcmF0aW9uQ29tcGFyZUVxKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg fQogCkBAIC00NjY3LDIyICs0NjcxLDUwIEBAIHByaXZhdGU6CiAgICAgCiAgICAgdm9pZCBjb21w aWxlQ29tcGFyZUxlc3MoKQogICAgIHsKLSAgICAgICAgY29tcGFyZShMTFZNSW50U0xULCBMTFZN UmVhbE9MVCwgb3BlcmF0aW9uQ29tcGFyZUxlc3MpOworICAgICAgICBjb21wYXJlKAorICAgICAg ICAgICAgWyZdIChMVmFsdWUgbGVmdCwgTFZhbHVlIHJpZ2h0KSB7CisgICAgICAgICAgICAgICAg cmV0dXJuIG1fb3V0Lmxlc3NUaGFuKGxlZnQsIHJpZ2h0KTsKKyAgICAgICAgICAgIH0sCisgICAg ICAgICAgICBbJl0gKExWYWx1ZSBsZWZ0LCBMVmFsdWUgcmlnaHQpIHsKKyAgICAgICAgICAgICAg ICByZXR1cm4gbV9vdXQuZG91YmxlTGVzc1RoYW4obGVmdCwgcmlnaHQpOworICAgICAgICAgICAg fSwKKyAgICAgICAgICAgIG9wZXJhdGlvbkNvbXBhcmVMZXNzKTsKICAgICB9CiAgICAgCiAgICAg dm9pZCBjb21waWxlQ29tcGFyZUxlc3NFcSgpCiAgICAgewotICAgICAgICBjb21wYXJlKExMVk1J bnRTTEUsIExMVk1SZWFsT0xFLCBvcGVyYXRpb25Db21wYXJlTGVzc0VxKTsKKyAgICAgICAgY29t cGFyZSgKKyAgICAgICAgICAgIFsmXSAoTFZhbHVlIGxlZnQsIExWYWx1ZSByaWdodCkgeworICAg ICAgICAgICAgICAgIHJldHVybiBtX291dC5sZXNzVGhhbk9yRXF1YWwobGVmdCwgcmlnaHQpOwor ICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIFsmXSAoTFZhbHVlIGxlZnQsIExWYWx1ZSByaWdo dCkgeworICAgICAgICAgICAgICAgIHJldHVybiBtX291dC5kb3VibGVMZXNzVGhhbk9yRXF1YWwo bGVmdCwgcmlnaHQpOworICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIG9wZXJhdGlvbkNvbXBh cmVMZXNzRXEpOwogICAgIH0KICAgICAKICAgICB2b2lkIGNvbXBpbGVDb21wYXJlR3JlYXRlcigp CiAgICAgewotICAgICAgICBjb21wYXJlKExMVk1JbnRTR1QsIExMVk1SZWFsT0dULCBvcGVyYXRp b25Db21wYXJlR3JlYXRlcik7CisgICAgICAgIGNvbXBhcmUoCisgICAgICAgICAgICBbJl0gKExW YWx1ZSBsZWZ0LCBMVmFsdWUgcmlnaHQpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gbV9vdXQu Z3JlYXRlclRoYW4obGVmdCwgcmlnaHQpOworICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIFsm XSAoTFZhbHVlIGxlZnQsIExWYWx1ZSByaWdodCkgeworICAgICAgICAgICAgICAgIHJldHVybiBt X291dC5kb3VibGVHcmVhdGVyVGhhbihsZWZ0LCByaWdodCk7CisgICAgICAgICAgICB9LAorICAg ICAgICAgICAgb3BlcmF0aW9uQ29tcGFyZUdyZWF0ZXIpOwogICAgIH0KICAgICAKICAgICB2b2lk IGNvbXBpbGVDb21wYXJlR3JlYXRlckVxKCkKICAgICB7Ci0gICAgICAgIGNvbXBhcmUoTExWTUlu dFNHRSwgTExWTVJlYWxPR0UsIG9wZXJhdGlvbkNvbXBhcmVHcmVhdGVyRXEpOworICAgICAgICBj b21wYXJlKAorICAgICAgICAgICAgWyZdIChMVmFsdWUgbGVmdCwgTFZhbHVlIHJpZ2h0KSB7Cisg ICAgICAgICAgICAgICAgcmV0dXJuIG1fb3V0LmdyZWF0ZXJUaGFuT3JFcXVhbChsZWZ0LCByaWdo dCk7CisgICAgICAgICAgICB9LAorICAgICAgICAgICAgWyZdIChMVmFsdWUgbGVmdCwgTFZhbHVl IHJpZ2h0KSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIG1fb3V0LmRvdWJsZUdyZWF0ZXJUaGFu T3JFcXVhbChsZWZ0LCByaWdodCk7CisgICAgICAgICAgICB9LAorICAgICAgICAgICAgb3BlcmF0 aW9uQ29tcGFyZUdyZWF0ZXJFcSk7CiAgICAgfQogICAgIAogICAgIHZvaWQgY29tcGlsZUxvZ2lj YWxOb3QoKQpAQCAtNjUyMywxNSArNjU1NSwxNiBAQCBwcml2YXRlOgogICAgICAgICByZXR1cm4g bV9vdXQuYmFzZUluZGV4KAogICAgICAgICAgICAgaGVhcCwgc3RvcmFnZSwgbV9vdXQuemVyb0V4 dFB0cihpbmRleCksIHByb3ZlblZhbHVlKGVkZ2UpLCBvZmZzZXQpOwogICAgIH0KLSAgICAKKwor ICAgIHRlbXBsYXRlPHR5cGVuYW1lIEludEZ1bmN0b3IsIHR5cGVuYW1lIERvdWJsZUZ1bmN0b3I+ CiAgICAgdm9pZCBjb21wYXJlKAotICAgICAgICBMSW50UHJlZGljYXRlIGludENvbmRpdGlvbiwg TFJlYWxQcmVkaWNhdGUgcmVhbENvbmRpdGlvbiwKKyAgICAgICAgY29uc3QgSW50RnVuY3RvciYg aW50RnVuY3RvciwgY29uc3QgRG91YmxlRnVuY3RvciYgZG91YmxlRnVuY3RvciwKICAgICAgICAg U19KSVRPcGVyYXRpb25fRUpKIGhlbHBlckZ1bmN0aW9uKQogICAgIHsKICAgICAgICAgaWYgKG1f bm9kZS0+aXNCaW5hcnlVc2VLaW5kKEludDMyVXNlKSkgewogICAgICAgICAgICAgTFZhbHVlIGxl ZnQgPSBsb3dJbnQzMihtX25vZGUtPmNoaWxkMSgpKTsKICAgICAgICAgICAgIExWYWx1ZSByaWdo dCA9IGxvd0ludDMyKG1fbm9kZS0+Y2hpbGQyKCkpOwotICAgICAgICAgICAgc2V0Qm9vbGVhbiht X291dC5pY21wKGludENvbmRpdGlvbiwgbGVmdCwgcmlnaHQpKTsKKyAgICAgICAgICAgIHNldEJv b2xlYW4oaW50RnVuY3RvcihsZWZ0LCByaWdodCkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICB9CiAgICAgICAgIApAQCAtNjUzOSwxOSArNjU3MiwxOSBAQCBwcml2YXRlOgogICAgICAg ICAgICAgSW50NTJLaW5kIGtpbmQ7CiAgICAgICAgICAgICBMVmFsdWUgbGVmdCA9IGxvd1doaWNo ZXZlckludDUyKG1fbm9kZS0+Y2hpbGQxKCksIGtpbmQpOwogICAgICAgICAgICAgTFZhbHVlIHJp Z2h0ID0gbG93SW50NTIobV9ub2RlLT5jaGlsZDIoKSwga2luZCk7Ci0gICAgICAgICAgICBzZXRC b29sZWFuKG1fb3V0LmljbXAoaW50Q29uZGl0aW9uLCBsZWZ0LCByaWdodCkpOworICAgICAgICAg ICAgc2V0Qm9vbGVhbihpbnRGdW5jdG9yKGxlZnQsIHJpZ2h0KSk7CiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIGlmIChtX25vZGUtPmlzQmluYXJ5VXNl S2luZChEb3VibGVSZXBVc2UpKSB7CiAgICAgICAgICAgICBMVmFsdWUgbGVmdCA9IGxvd0RvdWJs ZShtX25vZGUtPmNoaWxkMSgpKTsKICAgICAgICAgICAgIExWYWx1ZSByaWdodCA9IGxvd0RvdWJs ZShtX25vZGUtPmNoaWxkMigpKTsKLSAgICAgICAgICAgIHNldEJvb2xlYW4obV9vdXQuZmNtcChy ZWFsQ29uZGl0aW9uLCBsZWZ0LCByaWdodCkpOworICAgICAgICAgICAgc2V0Qm9vbGVhbihkb3Vi bGVGdW5jdG9yKGxlZnQsIHJpZ2h0KSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0K ICAgICAgICAgCiAgICAgICAgIGlmIChtX25vZGUtPmlzQmluYXJ5VXNlS2luZChVbnR5cGVkVXNl KSkgewotICAgICAgICAgICAgbm9uU3BlY3VsYXRpdmVDb21wYXJlKGludENvbmRpdGlvbiwgaGVs cGVyRnVuY3Rpb24pOworICAgICAgICAgICAgbm9uU3BlY3VsYXRpdmVDb21wYXJlKGludEZ1bmN0 b3IsIGhlbHBlckZ1bmN0aW9uKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAg ICAgICAKQEAgLTY2MDIsOCArNjYzNSw5IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgbV9v dXQubG9hZDhaZXJvRXh0MzIoY2VsbCwgbV9oZWFwcy5KU0NlbGxfdHlwZUluZm9GbGFncyksCiAg ICAgICAgICAgICAgICAgbV9vdXQuY29uc3RJbnQzMihNYXNxdWVyYWRlc0FzVW5kZWZpbmVkKSkp OwogICAgIH0KLSAgICAKLSAgICB2b2lkIG5vblNwZWN1bGF0aXZlQ29tcGFyZShMSW50UHJlZGlj YXRlIGludENvbmRpdGlvbiwgU19KSVRPcGVyYXRpb25fRUpKIGhlbHBlckZ1bmN0aW9uKQorCisg ICAgdGVtcGxhdGU8dHlwZW5hbWUgSW50RnVuY3Rvcj4KKyAgICB2b2lkIG5vblNwZWN1bGF0aXZl Q29tcGFyZShjb25zdCBJbnRGdW5jdG9yJiBpbnRGdW5jdG9yLCBTX0pJVE9wZXJhdGlvbl9FSkog aGVscGVyRnVuY3Rpb24pCiAgICAgewogICAgICAgICBMVmFsdWUgbGVmdCA9IGxvd0pTVmFsdWUo bV9ub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgIExWYWx1ZSByaWdodCA9IGxvd0pTVmFsdWUobV9u b2RlLT5jaGlsZDIoKSk7CkBAIC02NjE5LDggKzY2NTMsNyBAQCBwcml2YXRlOgogICAgICAgICBt X291dC5icmFuY2goaXNOb3RJbnQzMihyaWdodCksIHJhcmVseShzbG93UGF0aCksIHVzdWFsbHko ZmFzdFBhdGgpKTsKICAgICAgICAgCiAgICAgICAgIG1fb3V0LmFwcGVuZFRvKGZhc3RQYXRoLCBz bG93UGF0aCk7Ci0gICAgICAgIFZhbHVlRnJvbUJsb2NrIGZhc3RSZXN1bHQgPSBtX291dC5hbmNo b3IoCi0gICAgICAgICAgICBtX291dC5pY21wKGludENvbmRpdGlvbiwgdW5ib3hJbnQzMihsZWZ0 KSwgdW5ib3hJbnQzMihyaWdodCkpKTsKKyAgICAgICAgVmFsdWVGcm9tQmxvY2sgZmFzdFJlc3Vs dCA9IG1fb3V0LmFuY2hvcihpbnRGdW5jdG9yKHVuYm94SW50MzIobGVmdCksIHVuYm94SW50MzIo cmlnaHQpKSk7CiAgICAgICAgIG1fb3V0Lmp1bXAoY29udGludWF0aW9uKTsKICAgICAgICAgCiAg ICAgICAgIG1fb3V0LmFwcGVuZFRvKHNsb3dQYXRoLCBjb250aW51YXRpb24pOwo=