232754 2021-11-05 05:43:20 -0700 When inlining NewSymbol in the DFG don't universally call ToString on the input 2021-11-09 12:50:19 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build PC Linux RESOLVED FIXED InRadar P2 Normal --- 1 lukas.bernhard saam ews-watchlist keith_miller lukas.bernhard mark.lam msaboff rmorisset saam tzagallo webkit-bug-importer oldest_to_newest 1812109 0 lukas.bernhard 2021-11-05 05:43:20 -0700 During differential testing of webkit I found a sample triggering a miscomputation in the baseline execution. The sample is larger than I'd like it to be, unfortunately all further minimizations I attempted did break the differential behavior. The sample is invoked as: WebKitBuild/Release/bin/jsc --validateOptions=true --useConcurrentJIT=false --useConcurrentGC=false --thresholdForJITSoon=10 --thresholdForJITAfterWarmUp=10 --thresholdForOptimizeAfterWarmUp=100 --thresholdForOptimizeAfterLongWarmUp=100 --thresholdForOptimizeSoon=100 --thresholdForFTLOptimizeAfterWarmUp=1000 --thresholdForFTLOptimizeSoon=1000 --validateBCE=true --useFTLJIT=true sample.js function main() { let v83; let v102; const v30 = []; for (let v56 = 0; v56 < 80; v56++) { let v57 = 0; const v59 = []; const v61 = []; v63 = [0.0]; function v65(v66,v67,v68) { const v69 = v63 * v30; const v70 = Uint16Array; let v72 = 0; const v76 = [0,0,v61,0]; const v78 = []; v79 = {__proto__:[], length:"a"}; const v81 = [0,0,v79,v76]; v83 = [v65]; Reflect.apply(v81.map,v67,[v65]); for (const v86 of v68) { v87 = v59 << v86; const v91 = new Int32Array(0); const v92 = undefined; const v94 = Symbol(undefined); v102 = v94.description; v57++; } } const v105 = v65(0.0,"aaaa",v63); } print(v102); // undefined with and without FTL print(typeof v102); // string without FTL, undefined with FTL (also undefined in spidermonkey) } main(); 1812656 1 saam 2021-11-08 09:43:38 -0800 I can't reproduce this on r285408. Can you still reproduce it? 1812812 2 lukas.bernhard 2021-11-08 13:39:24 -0800 The issue still reproduces for me on git 016f88c15b9bf0ebae0090babdad6a34e783d1b5 Just in case it somehow depends on build options, here are the ones I used: ./Tools/Scripts/build-jsc --jsc-only --release --cmakeargs="-ENABLE_STATIC_JSC=ON -DCMAKE_C_COMPILER='/usr/bin/clang-12' -DCMAKE_CXX_COMPILER='/usr/bin/clang++-12' -DCMAKE_CXX_FLAGS='-fsanitize-coverage=trace-pc-guard -O3 -lrt -fuse-ld=lld'" 1812904 3 saam 2021-11-08 16:06:26 -0800 Thanks, I can reproduce it. I must've been running it with the wrong option earlier. 1812934 4 443634 saam 2021-11-08 17:14:17 -0800 Created attachment 443634 Patch 1812947 5 443634 rmorisset 2021-11-08 17:31:47 -0800 Comment on attachment 443634 Patch r=me 1813269 6 ews-feeder 2021-11-09 12:49:49 -0800 Committed r285525 (244042@main): <https://commits.webkit.org/244042@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443634. 1813270 7 webkit-bug-importer 2021-11-09 12:50:19 -0800 <rdar://problem/85215832> 443634 2021-11-08 17:14:17 -0800 2021-11-09 12:49:51 -0800 Patch a-backup.diff text/plain 12696 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyODU0NDgpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDIxLTExLTA4ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIFdoZW4gaW5saW5pbmcgTmV3U3ltYm9sIGluIHRoZSBERkcgZG9uJ3Qg dW5pdmVyc2FsbHkgY2FsbCBUb1N0cmluZyBvbiB0aGUgaW5wdXQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc1NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3RyZXNzL2lubGluZS1uZXctc3ltYm9s LWRmZy11bmRlZmluZWQtZmlyc3QtYXJnLmpzOiBBZGRlZC4KKyAgICAgICAgKGFzc2VydCk6Cisg ICAgICAgIChmb28pOgorCiAyMDIxLTExLTA4ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBs ZS5jb20+CiAKICAgICAgICAgW0pTQ10gSW1wbGVtZW50IEludGxOdW1iZXJGb3JtYXQgdjMKSW5k ZXg6IEpTVGVzdHMvc3RyZXNzL2lubGluZS1uZXctc3ltYm9sLWRmZy11bmRlZmluZWQtZmlyc3Qt YXJnLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvc3RyZXNzL2lubGluZS1uZXctc3ltYm9sLWRm Zy11bmRlZmluZWQtZmlyc3QtYXJnLmpzCShub25leGlzdGVudCkKKysrIEpTVGVzdHMvc3RyZXNz L2lubGluZS1uZXctc3ltYm9sLWRmZy11bmRlZmluZWQtZmlyc3QtYXJnLmpzCSh3b3JraW5nIGNv cHkpCkBAIC0wLDAgKzEsMTMgQEAKK2Z1bmN0aW9uIGFzc2VydChiKSB7CisgICAgaWYgKCFiKQor ICAgICAgICB0aHJvdyBuZXcgRXJyb3I7Cit9CisKK2Z1bmN0aW9uIGZvbyhhcmcpIHsKKyAgICBy ZXR1cm4gU3ltYm9sKGFyZyk7Cit9Citub0lubGluZShmb28pOworCitmb3IgKGxldCBpID0gMDsg aSA8IDEwMDAwOyArK2kpIHsKKyAgICBhc3NlcnQoZm9vKHVuZGVmaW5lZCkuZGVzY3JpcHRpb24g PT09IHVuZGVmaW5lZCk7Cit9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9u IDI4NTQwOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwzNSBAQAorMjAyMS0xMS0wOCAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFw cGxlLmNvbT4KKworICAgICAgICBXaGVuIGlubGluaW5nIE5ld1N5bWJvbCBpbiB0aGUgREZHIGRv bid0IHVuaXZlcnNhbGx5IGNhbGwgVG9TdHJpbmcgb24gdGhlIGlucHV0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI3NTQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGlubGluaW5nIFN5bWJvbCh4 KSBpbiB0aGUgREZHLCB3ZSB3ZXJlIGFsd2F5cyBjYWxsaW5nIFRvU3RyaW5nIG9uIHguCisgICAg ICAgIEhvd2V2ZXIsIHRoaXMgaXMgd3Jvbmcgc3BlYyB3aXNlLiBJZiB4IGlzIHVuZGVmaW5lZCwg dGhlIHN5bWJvbCBzaG91bGQKKyAgICAgICAgcHJvZHVjZSBhIGRlc2NyaXB0aW9uIHZhbHVlIG9m IGB1bmRlZmluZWRgLCBidXQgY2FsbGluZyBUb1N0cmluZyBvbiB4IHdhcyBjYXVzaW5nCisgICAg ICAgIHVzIHRvIHByb2R1Y2UgYSBkZXNjcmlwdGlvbiB3aXRoIHRoZSBzdHJpbmcgYCJ1bmRlZmlu ZWQiYC4KKworICAgICAgICAqIGRmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oOgor ICAgICAgICAoSlNDOjpERkc6OkFic3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RTdGF0ZVR5cGU+ OjpleGVjdXRlRWZmZWN0cyk6CisgICAgICAgICogZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoK KyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6aGFuZGxlQ29uc3RhbnRJbnRlcm5h bEZ1bmN0aW9uKToKKyAgICAgICAgKiBkZmcvREZHQ2xvYmJlcml6ZS5oOgorICAgICAgICAoSlND OjpERkc6OmNsb2JiZXJpemUpOgorICAgICAgICAqIGRmZy9ERkdDbG9iYmVyc0V4aXRTdGF0ZS5j cHA6CisgICAgICAgIChKU0M6OkRGRzo6Y2xvYmJlcnNFeGl0U3RhdGUpOgorICAgICAgICAqIGRm Zy9ERkdGaXh1cFBoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpGaXh1cFBoYXNlOjpmaXh1 cE5vZGUpOgorICAgICAgICAqIGRmZy9ERkdNYXlFeGl0LmNwcDoKKyAgICAgICAgKiBkZmcvREZH Tm9kZVR5cGUuaDoKKyAgICAgICAgKiBkZmcvREZHT3BlcmF0aW9ucy5jcHA6CisgICAgICAgIChK U0M6OkRGRzo6SlNDX0RFRklORV9KSVRfT1BFUkFUSU9OKToKKyAgICAgICAgKiBkZmcvREZHT3Bl cmF0aW9ucy5oOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6CisgICAgICAg IChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVOZXdTeW1ib2wpOgorICAgICAgICAq IGZ0bC9GVExMb3dlckRGR1RvQjMuY3BwOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJE RkdUb0IzOjpjb21waWxlTmV3U3ltYm9sKToKKwogMjAyMS0xMS0wOCAgU2FhbSBCYXJhdGkgIDxz YmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBXZSBuZWVkIHRvIFByZWZlck51bWJlciB3aGVu IGNhbGxpbmcgdG9QcmltaXRpdmUgZm9yIG5lZ2F0ZQpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RJbnRlcnByZXRlcklubGluZXMuaAko cmV2aXNpb24gMjg1NDA4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFj dEludGVycHJldGVySW5saW5lcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yODg4LDYgKzI4ODgsOCBA QCBib29sIEFic3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RTdGF0ZVR5CiAgICAgfQogCiAgICAg Y2FzZSBOZXdTeW1ib2w6IHsKKyAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpICYmIG5vZGUtPmNo aWxkMSgpLnVzZUtpbmQoKSAhPSBTdHJpbmdVc2UpCisgICAgICAgICAgICBjbG9iYmVyV29ybGQo KTsKICAgICAgICAgc2V0Rm9yTm9kZShub2RlLCBtX3ZtLnN5bWJvbFN0cnVjdHVyZS5nZXQoKSk7 CiAgICAgICAgIGJyZWFrOwogICAgIH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHQnl0ZUNvZGVQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCShyZXZpc2lvbiAyODU0MDgpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDE2OSw3ICs0MTY5LDcgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxlQ29uc3RhbnRJ bnRlcgogICAgICAgICBpZiAoYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgPD0gMSkKICAgICAg ICAgICAgIHJlc3VsdE5vZGUgPSBhZGRUb0dyYXBoKE5ld1N5bWJvbCk7CiAgICAgICAgIGVsc2UK LSAgICAgICAgICAgIHJlc3VsdE5vZGUgPSBhZGRUb0dyYXBoKE5ld1N5bWJvbCwgYWRkVG9HcmFw aChUb1N0cmluZywgZ2V0KHZpcnR1YWxSZWdpc3RlckZvckFyZ3VtZW50SW5jbHVkaW5nVGhpcygx LCByZWdpc3Rlck9mZnNldCkpKSk7CisgICAgICAgICAgICByZXN1bHROb2RlID0gYWRkVG9HcmFw aChOZXdTeW1ib2wsIGdldCh2aXJ0dWFsUmVnaXN0ZXJGb3JBcmd1bWVudEluY2x1ZGluZ1RoaXMo MSwgcmVnaXN0ZXJPZmZzZXQpKSk7CiAKICAgICAgICAgc2V0KHJlc3VsdCwgcmVzdWx0Tm9kZSk7 CiAgICAgICAgIHJldHVybiB0cnVlOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdDbG9iYmVyaXplLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdDbG9iYmVyaXplLmgJKHJldmlzaW9uIDI4NTQwOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHQ2xvYmJlcml6ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzMyLDEyICsxNzMyLDE5 IEBAIHZvaWQgY2xvYmJlcml6ZShHcmFwaCYgZ3JhcGgsIE5vZGUqIG5vZGUKICAgICAgICAgfQog ICAgIH0KIAorICAgIGNhc2UgTmV3U3ltYm9sOgorICAgICAgICBpZiAoIW5vZGUtPmNoaWxkMSgp IHx8IG5vZGUtPmNoaWxkMSgpLnVzZUtpbmQoKSA9PSBTdHJpbmdVc2UpIHsKKyAgICAgICAgICAg IHJlYWQoSGVhcE9iamVjdENvdW50KTsKKyAgICAgICAgICAgIHdyaXRlKEhlYXBPYmplY3RDb3Vu dCk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgY2xvYmJlclRvcCgpOworICAgICAgICBy ZXR1cm47CisKICAgICBjYXNlIE5ld09iamVjdDoKICAgICBjYXNlIE5ld0dlbmVyYXRvcjoKICAg ICBjYXNlIE5ld0FzeW5jR2VuZXJhdG9yOgogICAgIGNhc2UgTmV3SW50ZXJuYWxGaWVsZE9iamVj dDoKICAgICBjYXNlIE5ld1JlZ2V4cDoKLSAgICBjYXNlIE5ld1N5bWJvbDoKICAgICBjYXNlIE5l d1N0cmluZ09iamVjdDoKICAgICBjYXNlIFBoYW50b21OZXdPYmplY3Q6CiAgICAgY2FzZSBNYXRl cmlhbGl6ZU5ld09iamVjdDoKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ2xv YmJlcnNFeGl0U3RhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHQ2xvYmJlcnNFeGl0U3RhdGUuY3BwCShyZXZpc2lvbiAyODU0MDgpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR0Nsb2JiZXJzRXhpdFN0YXRlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTksNyArNTksNiBAQCBib29sIGNsb2JiZXJzRXhpdFN0YXRlKEdyYXBoJiBncmFwaCwg Tm9kCiAgICAgY2FzZSBOZXdBc3luY0dlbmVyYXRvcjoKICAgICBjYXNlIE5ld0ludGVybmFsRmll bGRPYmplY3Q6CiAgICAgY2FzZSBOZXdSZWdleHA6Ci0gICAgY2FzZSBOZXdTeW1ib2w6CiAgICAg Y2FzZSBOZXdTdHJpbmdPYmplY3Q6CiAgICAgY2FzZSBQaGFudG9tTmV3T2JqZWN0OgogICAgIGNh c2UgTWF0ZXJpYWxpemVOZXdPYmplY3Q6CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR0ZpeHVwUGhhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHRml4dXBQaGFzZS5jcHAJKHJldmlzaW9uIDI4NTQwOCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2MzcsOCAr MTYzNywxMSBAQCBwcml2YXRlOgogICAgICAgICB9CiAKICAgICAgICAgY2FzZSBOZXdTeW1ib2w6 IHsKLSAgICAgICAgICAgIGlmIChub2RlLT5jaGlsZDEoKSkKLSAgICAgICAgICAgICAgICBmaXhF ZGdlPEtub3duU3RyaW5nVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBpZiAobm9k ZS0+Y2hpbGQxKCkgJiYgbm9kZS0+Y2hpbGQxKCktPnNob3VsZFNwZWN1bGF0ZVN0cmluZygpKQor ICAgICAgICAgICAgICAgIGZpeEVkZ2U8U3RyaW5nVXNlPihub2RlLT5jaGlsZDEoKSk7CisKKyAg ICAgICAgICAgIGlmICghbm9kZS0+Y2hpbGQxKCkgfHwgbm9kZS0+Y2hpbGQxKCkudXNlS2luZCgp ID09IFN0cmluZ1VzZSkKKyAgICAgICAgICAgICAgICBub2RlLT5jbGVhckZsYWdzKE5vZGVNdXN0 R2VuZXJhdGUpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIApJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdNYXlFeGl0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR01heUV4aXQuY3BwCShyZXZpc2lvbiAyODU0MDgpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR01heUV4aXQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMzMsNyArMTMzLDYgQEAgRXhpdE1vZGUgbWF5RXhpdEltcGwoR3JhcGgmIGdyYXBoLCBOb2Rl KgogICAgIGNhc2UgTmV3QXN5bmNGdW5jdGlvbjoKICAgICBjYXNlIE5ld0FzeW5jR2VuZXJhdG9y RnVuY3Rpb246CiAgICAgY2FzZSBOZXdTdHJpbmdPYmplY3Q6Ci0gICAgY2FzZSBOZXdTeW1ib2w6 CiAgICAgY2FzZSBOZXdJbnRlcm5hbEZpZWxkT2JqZWN0OgogICAgIGNhc2UgTmV3UmVnZXhwOgog ICAgIGNhc2UgVG9OdW1iZXI6CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05v ZGVUeXBlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2Rl VHlwZS5oCShyZXZpc2lvbiAyODU0MDgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R05vZGVUeXBlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3Niw3ICszNzYsNyBAQCBuYW1lc3BhY2Ug SlNDIHsgbmFtZXNwYWNlIERGRyB7CiAgICAgbWFjcm8oTmV3SW50ZXJuYWxGaWVsZE9iamVjdCwg Tm9kZVJlc3VsdEpTKSBcCiAgICAgbWFjcm8oTmV3VHlwZWRBcnJheSwgTm9kZVJlc3VsdEpTIHwg Tm9kZU11c3RHZW5lcmF0ZSkgXAogICAgIG1hY3JvKE5ld1JlZ2V4cCwgTm9kZVJlc3VsdEpTKSBc Ci0gICAgbWFjcm8oTmV3U3ltYm9sLCBOb2RlUmVzdWx0SlMpIFwKKyAgICBtYWNybyhOZXdTeW1i b2wsIE5vZGVSZXN1bHRKUyB8IE5vZGVNdXN0R2VuZXJhdGUpIFwKICAgICBtYWNybyhOZXdTdHJp bmdPYmplY3QsIE5vZGVSZXN1bHRKUykgXAogICAgIC8qIFJlc3QgUGFyYW1ldGVyICovXAogICAg IG1hY3JvKEdldFJlc3RMZW5ndGgsIE5vZGVSZXN1bHRJbnQzMikgXApJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwCShyZXZpc2lvbiAyODU0MDgpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yNzEwLDcgKzI3MTAsNyBAQCBKU0NfREVGSU5FX0pJVF9PUEVSQVRJT04ob3BlcmF0 aW9uTmV3U3ltCiAgICAgcmV0dXJuIFN5bWJvbDo6Y3JlYXRlKHZtKTsKIH0KIAotSlNDX0RFRklO RV9KSVRfT1BFUkFUSU9OKG9wZXJhdGlvbk5ld1N5bWJvbFdpdGhEZXNjcmlwdGlvbiwgU3ltYm9s KiwgKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEpTU3RyaW5nKiBkZXNjcmlwdGlvbikp CitKU0NfREVGSU5FX0pJVF9PUEVSQVRJT04ob3BlcmF0aW9uTmV3U3ltYm9sV2l0aFN0cmluZ0Rl c2NyaXB0aW9uLCBTeW1ib2wqLCAoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgSlNTdHJp bmcqIGRlc2NyaXB0aW9uKSkKIHsKICAgICBWTSYgdm0gPSBnbG9iYWxPYmplY3QtPnZtKCk7CiAg ICAgQ2FsbEZyYW1lKiBjYWxsRnJhbWUgPSBERUNMQVJFX0NBTExfRlJBTUUodm0pOwpAQCAtMjcy Myw2ICsyNzIzLDIzIEBAIEpTQ19ERUZJTkVfSklUX09QRVJBVElPTihvcGVyYXRpb25OZXdTeW0K ICAgICByZXR1cm4gU3ltYm9sOjpjcmVhdGVXaXRoRGVzY3JpcHRpb24odm0sIHN0cmluZyk7CiB9 CiAKK0pTQ19ERUZJTkVfSklUX09QRVJBVElPTihvcGVyYXRpb25OZXdTeW1ib2xXaXRoRGVzY3Jp cHRpb24sIFN5bWJvbCosIChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBFbmNvZGVkSlNW YWx1ZSBlbmNvZGVkRGVzY3JpcHRpb24pKQoreworICAgIFZNJiB2bSA9IGdsb2JhbE9iamVjdC0+ dm0oKTsKKyAgICBDYWxsRnJhbWUqIGNhbGxGcmFtZSA9IERFQ0xBUkVfQ0FMTF9GUkFNRSh2bSk7 CisgICAgSklUT3BlcmF0aW9uUHJvbG9ndWVDYWxsRnJhbWVUcmFjZXIgdHJhY2VyKHZtLCBjYWxs RnJhbWUpOworICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKKworICAg IEpTVmFsdWUgZGVzY3JpcHRpb24gPSBKU1ZhbHVlOjpkZWNvZGUoZW5jb2RlZERlc2NyaXB0aW9u KTsKKyAgICBpZiAoZGVzY3JpcHRpb24uaXNVbmRlZmluZWQoKSkKKyAgICAgICAgcmV0dXJuIFN5 bWJvbDo6Y3JlYXRlKHZtKTsKKworICAgIFN0cmluZyBzdHJpbmcgPSBkZXNjcmlwdGlvbi50b1dU RlN0cmluZyhnbG9iYWxPYmplY3QpOworICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIG51 bGxwdHIpOworCisgICAgcmV0dXJuIFN5bWJvbDo6Y3JlYXRlV2l0aERlc2NyaXB0aW9uKHZtLCBz dHJpbmcpOworfQorCiBKU0NfREVGSU5FX0pJVF9PUEVSQVRJT04ob3BlcmF0aW9uTmV3U3RyaW5n T2JqZWN0LCBKU0NlbGwqLCAoVk0qIHZtUG9pbnRlciwgSlNTdHJpbmcqIHN0cmluZywgU3RydWN0 dXJlKiBzdHJ1Y3R1cmUpKQogewogICAgIFZNJiB2bSA9ICp2bVBvaW50ZXI7CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuaAkocmV2aXNpb24gMjg1NDA4KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmgJKHdvcmtpbmcgY29w eSkKQEAgLTI2NCw3ICsyNjQsOCBAQCBKU0NfREVDTEFSRV9KSVRfT1BFUkFUSU9OKG9wZXJhdGlv blBhcnNlCiBKU0NfREVDTEFSRV9KSVRfT1BFUkFUSU9OKG9wZXJhdGlvblBhcnNlSW50R2VuZXJp YywgRW5jb2RlZEpTVmFsdWUsIChKU0dsb2JhbE9iamVjdCosIEVuY29kZWRKU1ZhbHVlLCBpbnQz Ml90KSk7CiAKIEpTQ19ERUNMQVJFX0pJVF9PUEVSQVRJT04ob3BlcmF0aW9uTmV3U3ltYm9sLCBT eW1ib2wqLCAoVk0qKSk7Ci1KU0NfREVDTEFSRV9KSVRfT1BFUkFUSU9OKG9wZXJhdGlvbk5ld1N5 bWJvbFdpdGhEZXNjcmlwdGlvbiwgU3ltYm9sKiwgKEpTR2xvYmFsT2JqZWN0KiwgSlNTdHJpbmcq KSk7CitKU0NfREVDTEFSRV9KSVRfT1BFUkFUSU9OKG9wZXJhdGlvbk5ld1N5bWJvbFdpdGhTdHJp bmdEZXNjcmlwdGlvbiwgU3ltYm9sKiwgKEpTR2xvYmFsT2JqZWN0KiwgSlNTdHJpbmcqKSk7CitK U0NfREVDTEFSRV9KSVRfT1BFUkFUSU9OKG9wZXJhdGlvbk5ld1N5bWJvbFdpdGhEZXNjcmlwdGlv biwgU3ltYm9sKiwgKEpTR2xvYmFsT2JqZWN0KiwgRW5jb2RlZEpTVmFsdWUpKTsKIEpTQ19ERUNM QVJFX0pJVF9PUEVSQVRJT04ob3BlcmF0aW9uTmV3U3RyaW5nT2JqZWN0LCBKU0NlbGwqLCAoVk0q LCBKU1N0cmluZyosIFN0cnVjdHVyZSopKTsKIEpTQ19ERUNMQVJFX0pJVF9PUEVSQVRJT04ob3Bl cmF0aW9uVG9TdHJpbmdPbkNlbGwsIEpTU3RyaW5nKiwgKEpTR2xvYmFsT2JqZWN0KiwgSlNDZWxs KikpOwogSlNDX0RFQ0xBUkVfSklUX09QRVJBVElPTihvcGVyYXRpb25Ub1N0cmluZywgSlNTdHJp bmcqLCAoSlNHbG9iYWxPYmplY3QqLCBFbmNvZGVkSlNWYWx1ZSkpOwpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHJldmlzaW9uIDI4 NTQwOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMTE0MiwxNSArMTExNDIsMjYgQEAgdm9pZCBTcGVjdWxhdGl2 ZUpJVDo6Y29tcGlsZU5ld1N5bWJvbChObwogICAgIH0KIAogCi0gICAgQVNTRVJUKG5vZGUtPmNo aWxkMSgpLnVzZUtpbmQoKSA9PSBLbm93blN0cmluZ1VzZSk7Ci0gICAgU3BlY3VsYXRlQ2VsbE9w ZXJhbmQgb3BlcmFuZCh0aGlzLCBub2RlLT5jaGlsZDEoKSk7CisgICAgaWYgKG5vZGUtPmNoaWxk MSgpLnVzZUtpbmQoKSA9PSBTdHJpbmdVc2UpIHsKKyAgICAgICAgU3BlY3VsYXRlQ2VsbE9wZXJh bmQgb3BlcmFuZCh0aGlzLCBub2RlLT5jaGlsZDEoKSk7CisgICAgICAgIEdQUlJlZyBzdHJpbmdH UFIgPSBvcGVyYW5kLmdwcigpOworICAgICAgICBzcGVjdWxhdGVTdHJpbmcobm9kZS0+Y2hpbGQx KCksIHN0cmluZ0dQUik7CiAKLSAgICBHUFJSZWcgc3RyaW5nR1BSID0gb3BlcmFuZC5ncHIoKTsK KyAgICAgICAgZmx1c2hSZWdpc3RlcnMoKTsKKyAgICAgICAgR1BSRmx1c2hlZENhbGxSZXN1bHQg cmVzdWx0KHRoaXMpOworICAgICAgICBHUFJSZWcgcmVzdWx0R1BSID0gcmVzdWx0LmdwcigpOwor ICAgICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvbk5ld1N5bWJvbFdpdGhTdHJpbmdEZXNjcmlw dGlvbiwgcmVzdWx0R1BSLCBUcnVzdGVkSW1tUHRyOjp3ZWFrUG9pbnRlcihtX2dyYXBoLCBtX2dy YXBoLmdsb2JhbE9iamVjdEZvcihub2RlLT5vcmlnaW4uc2VtYW50aWMpKSwgc3RyaW5nR1BSKTsK KyAgICAgICAgbV9qaXQuZXhjZXB0aW9uQ2hlY2soKTsKKyAgICAgICAgY2VsbFJlc3VsdChyZXN1 bHRHUFIsIG5vZGUpOworICAgICAgICByZXR1cm47CisgICAgfQogCisgICAgSlNWYWx1ZU9wZXJh bmQgb3BlcmFuZCh0aGlzLCBub2RlLT5jaGlsZDEoKSk7CisgICAgSlNWYWx1ZVJlZ3MgaW5wdXRS ZWdzID0gb3BlcmFuZC5qc1ZhbHVlUmVncygpOwogICAgIGZsdXNoUmVnaXN0ZXJzKCk7CiAgICAg R1BSRmx1c2hlZENhbGxSZXN1bHQgcmVzdWx0KHRoaXMpOwogICAgIEdQUlJlZyByZXN1bHRHUFIg PSByZXN1bHQuZ3ByKCk7Ci0gICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25OZXdTeW1ib2xXaXRo RGVzY3JpcHRpb24sIHJlc3VsdEdQUiwgVHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50ZXIobV9ncmFw aCwgbV9ncmFwaC5nbG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSksIHN0cmlu Z0dQUik7CisgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25OZXdTeW1ib2xXaXRoRGVzY3JpcHRp b24sIHJlc3VsdEdQUiwgVHJ1c3RlZEltbVB0cjo6d2Vha1BvaW50ZXIobV9ncmFwaCwgbV9ncmFw aC5nbG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKSksIGlucHV0UmVncyk7CiAg ICAgbV9qaXQuZXhjZXB0aW9uQ2hlY2soKTsKICAgICBjZWxsUmVzdWx0KHJlc3VsdEdQUiwgbm9k ZSk7CiB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1Rv QjMuY3BwCShyZXZpc2lvbiAyODU0MDgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZU TExvd2VyREZHVG9CMy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc0NzMsOCArNzQ3MywxMSBAQCBJ R05PUkVfQ0xBTkdfV0FSTklOR1NfRU5ECiAgICAgICAgICAgICBzZXRKU1ZhbHVlKHZtQ2FsbChw b2ludGVyVHlwZSgpLCBvcGVyYXRpb25OZXdTeW1ib2wsIG1fdm1WYWx1ZSkpOwogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIEFTU0VSVChtX25vZGUtPmNoaWxkMSgpLnVz ZUtpbmQoKSA9PSBLbm93blN0cmluZ1VzZSk7Ci0gICAgICAgIHNldEpTVmFsdWUodm1DYWxsKHBv aW50ZXJUeXBlKCksIG9wZXJhdGlvbk5ld1N5bWJvbFdpdGhEZXNjcmlwdGlvbiwgd2Vha1BvaW50 ZXIoZ2xvYmFsT2JqZWN0KSwgbG93U3RyaW5nKG1fbm9kZS0+Y2hpbGQxKCkpKSk7CisKKyAgICAg ICAgaWYgKG1fbm9kZS0+Y2hpbGQxKCkudXNlS2luZCgpID09IFN0cmluZ1VzZSkKKyAgICAgICAg ICAgIHNldEpTVmFsdWUodm1DYWxsKHBvaW50ZXJUeXBlKCksIG9wZXJhdGlvbk5ld1N5bWJvbFdp dGhTdHJpbmdEZXNjcmlwdGlvbiwgd2Vha1BvaW50ZXIoZ2xvYmFsT2JqZWN0KSwgbG93U3RyaW5n KG1fbm9kZS0+Y2hpbGQxKCkpKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHNldEpTVmFs dWUodm1DYWxsKHBvaW50ZXJUeXBlKCksIG9wZXJhdGlvbk5ld1N5bWJvbFdpdGhEZXNjcmlwdGlv biwgd2Vha1BvaW50ZXIoZ2xvYmFsT2JqZWN0KSwgbG93SlNWYWx1ZShtX25vZGUtPmNoaWxkMSgp KSkpOwogICAgIH0KIAogICAgIHZvaWQgY29tcGlsZU5ld0FycmF5KCkK