155082 2016-03-05 18:58:13 -0800 [JSC] Use 3 operands Add in more places 2016-03-06 18:42:36 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin commit-queue fpizlo keith_miller mark.lam msaboff saam oldest_to_newest 1171354 0 benjamin 2016-03-05 18:58:13 -0800 [JSC] Use 3 operands Add in more places 1171355 1 273118 benjamin 2016-03-05 19:00:23 -0800 Created attachment 273118 Patch 1171361 2 benjamin 2016-03-05 19:32:41 -0800 x86: Conf#1 Conf#2 SunSpider: 3d-cube 4.8565+-0.1054 4.7649+-0.0343 might be 1.0192x faster 3d-morph 5.2949+-0.0228 ? 5.3558+-0.1184 ? might be 1.0115x slower 3d-raytrace 5.6507+-0.0673 ? 5.6962+-0.0559 ? access-binary-trees 2.2026+-0.0428 ? 2.2451+-0.0848 ? might be 1.0193x slower access-fannkuch 6.1582+-0.1665 6.1040+-0.0823 access-nbody 2.6902+-0.0648 2.6790+-0.0325 access-nsieve 3.0056+-0.0211 ? 3.0256+-0.0278 ? bitops-3bit-bits-in-byte 1.1896+-0.0155 1.1806+-0.0149 bitops-bits-in-byte 3.3525+-0.0838 ? 3.3542+-0.0923 ? bitops-bitwise-and 2.0655+-0.0678 2.0614+-0.0274 bitops-nsieve-bits 3.0312+-0.0174 3.0212+-0.0248 controlflow-recursive 2.3650+-0.0157 ? 2.3735+-0.0086 ? crypto-aes 4.0475+-0.0491 ? 4.0796+-0.0887 ? crypto-md5 2.6558+-0.0823 ? 2.7056+-0.1262 ? might be 1.0187x slower crypto-sha1 2.3829+-0.0744 ? 2.3833+-0.0340 ? date-format-tofte 6.9130+-0.1691 6.7964+-0.0647 might be 1.0172x faster date-format-xparb 4.8159+-0.0462 ? 5.0842+-0.3729 ? might be 1.0557x slower math-cordic 2.9996+-0.1141 2.9529+-0.0511 might be 1.0158x faster math-partial-sums 4.9105+-0.0616 ? 4.9621+-0.2649 ? might be 1.0105x slower math-spectral-norm 2.0409+-0.0109 2.0386+-0.0122 regexp-dna 6.1296+-0.1849 6.0909+-0.0981 string-base64 4.6202+-0.1398 4.5647+-0.1248 might be 1.0121x faster string-fasta 6.0129+-0.1825 5.9083+-0.0339 might be 1.0177x faster string-tagcloud 8.1510+-0.0846 ? 8.2166+-0.1277 ? string-unpack-code 19.2528+-0.4838 ? 19.6053+-0.8519 ? might be 1.0183x slower string-validate-input 4.2833+-0.0659 ? 4.3095+-0.1396 ? <arithmetic> 4.6569+-0.0293 ? 4.6754+-0.0477 ? might be 1.0040x slower Conf#1 Conf#2 Octane: encrypt 0.15959+-0.00206 ? 0.16058+-0.00175 ? decrypt 2.85626+-0.01421 2.84784+-0.01202 deltablue x2 0.13937+-0.00392 0.13854+-0.00453 earley 0.28427+-0.00124 ? 0.28489+-0.00181 ? boyer 4.75049+-0.09477 4.74789+-0.08329 navier-stokes x2 4.96211+-0.02155 4.95081+-0.01437 raytrace x2 0.89685+-0.00308 0.89405+-0.00403 richards x2 0.08244+-0.00077 0.08197+-0.00095 splay x2 0.34867+-0.00196 ? 0.35085+-0.00317 ? regexp x2 22.67157+-0.21263 ^ 22.22603+-0.21870 ^ definitely 1.0200x faster pdfjs x2 38.84948+-0.30275 ? 38.91550+-0.19899 ? mandreel x2 42.63247+-0.15035 ? 42.63537+-0.20102 ? gbemu x2 24.99310+-0.14506 ? 25.14904+-0.22503 ? closure 0.56651+-0.00241 ? 0.56983+-0.00465 ? jquery 7.43074+-0.01800 ? 7.55090+-0.15937 ? might be 1.0162x slower box2d x2 9.38837+-0.04111 ? 9.42184+-0.06384 ? zlib x2 388.85063+-4.62770 386.00633+-3.43741 typescript x2 662.35103+-6.63604 ? 664.68791+-6.41935 ? <geometric> 5.25853+-0.01215 5.25499+-0.01727 might be 1.0007x faster Conf#1 Conf#2 Kraken: ai-astar 98.004+-1.263 97.113+-1.792 audio-beat-detection 47.988+-0.857 47.748+-0.393 audio-dft 97.914+-1.436 97.356+-1.169 audio-fft 35.840+-0.068 ? 36.386+-0.758 ? might be 1.0152x slower audio-oscillator 49.178+-0.958 48.807+-0.240 imaging-darkroom 60.194+-0.113 ? 60.406+-0.193 ? imaging-desaturate 44.472+-0.164 ? 44.682+-0.318 ? imaging-gaussian-blur 68.589+-0.320 67.566+-1.830 might be 1.0151x faster json-parse-financial 37.529+-0.187 ? 38.300+-0.811 ? might be 1.0205x slower json-stringify-tinderbox 25.804+-0.860 25.743+-0.796 stanford-crypto-aes 39.990+-0.280 39.852+-0.314 stanford-crypto-ccm 36.411+-0.533 ? 36.497+-0.941 ? stanford-crypto-pbkdf2 101.709+-1.597 ? 101.789+-1.078 ? stanford-crypto-sha256-iterative 38.865+-0.148 ? 39.415+-1.628 ? might be 1.0142x slower <arithmetic> 55.892+-0.217 55.833+-0.283 might be 1.0011x faster Conf#1 Conf#2 AsmBench: bigfib.cpp 443.8698+-7.0927 435.0971+-4.6131 might be 1.0202x faster cray.c 368.3132+-2.5795 363.6219+-2.3141 might be 1.0129x faster dry.c 443.5432+-33.7685 438.4531+-26.9264 might be 1.0116x faster FloatMM.c 710.8737+-4.5558 709.4591+-2.7929 gcc-loops.cpp 3672.1015+-10.2284 ? 3695.0366+-30.7866 ? n-body.c 811.2189+-3.0118 ? 812.7820+-2.5433 ? Quicksort.c 396.0299+-1.9691 ? 398.9930+-9.2334 ? stepanov_container.cpp 3306.4433+-19.4911 ? 3309.1160+-12.3462 ? Towers.c 269.8485+-1.1994 269.3368+-1.6104 <geometric> 722.9525+-5.8363 720.5157+-5.1486 might be 1.0034x faster Conf#1 Conf#2 Geomean of preferred means: <scaled-result> 31.5387+-0.0953 31.5293+-0.1230 might be 1.0003x faster 1171497 3 273118 commit-queue 2016-03-06 18:42:33 -0800 Comment on attachment 273118 Patch Clearing flags on attachment: 273118 Committed r197653: <http://trac.webkit.org/changeset/197653> 1171498 4 commit-queue 2016-03-06 18:42:36 -0800 All reviewed patches have been landed. Closing bug. 273118 2016-03-05 19:00:23 -0800 2016-03-06 18:42:33 -0800 Patch bug-155082-20160305190009.patch text/plain 9074 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3NjA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 OTdiN2NhODRhZmE4NjI0NGE0YzA5NDM2MTdlNGIzNDM3N2Q2MmFkLi5hZDExYzJhMjhiN2I4NjUx NDBiNDJiNzc0MjVlNzQzZDEzM2ZiNThhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAxNi0wMy0wNSAgQmVuamFtaW4gUG91bGFpbiAgPGJlbmphbWluQHdlYmtp dC5vcmc+CisKKyAgICAgICAgW0pTQ10gVXNlIDMgb3BlcmFuZHMgQWRkIGluIG1vcmUgcGxhY2Vz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTUwODIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGFzc2Vt Ymxlci9NYWNyb0Fzc2VtYmxlci5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlcjo6YWRk UHRyKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXI6OmFkZDMyKToKKyAgICAgICAgKiBh c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2Vt YmxlckFSTXY3OjphZGQzMik6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcDoK KyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZUFyaXRoQWRkKToKKyAg ICAgICAgVGhlIGNhc2Ugd2l0aCBjaGlsZDEgY29uc3RhbnQgaXMgdXNlbGVzcy4KKyAgICAgICAg VGhlIGNhbm9uaWNhbCBmb3JtIHdpbGwgaGF2ZSB0aGUgY29uc3RhbnQgYXMgY2hpbGQyLgorCisg ICAgICAgIEFsc28gYWRkIHJlZ2lzdGVyIHJldXNlIGZvciB0aGUgZmFzdC1hZGQuCisgICAgICAg IFJlZ2lzdGVycyBhcmUgYSBzY2FyY2UgcmVzb3VyY2Ugb24geDg2LgorCisgICAgICAgICogaml0 L0NDYWxsSGVscGVycy5oOgorICAgICAgICAoSlNDOjpDQ2FsbEhlbHBlcnM6OnByZXBhcmVGb3JU YWlsQ2FsbFNsb3cpOgorICAgICAgICAqIHlhcnIvWWFyckpJVC5jcHA6CisgICAgICAgIChKU0M6 OllhcnI6OllhcnJHZW5lcmF0b3I6OmdlbmVyYXRlKToKKwogMjAxNi0wMy0wNCAgQW5kcmVhcyBL bGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gVGhyb3cgYXdheSBjb21w aWxlZCBSZWdFeHAgY29kZSB3aGVuIG5hdmlnYXRpbmcgdG8gYSBuZXcgcGFnZS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXIuaCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXIuaAppbmRleCAwYjFj Y2I3ZTcxMDE0OTViNWI2ZWNjZDhmZjBjODQzM2Q4ODZlMWRmLi45ZGVkYmIyZGYwOTVlMGVjNzRi ZGY4Y2NmMjhjMDk3NWMzNTY3NjY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9NYWNyb0Fzc2VtYmxlci5oCkBAIC01MTUsNiArNTE1LDExIEBAIHB1YmxpYzoKICAg ICAgICAgYWRkMzIoc3JjLCBkZXN0KTsKICAgICB9CiAKKyAgICB2b2lkIGFkZFB0cihSZWdpc3Rl cklEIGxlZnQsIFJlZ2lzdGVySUQgcmlnaHQsIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB7CisgICAg ICAgIGFkZDMyKGxlZnQsIHJpZ2h0LCBkZXN0KTsKKyAgICB9CisKICAgICB2b2lkIGFkZFB0cihU cnVzdGVkSW1tMzIgaW1tLCBSZWdpc3RlcklEIHNyY0Rlc3QpCiAgICAgewogICAgICAgICBhZGQz MihpbW0sIHNyY0Rlc3QpOwpAQCAtNzg3LDYgKzc5MiwxMSBAQCBwdWJsaWM6CiAgICAgewogICAg ICAgICBhZGQ2NChzcmMsIGRlc3QpOwogICAgIH0KKworICAgIHZvaWQgYWRkUHRyKFJlZ2lzdGVy SUQgbGVmdCwgUmVnaXN0ZXJJRCByaWdodCwgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHsKKyAgICAg ICAgYWRkNjQobGVmdCwgcmlnaHQsIGRlc3QpOworICAgIH0KICAgICAKICAgICB2b2lkIGFkZFB0 cihBZGRyZXNzIHNyYywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKQEAgLTE0NTEsNiArMTQ2MSwx NiBAQCBwdWJsaWM6CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgYWRkMzIoaW1tLmFzVHJ1 c3RlZEltbTMyKCksIGRlc3QpOwogICAgIH0KKworICAgIHZvaWQgYWRkMzIoSW1tMzIgaW1tLCBS ZWdpc3RlcklEIHNyYywgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHsKKyAgICAgICAgaWYgKHNob3Vs ZEJsaW5kKGltbSkpIHsKKyAgICAgICAgICAgIEJsaW5kZWRJbW0zMiBrZXkgPSBhZGRpdGlvbkJs aW5kZWRDb25zdGFudChpbW0pOworICAgICAgICAgICAgYWRkMzIoa2V5LnZhbHVlMSwgc3JjLCBk ZXN0KTsKKyAgICAgICAgICAgIGFkZDMyKGtleS52YWx1ZTIsIGRlc3QpOworICAgICAgICB9IGVs c2UKKyAgICAgICAgICAgIGFkZDMyKGltbS5hc1RydXN0ZWRJbW0zMigpLCBzcmMsIGRlc3QpOwor ICAgIH0KICAgICAKICAgICB2b2lkIGFkZFB0cihJbW0zMiBpbW0sIFJlZ2lzdGVySUQgZGVzdCkK ICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3Jv QXNzZW1ibGVyQVJNdjcuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9B c3NlbWJsZXJBUk12Ny5oCmluZGV4IGZjOTRiODg4ZGUzNWU1OTc0YmMwNWRiMTY1NjQ4MzEyNzk1 YTc4MzcuLjRiYjEzN2RiYWZjYmQ5NDU4ZWY5MDY4NjRjZDkzZmI5ZDAxMDk3MDEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5o CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12 Ny5oCkBAIC0xNTUsNiArMTU1LDExIEBAIHB1YmxpYzoKICAgICAgICAgbV9hc3NlbWJsZXIuYWRk KGRlc3QsIGRlc3QsIHNyYyk7CiAgICAgfQogCisgICAgdm9pZCBhZGQzMihSZWdpc3RlcklEIGxl ZnQsIFJlZ2lzdGVySUQgcmlnaHQsIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB7CisgICAgICAgIG1f YXNzZW1ibGVyLmFkZChkZXN0LCBsZWZ0LCByaWdodCk7CisgICAgfQorCiAgICAgdm9pZCBhZGQz MihUcnVzdGVkSW1tMzIgaW1tLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewogICAgICAgICBhZGQz MihpbW0sIGRlc3QsIGRlc3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1Nw ZWN1bGF0aXZlSklULmNwcAppbmRleCA2YzI0OTQyZjAzZTFkODEwODVkYjIzMTQzOTlhNjIwNDVh NWJhYmU3Li41ZGVkYjljNzU5YWIyNjQ0YjVkNmQzNzVmYjM4ZjI3MGNjMWRkYThmIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcApAQCAtMzI0 MywzMiArMzI0MywyMCBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlQXJpdGhBZGQoTm9k ZSogbm9kZSkKICAgICBzd2l0Y2ggKG5vZGUtPmJpbmFyeVVzZUtpbmQoKSkgewogICAgIGNhc2Ug SW50MzJVc2U6IHsKICAgICAgICAgQVNTRVJUKCFzaG91bGRDaGVja05lZ2F0aXZlWmVybyhub2Rl LT5hcml0aE1vZGUoKSkpOwotICAgICAgICAKLSAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5p c0ludDMyQ29uc3RhbnQoKSkgewotICAgICAgICAgICAgaW50MzJfdCBpbW0xID0gbm9kZS0+Y2hp bGQxKCktPmFzSW50MzIoKTsKLSAgICAgICAgICAgIFNwZWN1bGF0ZUludDMyT3BlcmFuZCBvcDIo dGhpcywgbm9kZS0+Y2hpbGQyKCkpOwotICAgICAgICAgICAgR1BSVGVtcG9yYXJ5IHJlc3VsdCh0 aGlzKTsKLQotICAgICAgICAgICAgaWYgKCFzaG91bGRDaGVja092ZXJmbG93KG5vZGUtPmFyaXRo TW9kZSgpKSkgewotICAgICAgICAgICAgICAgIG1faml0Lm1vdmUob3AyLmdwcigpLCByZXN1bHQu Z3ByKCkpOwotICAgICAgICAgICAgICAgIG1faml0LmFkZDMyKEltbTMyKGltbTEpLCByZXN1bHQu Z3ByKCkpOwotICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgc3BlY3VsYXRpb25D aGVjayhPdmVyZmxvdywgSlNWYWx1ZVJlZ3MoKSwgMCwgbV9qaXQuYnJhbmNoQWRkMzIoTWFjcm9B c3NlbWJsZXI6Ok92ZXJmbG93LCBvcDIuZ3ByKCksIEltbTMyKGltbTEpLCByZXN1bHQuZ3ByKCkp KTsKIAotICAgICAgICAgICAgaW50MzJSZXN1bHQocmVzdWx0LmdwcigpLCBub2RlKTsKLSAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICAKICAgICAgICAgaWYgKG5vZGUtPmNo aWxkMigpLT5pc0ludDMyQ29uc3RhbnQoKSkgewogICAgICAgICAgICAgU3BlY3VsYXRlSW50MzJP cGVyYW5kIG9wMSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICBpbnQzMl90IGlt bTIgPSBub2RlLT5jaGlsZDIoKS0+YXNJbnQzMigpOwotICAgICAgICAgICAgR1BSVGVtcG9yYXJ5 IHJlc3VsdCh0aGlzKTsKLSAgICAgICAgICAgICAgICAKKwogICAgICAgICAgICAgaWYgKCFzaG91 bGRDaGVja092ZXJmbG93KG5vZGUtPmFyaXRoTW9kZSgpKSkgewotICAgICAgICAgICAgICAgIG1f aml0Lm1vdmUob3AxLmdwcigpLCByZXN1bHQuZ3ByKCkpOwotICAgICAgICAgICAgICAgIG1faml0 LmFkZDMyKEltbTMyKGltbTIpLCByZXN1bHQuZ3ByKCkpOwotICAgICAgICAgICAgfSBlbHNlCi0g ICAgICAgICAgICAgICAgc3BlY3VsYXRpb25DaGVjayhPdmVyZmxvdywgSlNWYWx1ZVJlZ3MoKSwg MCwgbV9qaXQuYnJhbmNoQWRkMzIoTWFjcm9Bc3NlbWJsZXI6Ok92ZXJmbG93LCBvcDEuZ3ByKCks IEltbTMyKGltbTIpLCByZXN1bHQuZ3ByKCkpKTsKKyAgICAgICAgICAgICAgICBHUFJUZW1wb3Jh cnkgcmVzdWx0KHRoaXMsIFJldXNlLCBvcDEpOworICAgICAgICAgICAgICAgIG1faml0LmFkZDMy KEltbTMyKGltbTIpLCBvcDEuZ3ByKCksIHJlc3VsdC5ncHIoKSk7CisgICAgICAgICAgICAgICAg aW50MzJSZXN1bHQocmVzdWx0LmdwcigpLCBub2RlKTsKKyAgICAgICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIEdQUlRlbXBvcmFyeSByZXN1bHQodGhpcyk7 CisgICAgICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKE92ZXJmbG93LCBKU1ZhbHVlUmVncygpLCAw LCBtX2ppdC5icmFuY2hBZGQzMihNYWNyb0Fzc2VtYmxlcjo6T3ZlcmZsb3csIG9wMS5ncHIoKSwg SW1tMzIoaW1tMiksIHJlc3VsdC5ncHIoKSkpOwogCiAgICAgICAgICAgICBpbnQzMlJlc3VsdChy ZXN1bHQuZ3ByKCksIG5vZGUpOwogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMzI4MiwxNCArMzI3 MCw5IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVBcml0aEFkZChOb2RlKiBub2RlKQog ICAgICAgICBHUFJSZWcgZ3ByMiA9IG9wMi5ncHIoKTsKICAgICAgICAgR1BSUmVnIGdwclJlc3Vs dCA9IHJlc3VsdC5ncHIoKTsKIAotICAgICAgICBpZiAoIXNob3VsZENoZWNrT3ZlcmZsb3cobm9k ZS0+YXJpdGhNb2RlKCkpKSB7Ci0gICAgICAgICAgICBpZiAoZ3ByMSA9PSBncHJSZXN1bHQpCi0g ICAgICAgICAgICAgICAgbV9qaXQuYWRkMzIoZ3ByMiwgZ3ByUmVzdWx0KTsKLSAgICAgICAgICAg IGVsc2UgewotICAgICAgICAgICAgICAgIG1faml0Lm1vdmUoZ3ByMiwgZ3ByUmVzdWx0KTsKLSAg ICAgICAgICAgICAgICBtX2ppdC5hZGQzMihncHIxLCBncHJSZXN1bHQpOwotICAgICAgICAgICAg fQotICAgICAgICB9IGVsc2UgeworICAgICAgICBpZiAoIXNob3VsZENoZWNrT3ZlcmZsb3cobm9k ZS0+YXJpdGhNb2RlKCkpKQorICAgICAgICAgICAgbV9qaXQuYWRkMzIoZ3ByMSwgZ3ByMiwgZ3By UmVzdWx0KTsKKyAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6SnVt cCBjaGVjayA9IG1faml0LmJyYW5jaEFkZDMyKE1hY3JvQXNzZW1ibGVyOjpPdmVyZmxvdywgZ3By MSwgZ3ByMiwgZ3ByUmVzdWx0KTsKICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgIGlmIChn cHIxID09IGdwclJlc3VsdCkKQEAgLTMzMTYsOCArMzI5OSw3IEBAIHZvaWQgU3BlY3VsYXRpdmVK SVQ6OmNvbXBpbGVBcml0aEFkZChOb2RlKiBub2RlKQogICAgICAgICAgICAgU3BlY3VsYXRlV2hp Y2hldmVySW50NTJPcGVyYW5kIG9wMSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAg ICBTcGVjdWxhdGVXaGljaGV2ZXJJbnQ1Mk9wZXJhbmQgb3AyKHRoaXMsIG5vZGUtPmNoaWxkMigp LCBvcDEpOwogICAgICAgICAgICAgR1BSVGVtcG9yYXJ5IHJlc3VsdCh0aGlzLCBSZXVzZSwgb3Ax KTsKLSAgICAgICAgICAgIG1faml0Lm1vdmUob3AxLmdwcigpLCByZXN1bHQuZ3ByKCkpOwotICAg ICAgICAgICAgbV9qaXQuYWRkNjQob3AyLmdwcigpLCByZXN1bHQuZ3ByKCkpOworICAgICAgICAg ICAgbV9qaXQuYWRkNjQob3AxLmdwcigpLCBvcDIuZ3ByKCksIHJlc3VsdC5ncHIoKSk7CiAgICAg ICAgICAgICBpbnQ1MlJlc3VsdChyZXN1bHQuZ3ByKCksIG5vZGUsIG9wMS5mb3JtYXQoKSk7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9qaXQvQ0NhbGxIZWxwZXJzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0ND YWxsSGVscGVycy5oCmluZGV4IDEzZTY3YjAwMTIwN2IzODQ3NmE5Y2IyOWM5NzBkYzI0ODEyMWU3 ODcuLmU2NDlkMzllNjgwZmUxMGU2MTRlYmI5MTFmOGRhMmQwOWFiN2VhOGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ0NhbGxIZWxwZXJzLmgKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2ppdC9DQ2FsbEhlbHBlcnMuaApAQCAtMjE1Nyw4ICsyMTU3LDcgQEAgcHVi bGljOgogCiAgICAgICAgICAgICAvLyBUaGUgbmV3IGZyYW1lIHBvaW50ZXIgaXMgYXQgZnJhbWVQ b2ludGVyICsgb2xkRnJhbWVTaXplIC0gbmV3RnJhbWVTaXplCiAgICAgICAgICAgICBBU1NFUlQo bmV3RnJhbWVQb2ludGVyICE9IG9sZEZyYW1lU2l6ZUdQUik7Ci0gICAgICAgICAgICBtb3ZlKGZy YW1lUG9pbnRlclJlZ2lzdGVyLCBuZXdGcmFtZVBvaW50ZXIpOwotICAgICAgICAgICAgYWRkUHRy KG9sZEZyYW1lU2l6ZUdQUiwgbmV3RnJhbWVQb2ludGVyKTsKKyAgICAgICAgICAgIGFkZFB0cihm cmFtZVBvaW50ZXJSZWdpc3Rlciwgb2xkRnJhbWVTaXplR1BSLCBuZXdGcmFtZVBvaW50ZXIpOwog CiAgICAgICAgICAgICAvLyBUaGUgbmV3IGZyYW1lIHNpemUgaXMganVzdCB0aGUgbnVtYmVyIG9m IGFyZ3VtZW50cyBwbHVzIHRoZQogICAgICAgICAgICAgLy8gZnJhbWUgaGVhZGVyIHNpemUsIGFs aWduZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJKSVQuY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAKaW5kZXggOTJmNmQ3Y2Y0 MDBmOTNiZjAzNWYxNGRmZWRmMmFmNWJkMjBiYWViMi4uZTZmZWQ2ZDQ3ODc0OThlZGRkNGMwYWFk ZGIxNWUwNWVhZWViYWZlNyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIv WWFyckpJVC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAK QEAgLTE2MjYsOCArMTYyNiw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgOiBwcml2YXRlIE1hY3Jv QXNzZW1ibGVyIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKHRlcm0tPnF1YW50aXR5VHlwZSA9 PSBRdWFudGlmaWVyRml4ZWRDb3VudCkKICAgICAgICAgICAgICAgICAgICAgICAgIGlucHV0T2Zm c2V0IC09IHRlcm0tPnBhcmVudGhlc2VzLmRpc2p1bmN0aW9uLT5tX21pbmltdW1TaXplOwogICAg ICAgICAgICAgICAgICAgICBpZiAoaW5wdXRPZmZzZXQpIHsKLSAgICAgICAgICAgICAgICAgICAg ICAgIG1vdmUoaW5kZXgsIGluZGV4VGVtcG9yYXJ5KTsKLSAgICAgICAgICAgICAgICAgICAgICAg IGFkZDMyKEltbTMyKGlucHV0T2Zmc2V0KSwgaW5kZXhUZW1wb3JhcnkpOworICAgICAgICAgICAg ICAgICAgICAgICAgYWRkMzIoSW1tMzIoaW5wdXRPZmZzZXQpLCBpbmRleCwgaW5kZXhUZW1wb3Jh cnkpOwogICAgICAgICAgICAgICAgICAgICAgICAgc2V0U3VicGF0dGVyblN0YXJ0KGluZGV4VGVt cG9yYXJ5LCB0ZXJtLT5wYXJlbnRoZXNlcy5zdWJwYXR0ZXJuSWQpOwogICAgICAgICAgICAgICAg ICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICAgICAgICAgIHNldFN1YnBhdHRlcm5TdGFydChp bmRleCwgdGVybS0+cGFyZW50aGVzZXMuc3VicGF0dGVybklkKTsKQEAgLTE2NTcsOCArMTY1Niw3 IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgOiBwcml2YXRlIE1hY3JvQXNzZW1ibGVyIHsKICAgICAg ICAgICAgICAgICBpZiAodGVybS0+Y2FwdHVyZSgpICYmIGNvbXBpbGVNb2RlID09IEluY2x1ZGVT dWJwYXR0ZXJucykgewogICAgICAgICAgICAgICAgICAgICBpbnQgaW5wdXRPZmZzZXQgPSB0ZXJt LT5pbnB1dFBvc2l0aW9uIC0gbV9jaGVja2VkOwogICAgICAgICAgICAgICAgICAgICBpZiAoaW5w dXRPZmZzZXQpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIG1vdmUoaW5kZXgsIGluZGV4VGVt cG9yYXJ5KTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGFkZDMyKEltbTMyKGlucHV0T2Zmc2V0 KSwgaW5kZXhUZW1wb3JhcnkpOworICAgICAgICAgICAgICAgICAgICAgICAgYWRkMzIoSW1tMzIo aW5wdXRPZmZzZXQpLCBpbmRleCwgaW5kZXhUZW1wb3JhcnkpOwogICAgICAgICAgICAgICAgICAg ICAgICAgc2V0U3VicGF0dGVybkVuZChpbmRleFRlbXBvcmFyeSwgdGVybS0+cGFyZW50aGVzZXMu c3VicGF0dGVybklkKTsKICAgICAgICAgICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAg ICAgICAgICAgICBzZXRTdWJwYXR0ZXJuRW5kKGluZGV4LCB0ZXJtLT5wYXJlbnRoZXNlcy5zdWJw YXR0ZXJuSWQpOwo=