142184 2015-03-02 11:30:26 -0800 Deduplicate slow path calling code in JITOpcodes.cpp/JITOpcodes32_64.cpp 2015-03-02 14:53:47 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo oldest_to_newest 1073393 0 fpizlo 2015-03-02 11:30:26 -0800 Patch forthcoming. 1073394 1 247684 fpizlo 2015-03-02 11:33:34 -0800 Created attachment 247684 the patch 1073396 2 247684 msaboff 2015-03-02 11:34:54 -0800 Comment on attachment 247684 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=247684&action=review r=me > Source/JavaScriptCore/ChangeLog:7 > + Patch description? 1073399 3 fpizlo 2015-03-02 11:38:08 -0800 (In reply to comment #2) > Comment on attachment 247684 [details] > the patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=247684&action=review > > r=me > > > Source/JavaScriptCore/ChangeLog:7 > > + > > Patch description? The bug title describes it completely, no? 1073450 4 fpizlo 2015-03-02 14:53:47 -0800 Landed in http://trac.webkit.org/changeset/180897 247684 2015-03-02 11:33:34 -0800 2015-03-02 11:34:54 -0800 the patch blah.patch text/plain 8976 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTgwODkwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBA CisyMDE1LTAzLTAyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg RGVkdXBsaWNhdGUgc2xvdyBwYXRoIGNhbGxpbmcgY29kZSBpbiBKSVRPcGNvZGVzLmNwcC9KSVRP cGNvZGVzMzJfNjQuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDIxODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGppdC9KSVRPcGNvZGVzLmNwcDoKKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29w X2dldF9lbnVtZXJhYmxlX2xlbmd0aCk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdFNsb3dfb3Bf aGFzX3N0cnVjdHVyZV9wcm9wZXJ0eSk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9oYXNf Z2VuZXJpY19wcm9wZXJ0eSk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9nZXRfc3RydWN0 dXJlX3Byb3BlcnR5X2VudW1lcmF0b3IpOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfZ2V0 X2dlbmVyaWNfcHJvcGVydHlfZW51bWVyYXRvcik6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9v cF90b19pbmRleF9zdHJpbmcpOgorICAgICAgICAqIGppdC9KSVRPcGNvZGVzMzJfNjQuY3BwOgor ICAgICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfZ2V0X2VudW1lcmFibGVfbGVuZ3RoKTogRGVsZXRl ZC4KKyAgICAgICAgKEpTQzo6SklUOjplbWl0U2xvd19vcF9oYXNfc3RydWN0dXJlX3Byb3BlcnR5 KTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29wX2hhc19nZW5lcmljX3Byb3Bl cnR5KTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29wX2dldF9zdHJ1Y3R1cmVf cHJvcGVydHlfZW51bWVyYXRvcik6IERlbGV0ZWQuCisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9v cF9nZXRfZ2VuZXJpY19wcm9wZXJ0eV9lbnVtZXJhdG9yKTogRGVsZXRlZC4KKyAgICAgICAgKEpT Qzo6SklUOjplbWl0X29wX3RvX2luZGV4X3N0cmluZyk6IERlbGV0ZWQuCisgICAgICAgIChKU0M6 OkpJVDo6ZW1pdF9vcF9wcm9maWxlX2NvbnRyb2xfZmxvdyk6IERlbGV0ZWQuCisKIDIwMTUtMDMt MDEgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBCeXRlY29kZUdl bmVyYXRvciBzaG91bGRuJ3QgZW1pdCBvcF9yZXNvbHZlX3Njb3BlIGFzIGEgcm91bmRhYm91dCB3 YXkgb2YgcmV0dXJuaW5nIHRoZSBzY29wZVJlZ2lzdGVyCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVE9wY29kZXMzMl82NC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzMzJfNjQuY3BwCShyZXZpc2lvbiAxODA4OTApCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMzMl82NC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTExMDAsMTIgKzExMDAsNiBAQCB2b2lkIEpJVDo6ZW1pdFNsb3dfb3BfZ2V0X2FyZ3Vt ZW50X2J5X3ZhCiAgICAgY2FsbE9wZXJhdGlvbihXaXRoUHJvZmlsZSwgb3BlcmF0aW9uR2V0QnlW YWxHZW5lcmljLCBkc3QsIHJlZ1QxLCByZWdUMCwgcmVnVDMsIHJlZ1QyKTsKIH0KIAotdm9pZCBK SVQ6OmVtaXRfb3BfZ2V0X2VudW1lcmFibGVfbGVuZ3RoKEluc3RydWN0aW9uKiBjdXJyZW50SW5z dHJ1Y3Rpb24pCi17Ci0gICAgSklUU2xvd1BhdGhDYWxsIHNsb3dQYXRoQ2FsbCh0aGlzLCBjdXJy ZW50SW5zdHJ1Y3Rpb24sIHNsb3dfcGF0aF9nZXRfZW51bWVyYWJsZV9sZW5ndGgpOwotICAgIHNs b3dQYXRoQ2FsbC5jYWxsKCk7Ci19Ci0KIHZvaWQgSklUOjplbWl0X29wX2hhc19zdHJ1Y3R1cmVf cHJvcGVydHkoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKIHsKICAgICBpbnQgZHN0 ID0gY3VycmVudEluc3RydWN0aW9uWzFdLnUub3BlcmFuZDsKQEAgLTExMjQsMjEgKzExMTgsNiBA QCB2b2lkIEpJVDo6ZW1pdF9vcF9oYXNfc3RydWN0dXJlX3Byb3BlcnR5CiAgICAgZW1pdFN0b3Jl Qm9vbChkc3QsIHJlZ1QwKTsKIH0KIAotdm9pZCBKSVQ6OmVtaXRTbG93X29wX2hhc19zdHJ1Y3R1 cmVfcHJvcGVydHkoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbiwgVmVjdG9yPFNsb3dD YXNlRW50cnk+OjppdGVyYXRvciYgaXRlcikKLXsKLSAgICBsaW5rU2xvd0Nhc2UoaXRlcik7Ci0g ICAgbGlua1Nsb3dDYXNlKGl0ZXIpOwotCi0gICAgSklUU2xvd1BhdGhDYWxsIHNsb3dQYXRoQ2Fs bCh0aGlzLCBjdXJyZW50SW5zdHJ1Y3Rpb24sIHNsb3dfcGF0aF9oYXNfc3RydWN0dXJlX3Byb3Bl cnR5KTsKLSAgICBzbG93UGF0aENhbGwuY2FsbCgpOwotfQotCi12b2lkIEpJVDo6ZW1pdF9vcF9o YXNfZ2VuZXJpY19wcm9wZXJ0eShJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQotewot ICAgIEpJVFNsb3dQYXRoQ2FsbCBzbG93UGF0aENhbGwodGhpcywgY3VycmVudEluc3RydWN0aW9u LCBzbG93X3BhdGhfaGFzX2dlbmVyaWNfcHJvcGVydHkpOwotICAgIHNsb3dQYXRoQ2FsbC5jYWxs KCk7Ci19Ci0KIHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZUhhc0luZGV4ZWRQcm9wZXJ0eShCeVZh bEluZm8qIGJ5VmFsSW5mbywgUmV0dXJuQWRkcmVzc1B0ciByZXR1cm5BZGRyZXNzLCBKSVRBcnJh eU1vZGUgYXJyYXlNb2RlKQogewogICAgIEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24g PSBtX2NvZGVCbG9jay0+aW5zdHJ1Y3Rpb25zKCkuYmVnaW4oKSArIGJ5VmFsSW5mby0+Ynl0ZWNv ZGVJbmRleDsKQEAgLTEyODgsMTggKzEyNjcsNiBAQCB2b2lkIEpJVDo6ZW1pdFNsb3dfb3BfZ2V0 X2RpcmVjdF9wbmFtZShJCiAgICAgc2xvd1BhdGhDYWxsLmNhbGwoKTsKIH0KIAotdm9pZCBKSVQ6 OmVtaXRfb3BfZ2V0X3N0cnVjdHVyZV9wcm9wZXJ0eV9lbnVtZXJhdG9yKEluc3RydWN0aW9uKiBj dXJyZW50SW5zdHJ1Y3Rpb24pCi17Ci0gICAgSklUU2xvd1BhdGhDYWxsIHNsb3dQYXRoQ2FsbCh0 aGlzLCBjdXJyZW50SW5zdHJ1Y3Rpb24sIHNsb3dfcGF0aF9nZXRfc3RydWN0dXJlX3Byb3BlcnR5 X2VudW1lcmF0b3IpOwotICAgIHNsb3dQYXRoQ2FsbC5jYWxsKCk7Ci19Ci0KLXZvaWQgSklUOjpl bWl0X29wX2dldF9nZW5lcmljX3Byb3BlcnR5X2VudW1lcmF0b3IoSW5zdHJ1Y3Rpb24qIGN1cnJl bnRJbnN0cnVjdGlvbikKLXsKLSAgICBKSVRTbG93UGF0aENhbGwgc2xvd1BhdGhDYWxsKHRoaXMs IGN1cnJlbnRJbnN0cnVjdGlvbiwgc2xvd19wYXRoX2dldF9nZW5lcmljX3Byb3BlcnR5X2VudW1l cmF0b3IpOwotICAgIHNsb3dQYXRoQ2FsbC5jYWxsKCk7Ci19Ci0KIHZvaWQgSklUOjplbWl0X29w X25leHRfZW51bWVyYXRvcl9wbmFtZShJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQog ewogICAgIGludCBkc3QgPSBjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kOwpAQCAtMTMy NCwxMiArMTI5MSw2IEBAIHZvaWQgSklUOjplbWl0X29wX25leHRfZW51bWVyYXRvcl9wbmFtZSgK ICAgICBlbWl0U3RvcmUoZHN0LCByZWdUMiwgcmVnVDApOwogfQogCi12b2lkIEpJVDo6ZW1pdF9v cF90b19pbmRleF9zdHJpbmcoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKLXsKLSAg ICBKSVRTbG93UGF0aENhbGwgc2xvd1BhdGhDYWxsKHRoaXMsIGN1cnJlbnRJbnN0cnVjdGlvbiwg c2xvd19wYXRoX3RvX2luZGV4X3N0cmluZyk7Ci0gICAgc2xvd1BhdGhDYWxsLmNhbGwoKTsKLX0K LQogdm9pZCBKSVQ6OmVtaXRfb3BfcHJvZmlsZV90eXBlKEluc3RydWN0aW9uKiBjdXJyZW50SW5z dHJ1Y3Rpb24pCiB7CiAgICAgVHlwZUxvY2F0aW9uKiBjYWNoZWRUeXBlTG9jYXRpb24gPSBjdXJy ZW50SW5zdHJ1Y3Rpb25bMl0udS5sb2NhdGlvbjsKQEAgLTEzOTQsMTMgKzEzNTUsNiBAQCB2b2lk IEpJVDo6ZW1pdF9vcF9wcm9maWxlX3R5cGUoSW5zdHJ1Y3RpCiAgICAganVtcFRvRW5kLmxpbmso dGhpcyk7CiB9CiAKLXZvaWQgSklUOjplbWl0X29wX3Byb2ZpbGVfY29udHJvbF9mbG93KEluc3Ry dWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCi17Ci0gICAgQmFzaWNCbG9ja0xvY2F0aW9uKiBi YXNpY0Jsb2NrTG9jYXRpb24gPSBjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5iYXNpY0Jsb2NrTG9j YXRpb247Ci0gICAgaWYgKCFiYXNpY0Jsb2NrTG9jYXRpb24tPmhhc0V4ZWN1dGVkKCkpCi0gICAg ICAgIGJhc2ljQmxvY2tMb2NhdGlvbi0+ZW1pdEV4ZWN1dGVDb2RlKCp0aGlzLCByZWdUMSk7Ci19 Ci0KIH0gLy8gbmFtZXNwYWNlIEpTQwogCiAjZW5kaWYgLy8gVVNFKEpTVkFMVUUzMl82NCkKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcAkocmV2aXNpb24gMTgw ODkwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTEyNiwxMiArMTEyNiw2IEBAIHZvaWQgSklUOjplbWl0X29wX25ld19hcnJh eV9idWZmZXIoSW5zdHIKIH0KIAogI2lmIFVTRShKU1ZBTFVFNjQpCi12b2lkIEpJVDo6ZW1pdF9v cF9nZXRfZW51bWVyYWJsZV9sZW5ndGgoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikK LXsKLSAgICBKSVRTbG93UGF0aENhbGwgc2xvd1BhdGhDYWxsKHRoaXMsIGN1cnJlbnRJbnN0cnVj dGlvbiwgc2xvd19wYXRoX2dldF9lbnVtZXJhYmxlX2xlbmd0aCk7Ci0gICAgc2xvd1BhdGhDYWxs LmNhbGwoKTsKLX0KLQogdm9pZCBKSVQ6OmVtaXRfb3BfaGFzX3N0cnVjdHVyZV9wcm9wZXJ0eShJ bnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQogewogICAgIGludCBkc3QgPSBjdXJyZW50 SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kOwpAQCAtMTE0OSwyMSArMTE0Myw2IEBAIHZvaWQgSklU OjplbWl0X29wX2hhc19zdHJ1Y3R1cmVfcHJvcGVydHkKICAgICBlbWl0UHV0VmlydHVhbFJlZ2lz dGVyKGRzdCk7CiB9CiAKLXZvaWQgSklUOjplbWl0U2xvd19vcF9oYXNfc3RydWN0dXJlX3Byb3Bl cnR5KEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24sIFZlY3RvcjxTbG93Q2FzZUVudHJ5 Pjo6aXRlcmF0b3ImIGl0ZXIpCi17Ci0gICAgbGlua1Nsb3dDYXNlKGl0ZXIpOwotICAgIGxpbmtT bG93Q2FzZShpdGVyKTsKLQotICAgIEpJVFNsb3dQYXRoQ2FsbCBzbG93UGF0aENhbGwodGhpcywg Y3VycmVudEluc3RydWN0aW9uLCBzbG93X3BhdGhfaGFzX3N0cnVjdHVyZV9wcm9wZXJ0eSk7Ci0g ICAgc2xvd1BhdGhDYWxsLmNhbGwoKTsKLX0KLQotdm9pZCBKSVQ6OmVtaXRfb3BfaGFzX2dlbmVy aWNfcHJvcGVydHkoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKLXsKLSAgICBKSVRT bG93UGF0aENhbGwgc2xvd1BhdGhDYWxsKHRoaXMsIGN1cnJlbnRJbnN0cnVjdGlvbiwgc2xvd19w YXRoX2hhc19nZW5lcmljX3Byb3BlcnR5KTsKLSAgICBzbG93UGF0aENhbGwuY2FsbCgpOwotfQot CiB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVIYXNJbmRleGVkUHJvcGVydHkoQnlWYWxJbmZvKiBi eVZhbEluZm8sIFJldHVybkFkZHJlc3NQdHIgcmV0dXJuQWRkcmVzcywgSklUQXJyYXlNb2RlIGFy cmF5TW9kZSkKIHsKICAgICBJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uID0gbV9jb2Rl QmxvY2stPmluc3RydWN0aW9ucygpLmJlZ2luKCkgKyBieVZhbEluZm8tPmJ5dGVjb2RlSW5kZXg7 CkBAIC0xMzEyLDE4ICsxMjkxLDYgQEAgdm9pZCBKSVQ6OmVtaXRTbG93X29wX2dldF9kaXJlY3Rf cG5hbWUoSQogICAgIHNsb3dQYXRoQ2FsbC5jYWxsKCk7CiB9CiAKLXZvaWQgSklUOjplbWl0X29w X2dldF9zdHJ1Y3R1cmVfcHJvcGVydHlfZW51bWVyYXRvcihJbnN0cnVjdGlvbiogY3VycmVudElu c3RydWN0aW9uKQotewotICAgIEpJVFNsb3dQYXRoQ2FsbCBzbG93UGF0aENhbGwodGhpcywgY3Vy cmVudEluc3RydWN0aW9uLCBzbG93X3BhdGhfZ2V0X3N0cnVjdHVyZV9wcm9wZXJ0eV9lbnVtZXJh dG9yKTsKLSAgICBzbG93UGF0aENhbGwuY2FsbCgpOwotfQotCi12b2lkIEpJVDo6ZW1pdF9vcF9n ZXRfZ2VuZXJpY19wcm9wZXJ0eV9lbnVtZXJhdG9yKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1 Y3Rpb24pCi17Ci0gICAgSklUU2xvd1BhdGhDYWxsIHNsb3dQYXRoQ2FsbCh0aGlzLCBjdXJyZW50 SW5zdHJ1Y3Rpb24sIHNsb3dfcGF0aF9nZXRfZ2VuZXJpY19wcm9wZXJ0eV9lbnVtZXJhdG9yKTsK LSAgICBzbG93UGF0aENhbGwuY2FsbCgpOwotfQotCiB2b2lkIEpJVDo6ZW1pdF9vcF9uZXh0X2Vu dW1lcmF0b3JfcG5hbWUoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKIHsKICAgICBp bnQgZHN0ID0gY3VycmVudEluc3RydWN0aW9uWzFdLnUub3BlcmFuZDsKQEAgLTEzNDcsMTIgKzEz MTQsNiBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9uZXh0X2VudW1lcmF0b3JfcG5hbWUoCiAgICAgZW1p dFB1dFZpcnR1YWxSZWdpc3Rlcihkc3QpOwogfQogCi12b2lkIEpJVDo6ZW1pdF9vcF90b19pbmRl eF9zdHJpbmcoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKLXsKLSAgICBKSVRTbG93 UGF0aENhbGwgc2xvd1BhdGhDYWxsKHRoaXMsIGN1cnJlbnRJbnN0cnVjdGlvbiwgc2xvd19wYXRo X3RvX2luZGV4X3N0cmluZyk7Ci0gICAgc2xvd1BhdGhDYWxsLmNhbGwoKTsKLX0KLQogdm9pZCBK SVQ6OmVtaXRfb3BfcHJvZmlsZV90eXBlKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24p CiB7CiAgICAgVHlwZUxvY2F0aW9uKiBjYWNoZWRUeXBlTG9jYXRpb24gPSBjdXJyZW50SW5zdHJ1 Y3Rpb25bMl0udS5sb2NhdGlvbjsKQEAgLTE0MTUsNiArMTM3Niw0NyBAQCB2b2lkIEpJVDo6ZW1p dF9vcF9wcm9maWxlX3R5cGUoSW5zdHJ1Y3RpCiAgICAganVtcFRvRW5kLmxpbmsodGhpcyk7CiB9 CiAKKyNlbmRpZiAvLyBVU0UoSlNWQUxVRTY0KQorCit2b2lkIEpJVDo6ZW1pdF9vcF9nZXRfZW51 bWVyYWJsZV9sZW5ndGgoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKK3sKKyAgICBK SVRTbG93UGF0aENhbGwgc2xvd1BhdGhDYWxsKHRoaXMsIGN1cnJlbnRJbnN0cnVjdGlvbiwgc2xv d19wYXRoX2dldF9lbnVtZXJhYmxlX2xlbmd0aCk7CisgICAgc2xvd1BhdGhDYWxsLmNhbGwoKTsK K30KKwordm9pZCBKSVQ6OmVtaXRTbG93X29wX2hhc19zdHJ1Y3R1cmVfcHJvcGVydHkoSW5zdHJ1 Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbiwgVmVjdG9yPFNsb3dDYXNlRW50cnk+OjppdGVyYXRv ciYgaXRlcikKK3sKKyAgICBsaW5rU2xvd0Nhc2UoaXRlcik7CisgICAgbGlua1Nsb3dDYXNlKGl0 ZXIpOworCisgICAgSklUU2xvd1BhdGhDYWxsIHNsb3dQYXRoQ2FsbCh0aGlzLCBjdXJyZW50SW5z dHJ1Y3Rpb24sIHNsb3dfcGF0aF9oYXNfc3RydWN0dXJlX3Byb3BlcnR5KTsKKyAgICBzbG93UGF0 aENhbGwuY2FsbCgpOworfQorCit2b2lkIEpJVDo6ZW1pdF9vcF9oYXNfZ2VuZXJpY19wcm9wZXJ0 eShJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQoreworICAgIEpJVFNsb3dQYXRoQ2Fs bCBzbG93UGF0aENhbGwodGhpcywgY3VycmVudEluc3RydWN0aW9uLCBzbG93X3BhdGhfaGFzX2dl bmVyaWNfcHJvcGVydHkpOworICAgIHNsb3dQYXRoQ2FsbC5jYWxsKCk7Cit9CisKK3ZvaWQgSklU OjplbWl0X29wX2dldF9zdHJ1Y3R1cmVfcHJvcGVydHlfZW51bWVyYXRvcihJbnN0cnVjdGlvbiog Y3VycmVudEluc3RydWN0aW9uKQoreworICAgIEpJVFNsb3dQYXRoQ2FsbCBzbG93UGF0aENhbGwo dGhpcywgY3VycmVudEluc3RydWN0aW9uLCBzbG93X3BhdGhfZ2V0X3N0cnVjdHVyZV9wcm9wZXJ0 eV9lbnVtZXJhdG9yKTsKKyAgICBzbG93UGF0aENhbGwuY2FsbCgpOworfQorCit2b2lkIEpJVDo6 ZW1pdF9vcF9nZXRfZ2VuZXJpY19wcm9wZXJ0eV9lbnVtZXJhdG9yKEluc3RydWN0aW9uKiBjdXJy ZW50SW5zdHJ1Y3Rpb24pCit7CisgICAgSklUU2xvd1BhdGhDYWxsIHNsb3dQYXRoQ2FsbCh0aGlz LCBjdXJyZW50SW5zdHJ1Y3Rpb24sIHNsb3dfcGF0aF9nZXRfZ2VuZXJpY19wcm9wZXJ0eV9lbnVt ZXJhdG9yKTsKKyAgICBzbG93UGF0aENhbGwuY2FsbCgpOworfQorCit2b2lkIEpJVDo6ZW1pdF9v cF90b19pbmRleF9zdHJpbmcoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKK3sKKyAg ICBKSVRTbG93UGF0aENhbGwgc2xvd1BhdGhDYWxsKHRoaXMsIGN1cnJlbnRJbnN0cnVjdGlvbiwg c2xvd19wYXRoX3RvX2luZGV4X3N0cmluZyk7CisgICAgc2xvd1BhdGhDYWxsLmNhbGwoKTsKK30K Kwogdm9pZCBKSVQ6OmVtaXRfb3BfcHJvZmlsZV9jb250cm9sX2Zsb3coSW5zdHJ1Y3Rpb24qIGN1 cnJlbnRJbnN0cnVjdGlvbikKIHsKICAgICBCYXNpY0Jsb2NrTG9jYXRpb24qIGJhc2ljQmxvY2tM b2NhdGlvbiA9IGN1cnJlbnRJbnN0cnVjdGlvblsxXS51LmJhc2ljQmxvY2tMb2NhdGlvbjsKQEAg LTE0MjIsOCArMTQyNCw2IEBAIHZvaWQgSklUOjplbWl0X29wX3Byb2ZpbGVfY29udHJvbF9mbG93 KEkKICAgICAgICAgYmFzaWNCbG9ja0xvY2F0aW9uLT5lbWl0RXhlY3V0ZUNvZGUoKnRoaXMsIHJl Z1QxKTsKIH0KIAotI2VuZGlmIC8vIFVTRShKU1ZBTFVFNjQpCi0KIH0gLy8gbmFtZXNwYWNlIEpT QwogCiAjZW5kaWYgLy8gRU5BQkxFKEpJVCkK