226121 2021-05-21 16:20:39 -0700 Remove the unnecessary use of CompileOpStrictEqType. 2021-05-21 17:47:20 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff rmorisset saam tzagallo webkit-bug-importer oldest_to_newest 1762646 0 mark.lam 2021-05-21 16:20:39 -0700 We're already emitting template code. Might as well make the CompileOpStrictEqType condition checks a build time check instead of a runtime check. 1762649 1 429359 mark.lam 2021-05-21 16:26:19 -0700 Created attachment 429359 proposed patch. 1762652 2 rmorisset 2021-05-21 16:28:50 -0700 r=me too 1762695 3 mark.lam 2021-05-21 17:46:39 -0700 Thanks for the reviews. Landed in r277902: <http://trac.webkit.org/r277902>. 1762696 4 webkit-bug-importer 2021-05-21 17:47:20 -0700 <rdar://problem/78336705> 429359 2021-05-21 16:26:19 -0700 2021-05-21 16:27:49 -0700 proposed patch. bug-226121.patch text/plain 9093 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc3ODk3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDIxLTA1LTIxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW1vdmUgdGhlIHVubmVjZXNzYXJ5IHVzZSBvZiBDb21waWxlT3BTdHJpY3RFcVR5cGUuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYxMjEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSdyZSBhbHJlYWR5 IGVtaXR0aW5nIHRlbXBsYXRlIGNvZGUuICBNaWdodCBhcyB3ZWxsIG1ha2UgdGhlIHJlbGV2YW50 IGNvbmRpdGlvbgorICAgICAgICBjaGVja3MgYSBidWlsZCB0aW1lIGNoZWNrIG9uIHRoZSBvcGNv ZGUgdHlwZSB0aGUgdGVtcGxhdGUgaXMgc3BlY2lhbGl6aW5nIG9uCisgICAgICAgIGluc3RlYWQg b2YgYSBydW50aW1lIGNoZWNrIG9uIGEgcGFzc2VkIGluIENvbXBpbGVPcFN0cmljdEVxVHlwZS4K KworICAgICAgICAqIGppdC9KSVQuaDoKKyAgICAgICAgKiBqaXQvSklUT3Bjb2Rlcy5jcHA6Cisg ICAgICAgIChKU0M6OkpJVDo6Y29tcGlsZU9wU3RyaWN0RXEpOgorICAgICAgICAoSlNDOjpKSVQ6 OmVtaXRfb3Bfc3RyaWN0ZXEpOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfbnN0cmljdGVx KToKKyAgICAgICAgKEpTQzo6SklUOjpjb21waWxlT3BTdHJpY3RFcUp1bXApOgorICAgICAgICAo SlNDOjpKSVQ6OmVtaXRfb3BfanN0cmljdGVxKToKKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29w X2puc3RyaWN0ZXEpOgorICAgICAgICAqIGppdC9KSVRPcGNvZGVzMzJfNjQuY3BwOgorICAgICAg ICAoSlNDOjpKSVQ6OmNvbXBpbGVPcFN0cmljdEVxKToKKyAgICAgICAgKEpTQzo6SklUOjplbWl0 X29wX3N0cmljdGVxKToKKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29wX25zdHJpY3RlcSk6Cisg ICAgICAgIChKU0M6OkpJVDo6Y29tcGlsZU9wU3RyaWN0RXFKdW1wKToKKyAgICAgICAgKEpTQzo6 SklUOjplbWl0X29wX2pzdHJpY3RlcSk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9qbnN0 cmljdGVxKToKKwogMjAyMS0wNS0yMSAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAK ICAgICAgICAgSW50cm9kdWNpbmcgSklUVGh1bmtzOjpwcmVpbml0aWFsaXplQ1RJVGh1bmtzKCku CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmgJKHJldmlzaW9uIDI3Nzg5NSkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmgJKHdvcmtpbmcgY29weSkKQEAgLTM1MywxMSArMzUz LDggQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIE9wPgogICAg ICAgICB2b2lkIGVtaXRQdXRDYWxsUmVzdWx0KGNvbnN0IE9wJik7CiAKLSAgICAgICAgZW51bSBj bGFzcyBDb21waWxlT3BTdHJpY3RFcVR5cGUgeyBTdHJpY3RFcSwgTlN0cmljdEVxIH07Ci0gICAg ICAgIHRlbXBsYXRlPHR5cGVuYW1lIE9wPgotICAgICAgICB2b2lkIGNvbXBpbGVPcFN0cmljdEVx KGNvbnN0IEluc3RydWN0aW9uKiwgQ29tcGlsZU9wU3RyaWN0RXFUeXBlKTsKLSAgICAgICAgdGVt cGxhdGU8dHlwZW5hbWUgT3A+Ci0gICAgICAgIHZvaWQgY29tcGlsZU9wU3RyaWN0RXFKdW1wKGNv bnN0IEluc3RydWN0aW9uKiwgQ29tcGlsZU9wU3RyaWN0RXFUeXBlKTsKKyAgICAgICAgdGVtcGxh dGU8dHlwZW5hbWUgT3A+IHZvaWQgY29tcGlsZU9wU3RyaWN0RXEoY29uc3QgSW5zdHJ1Y3Rpb24q KTsKKyAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgT3A+IHZvaWQgY29tcGlsZU9wU3RyaWN0RXFK dW1wKGNvbnN0IEluc3RydWN0aW9uKik7CiAgICAgICAgIGVudW0gY2xhc3MgQ29tcGlsZU9wRXFU eXBlIHsgRXEsIE5FcSB9OwogICAgICAgICB2b2lkIGNvbXBpbGVPcEVxSnVtcFNsb3coVmVjdG9y PFNsb3dDYXNlRW50cnk+OjppdGVyYXRvciYsIENvbXBpbGVPcEVxVHlwZSwgaW50IGp1bXBUYXJn ZXQpOwogICAgICAgICBib29sIGlzT3BlcmFuZENvbnN0YW50RG91YmxlKFZpcnR1YWxSZWdpc3Rl cik7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMzMl82NC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzMzJfNjQu Y3BwCShyZXZpc2lvbiAyNzc4OTUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9w Y29kZXMzMl82NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY3Nyw3ICs2NzcsNyBAQCB2b2lkIEpJ VDo6ZW1pdFNsb3dfb3Bfam5lcShjb25zdCBJbnN0cnVjCiB9CiAKIHRlbXBsYXRlIDx0eXBlbmFt ZSBPcD4KLXZvaWQgSklUOjpjb21waWxlT3BTdHJpY3RFcShjb25zdCBJbnN0cnVjdGlvbiogY3Vy cmVudEluc3RydWN0aW9uLCBDb21waWxlT3BTdHJpY3RFcVR5cGUgdHlwZSkKK3ZvaWQgSklUOjpj b21waWxlT3BTdHJpY3RFcShjb25zdCBJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQog ewogICAgIGF1dG8gYnl0ZWNvZGUgPSBjdXJyZW50SW5zdHJ1Y3Rpb24tPmFzPE9wPigpOwogICAg IFZpcnR1YWxSZWdpc3RlciBkc3QgPSBieXRlY29kZS5tX2RzdDsKQEAgLTY5OCw3ICs2OTgsNyBA QCB2b2lkIEpJVDo6Y29tcGlsZU9wU3RyaWN0RXEoY29uc3QgSW5zdHJ1CiAgICAgZmlyc3RJc09i amVjdC5saW5rKHRoaXMpOwogCiAgICAgLy8gU2ltcGx5IGNvbXBhcmUgdGhlIHBheWxvYWRzLgot ICAgIGlmICh0eXBlID09IENvbXBpbGVPcFN0cmljdEVxVHlwZTo6U3RyaWN0RXEpCisgICAgaWYg Y29uc3RleHByIChzdGQ6OmlzX3NhbWU8T3AsIE9wU3RyaWN0ZXE+Ojp2YWx1ZSkKICAgICAgICAg Y29tcGFyZTMyKEVxdWFsLCByZWdUMCwgcmVnVDIsIHJlZ1QwKTsKICAgICBlbHNlCiAgICAgICAg IGNvbXBhcmUzMihOb3RFcXVhbCwgcmVnVDAsIHJlZ1QyLCByZWdUMCk7CkBAIC03MDgsMTYgKzcw OCwxNiBAQCB2b2lkIEpJVDo6Y29tcGlsZU9wU3RyaWN0RXEoY29uc3QgSW5zdHJ1CiAKIHZvaWQg SklUOjplbWl0X29wX3N0cmljdGVxKGNvbnN0IEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rp b24pCiB7Ci0gICAgY29tcGlsZU9wU3RyaWN0RXE8T3BTdHJpY3RlcT4oY3VycmVudEluc3RydWN0 aW9uLCBDb21waWxlT3BTdHJpY3RFcVR5cGU6OlN0cmljdEVxKTsKKyAgICBjb21waWxlT3BTdHJp Y3RFcTxPcFN0cmljdGVxPihjdXJyZW50SW5zdHJ1Y3Rpb24pOwogfQogCiB2b2lkIEpJVDo6ZW1p dF9vcF9uc3RyaWN0ZXEoY29uc3QgSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKIHsK LSAgICBjb21waWxlT3BTdHJpY3RFcTxPcE5zdHJpY3RlcT4oY3VycmVudEluc3RydWN0aW9uLCBD b21waWxlT3BTdHJpY3RFcVR5cGU6Ok5TdHJpY3RFcSk7CisgICAgY29tcGlsZU9wU3RyaWN0RXE8 T3BOc3RyaWN0ZXE+KGN1cnJlbnRJbnN0cnVjdGlvbik7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1l IE9wPgotdm9pZCBKSVQ6OmNvbXBpbGVPcFN0cmljdEVxSnVtcChjb25zdCBJbnN0cnVjdGlvbiog Y3VycmVudEluc3RydWN0aW9uLCBDb21waWxlT3BTdHJpY3RFcVR5cGUgdHlwZSkKK3ZvaWQgSklU Ojpjb21waWxlT3BTdHJpY3RFcUp1bXAoY29uc3QgSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVj dGlvbikKIHsKICAgICBhdXRvIGJ5dGVjb2RlID0gY3VycmVudEluc3RydWN0aW9uLT5hczxPcD4o KTsKICAgICBpbnQgdGFyZ2V0ID0ganVtcFRhcmdldChjdXJyZW50SW5zdHJ1Y3Rpb24sIGJ5dGVj b2RlLm1fdGFyZ2V0TGFiZWwpOwpAQCAtNzM4LDcgKzczOCw3IEBAIHZvaWQgSklUOjpjb21waWxl T3BTdHJpY3RFcUp1bXAoY29uc3QgSW4KICAgICBmaXJzdElzT2JqZWN0LmxpbmsodGhpcyk7CiAK ICAgICAvLyBTaW1wbHkgY29tcGFyZSB0aGUgcGF5bG9hZHMuCi0gICAgaWYgKHR5cGUgPT0gQ29t cGlsZU9wU3RyaWN0RXFUeXBlOjpTdHJpY3RFcSkKKyAgICBpZiBjb25zdGV4cHIgKHN0ZDo6aXNf c2FtZTxPcCwgT3BKc3RyaWN0ZXE+Ojp2YWx1ZSkKICAgICAgICAgYWRkSnVtcChicmFuY2gzMihF cXVhbCwgcmVnVDAsIHJlZ1QyKSwgdGFyZ2V0KTsKICAgICBlbHNlCiAgICAgICAgIGFkZEp1bXAo YnJhbmNoMzIoTm90RXF1YWwsIHJlZ1QwLCByZWdUMiksIHRhcmdldCk7CkBAIC03NDYsMTIgKzc0 NiwxMiBAQCB2b2lkIEpJVDo6Y29tcGlsZU9wU3RyaWN0RXFKdW1wKGNvbnN0IEluCiAKIHZvaWQg SklUOjplbWl0X29wX2pzdHJpY3RlcShjb25zdCBJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0 aW9uKQogewotICAgIGNvbXBpbGVPcFN0cmljdEVxSnVtcDxPcEpzdHJpY3RlcT4oY3VycmVudElu c3RydWN0aW9uLCBDb21waWxlT3BTdHJpY3RFcVR5cGU6OlN0cmljdEVxKTsKKyAgICBjb21waWxl T3BTdHJpY3RFcUp1bXA8T3BKc3RyaWN0ZXE+KGN1cnJlbnRJbnN0cnVjdGlvbik7CiB9CiAKIHZv aWQgSklUOjplbWl0X29wX2puc3RyaWN0ZXEoY29uc3QgSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0 cnVjdGlvbikKIHsKLSAgICBjb21waWxlT3BTdHJpY3RFcUp1bXA8T3BKbnN0cmljdGVxPihjdXJy ZW50SW5zdHJ1Y3Rpb24sIENvbXBpbGVPcFN0cmljdEVxVHlwZTo6TlN0cmljdEVxKTsKKyAgICBj b21waWxlT3BTdHJpY3RFcUp1bXA8T3BKbnN0cmljdGVxPihjdXJyZW50SW5zdHJ1Y3Rpb24pOwog fQogCiB2b2lkIEpJVDo6ZW1pdFNsb3dfb3BfanN0cmljdGVxKGNvbnN0IEluc3RydWN0aW9uKiBj dXJyZW50SW5zdHJ1Y3Rpb24sIFZlY3RvcjxTbG93Q2FzZUVudHJ5Pjo6aXRlcmF0b3ImIGl0ZXIp CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5jcHAJKHJldmlzaW9u IDI3Nzg5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTY0OCw3ICs2NDgsNyBAQCBNYWNyb0Fzc2VtYmxlckNvZGVSZWY8SklU VGh1bmtQdHJUYWc+IEpJCiAjZW5kaWYgLy8gRU5BQkxFKEVYVFJBX0NUSV9USFVOS1MpCiAKIHRl bXBsYXRlPHR5cGVuYW1lIE9wPgotdm9pZCBKSVQ6OmNvbXBpbGVPcFN0cmljdEVxKGNvbnN0IElu c3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24sIENvbXBpbGVPcFN0cmljdEVxVHlwZSB0eXBl KQordm9pZCBKSVQ6OmNvbXBpbGVPcFN0cmljdEVxKGNvbnN0IEluc3RydWN0aW9uKiBjdXJyZW50 SW5zdHJ1Y3Rpb24pCiB7CiAgICAgYXV0byBieXRlY29kZSA9IGN1cnJlbnRJbnN0cnVjdGlvbi0+ YXM8T3A+KCk7CiAgICAgVmlydHVhbFJlZ2lzdGVyIGRzdCA9IGJ5dGVjb2RlLm1fZHN0OwpAQCAt NjkzLDcgKzY5Myw3IEBAIHZvaWQgSklUOjpjb21waWxlT3BTdHJpY3RFcShjb25zdCBJbnN0cnUK ICAgICBhZGRTbG93Q2FzZShicmFuY2hJZkNlbGwocmVnVDIpKTsKIAogICAgIGRvbmUubGluayh0 aGlzKTsKLSAgICBpZiAodHlwZSA9PSBDb21waWxlT3BTdHJpY3RFcVR5cGU6Ok5TdHJpY3RFcSkK KyAgICBpZiBjb25zdGV4cHIgKHN0ZDo6aXNfc2FtZTxPcCwgT3BOc3RyaWN0ZXE+Ojp2YWx1ZSkK ICAgICAgICAgeG9yNjQoVHJ1c3RlZEltbTY0KDEpLCByZWdUNSk7CiAgICAgYm94Qm9vbGVhbihy ZWdUNSwgSlNWYWx1ZVJlZ3MgeyByZWdUNSB9KTsKICAgICBlbWl0UHV0VmlydHVhbFJlZ2lzdGVy KGRzdCwgcmVnVDUpOwpAQCAtNzEyLDcgKzcxMiw3IEBAIHZvaWQgSklUOjpjb21waWxlT3BTdHJp Y3RFcShjb25zdCBJbnN0cnUKICAgICBhZGRTbG93Q2FzZShicmFuY2hJZk51bWJlcihyZWdUMSkp OwogICAgIHJpZ2h0T0subGluayh0aGlzKTsKIAotICAgIGlmICh0eXBlID09IENvbXBpbGVPcFN0 cmljdEVxVHlwZTo6U3RyaWN0RXEpCisgICAgaWYgY29uc3RleHByIChzdGQ6OmlzX3NhbWU8T3As IE9wU3RyaWN0ZXE+Ojp2YWx1ZSkKICAgICAgICAgY29tcGFyZTY0KEVxdWFsLCByZWdUMSwgcmVn VDAsIHJlZ1QwKTsKICAgICBlbHNlCiAgICAgICAgIGNvbXBhcmU2NChOb3RFcXVhbCwgcmVnVDEs IHJlZ1QwLCByZWdUMCk7CkBAIC03MjQsMTYgKzcyNCwxNiBAQCB2b2lkIEpJVDo6Y29tcGlsZU9w U3RyaWN0RXEoY29uc3QgSW5zdHJ1CiAKIHZvaWQgSklUOjplbWl0X29wX3N0cmljdGVxKGNvbnN0 IEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiB7Ci0gICAgY29tcGlsZU9wU3RyaWN0 RXE8T3BTdHJpY3RlcT4oY3VycmVudEluc3RydWN0aW9uLCBDb21waWxlT3BTdHJpY3RFcVR5cGU6 OlN0cmljdEVxKTsKKyAgICBjb21waWxlT3BTdHJpY3RFcTxPcFN0cmljdGVxPihjdXJyZW50SW5z dHJ1Y3Rpb24pOwogfQogCiB2b2lkIEpJVDo6ZW1pdF9vcF9uc3RyaWN0ZXEoY29uc3QgSW5zdHJ1 Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKIHsKLSAgICBjb21waWxlT3BTdHJpY3RFcTxPcE5z dHJpY3RlcT4oY3VycmVudEluc3RydWN0aW9uLCBDb21waWxlT3BTdHJpY3RFcVR5cGU6Ok5TdHJp Y3RFcSk7CisgICAgY29tcGlsZU9wU3RyaWN0RXE8T3BOc3RyaWN0ZXE+KGN1cnJlbnRJbnN0cnVj dGlvbik7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIE9wPgotdm9pZCBKSVQ6OmNvbXBpbGVPcFN0 cmljdEVxSnVtcChjb25zdCBJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uLCBDb21waWxl T3BTdHJpY3RFcVR5cGUgdHlwZSkKK3ZvaWQgSklUOjpjb21waWxlT3BTdHJpY3RFcUp1bXAoY29u c3QgSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKIHsKICAgICBhdXRvIGJ5dGVjb2Rl ID0gY3VycmVudEluc3RydWN0aW9uLT5hczxPcD4oKTsKICAgICBpbnQgdGFyZ2V0ID0ganVtcFRh cmdldChjdXJyZW50SW5zdHJ1Y3Rpb24sIGJ5dGVjb2RlLm1fdGFyZ2V0TGFiZWwpOwpAQCAtNzY3 LDcgKzc2Nyw3IEBAIHZvaWQgSklUOjpjb21waWxlT3BTdHJpY3RFcUp1bXAoY29uc3QgSW4KICAg ICBhZGRTbG93Q2FzZShicmFuY2g2NChBYm92ZU9yRXF1YWwsIHJlZ1QzLCByZWdUNSkpOwogCiAg ICAgSnVtcCBhcmVFcXVhbCA9IGJyYW5jaDY0KEVxdWFsLCByZWdUMCwgcmVnVDEpOwotICAgIGlm ICh0eXBlID09IENvbXBpbGVPcFN0cmljdEVxVHlwZTo6U3RyaWN0RXEpCisgICAgaWYgY29uc3Rl eHByIChzdGQ6OmlzX3NhbWU8T3AsIE9wSnN0cmljdGVxPjo6dmFsdWUpCiAgICAgICAgIGFkZEp1 bXAoYXJlRXF1YWwsIHRhcmdldCk7CiAKICAgICBtb3ZlKHJlZ1QwLCByZWdUMik7CkBAIC03NzYs NyArNzc2LDcgQEAgdm9pZCBKSVQ6OmNvbXBpbGVPcFN0cmljdEVxSnVtcChjb25zdCBJbgogICAg IC8vIEZJWE1FOiB3ZSBjb3VsZCBkbyBzb21ldGhpbmcgbW9yZSBwcmVjaXNlOiB1bmxlc3MgdGhl cmUgaXMgYSBCaWdJbnQzMiwgd2Ugb25seSBuZWVkIHRvIGRvIHRoZSBzbG93IHBhdGggaWYgYm90 aCBhcmUgc3RyaW5ncwogICAgIGFkZFNsb3dDYXNlKGJyYW5jaElmQ2VsbChyZWdUMikpOwogCi0g ICAgaWYgKHR5cGUgPT0gQ29tcGlsZU9wU3RyaWN0RXFUeXBlOjpOU3RyaWN0RXEpIHsKKyAgICBp ZiBjb25zdGV4cHIgKHN0ZDo6aXNfc2FtZTxPcCwgT3BKbnN0cmljdGVxPjo6dmFsdWUpIHsKICAg ICAgICAgYWRkSnVtcChqdW1wKCksIHRhcmdldCk7CiAgICAgICAgIGFyZUVxdWFsLmxpbmsodGhp cyk7CiAgICAgfQpAQCAtNzk0LDcgKzc5NCw3IEBAIHZvaWQgSklUOjpjb21waWxlT3BTdHJpY3RF cUp1bXAoY29uc3QgSW4KICAgICBKdW1wIHJpZ2h0T0sgPSBicmFuY2hJZkludDMyKHJlZ1QxKTsK ICAgICBhZGRTbG93Q2FzZShicmFuY2hJZk51bWJlcihyZWdUMSkpOwogICAgIHJpZ2h0T0subGlu ayh0aGlzKTsKLSAgICBpZiAodHlwZSA9PSBDb21waWxlT3BTdHJpY3RFcVR5cGU6OlN0cmljdEVx KQorICAgIGlmIGNvbnN0ZXhwciAoc3RkOjppc19zYW1lPE9wLCBPcEpzdHJpY3RlcT46OnZhbHVl KQogICAgICAgICBhZGRKdW1wKGJyYW5jaDY0KEVxdWFsLCByZWdUMSwgcmVnVDApLCB0YXJnZXQp OwogICAgIGVsc2UKICAgICAgICAgYWRkSnVtcChicmFuY2g2NChOb3RFcXVhbCwgcmVnVDEsIHJl Z1QwKSwgdGFyZ2V0KTsKQEAgLTgwMywxMiArODAzLDEyIEBAIHZvaWQgSklUOjpjb21waWxlT3BT dHJpY3RFcUp1bXAoY29uc3QgSW4KIAogdm9pZCBKSVQ6OmVtaXRfb3BfanN0cmljdGVxKGNvbnN0 IEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiB7Ci0gICAgY29tcGlsZU9wU3RyaWN0 RXFKdW1wPE9wSnN0cmljdGVxPihjdXJyZW50SW5zdHJ1Y3Rpb24sIENvbXBpbGVPcFN0cmljdEVx VHlwZTo6U3RyaWN0RXEpOworICAgIGNvbXBpbGVPcFN0cmljdEVxSnVtcDxPcEpzdHJpY3RlcT4o Y3VycmVudEluc3RydWN0aW9uKTsKIH0KIAogdm9pZCBKSVQ6OmVtaXRfb3Bfam5zdHJpY3RlcShj b25zdCBJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQogewotICAgIGNvbXBpbGVPcFN0 cmljdEVxSnVtcDxPcEpuc3RyaWN0ZXE+KGN1cnJlbnRJbnN0cnVjdGlvbiwgQ29tcGlsZU9wU3Ry aWN0RXFUeXBlOjpOU3RyaWN0RXEpOworICAgIGNvbXBpbGVPcFN0cmljdEVxSnVtcDxPcEpuc3Ry aWN0ZXE+KGN1cnJlbnRJbnN0cnVjdGlvbik7CiB9CiAKIHZvaWQgSklUOjplbWl0U2xvd19vcF9q c3RyaWN0ZXEoY29uc3QgSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbiwgVmVjdG9yPFNs b3dDYXNlRW50cnk+OjppdGVyYXRvciYgaXRlcikK