188768 2018-08-20 17:07:17 -0700 CSE DataViewGet* DFG nodes 2018-08-31 08:56:44 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 188573 1 saam saam benjamin commit-queue ews-watchlist fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff rmorisset ticaiolima webkit-bug-importer ysuzuki oldest_to_newest 1451847 0 saam 2018-08-20 17:07:17 -0700 ... 1454931 1 saam 2018-08-29 14:33:31 -0700 Compile times seem neutral: v8-spider-compile-time Collected 6 samples per benchmark/VM, with 6 VM invocations per benchmark. Emitted a call to gc() between sample measurements. Used 1 benchmark iteration per VM invocation for warm-up. Used the jsc-specific preciseTime() function to get microsecond-level timing. Reporting benchmark execution times with 95% confidence intervals in milliseconds. og change crypto 28.9927+-0.6474 28.4746+-0.3090 might be 1.0182x faster deltablue 62.3112+-0.6698 ? 63.2544+-1.8412 ? might be 1.0151x slower earley-boyer 33.6730+-0.5252 ? 33.7578+-0.4789 ? raytrace 50.1492+-1.7220 49.2558+-1.9707 might be 1.0181x faster regexp 8.5811+-0.1726 8.4797+-0.2319 might be 1.0120x faster richards 32.5610+-2.0026 31.5524+-0.4715 might be 1.0320x faster splay 13.0094+-0.4086 ? 13.2607+-0.5701 ? might be 1.0193x slower <geometric> 27.2178+-0.3925 27.0540+-0.3173 might be 1.0061x faster sunspider-compile-time Collected 10 samples per benchmark/VM, with 10 VM invocations per benchmark. Emitted a call to gc() between sample measurements. Used 1 benchmark iteration per VM invocation for warm-up. Used the jsc-specific preciseTime() function to get microsecond-level timing. Reporting benchmark execution times with 95% confidence intervals in milliseconds. og change 3d-cube 7.6605+-0.1267 7.6279+-0.0891 3d-morph 2.4644+-0.0740 ? 2.4839+-0.1584 ? 3d-raytrace 7.5117+-0.2640 ? 7.6141+-0.3377 ? might be 1.0136x slower access-binary-trees 5.3174+-0.0586 ? 5.3977+-0.2488 ? might be 1.0151x slower access-fannkuch 16.0672+-0.1699 15.8225+-0.2010 might be 1.0155x faster access-nbody 1.7783+-0.0793 1.7500+-0.0258 might be 1.0162x faster access-nsieve 1.8160+-0.1477 1.7267+-0.0526 might be 1.0517x faster bitops-3bit-bits-in-byte 0.3506+-0.0256 0.3361+-0.0100 might be 1.0431x faster bitops-bits-in-byte 2.8247+-0.0348 ? 2.8427+-0.0296 ? bitops-bitwise-and 0.6298+-0.0418 0.6281+-0.0367 bitops-nsieve-bits 3.8272+-0.0969 ? 3.8896+-0.1107 ? might be 1.0163x slower controlflow-recursive 6.7377+-0.0394 ? 6.8403+-0.3512 ? might be 1.0152x slower crypto-aes 2.9622+-0.0955 2.9349+-0.0486 crypto-md5 2.3069+-0.0898 ? 2.3695+-0.1914 ? might be 1.0271x slower crypto-sha1 2.5124+-0.0426 ? 2.5237+-0.0232 ? date-format-tofte 3.1164+-0.0566 3.1137+-0.0519 date-format-xparb 2.3894+-0.0843 ? 2.3991+-0.0418 ? math-cordic 2.3868+-0.0933 2.3757+-0.1293 math-partial-sums 0.6681+-0.0424 ? 0.6805+-0.0620 ? might be 1.0185x slower math-spectral-norm 0.6611+-0.0551 0.6414+-0.0139 might be 1.0307x faster regexp-dna 0.0000+-0.0000 0.0000+-0.0000 might be NaNx faster string-base64 0.9883+-0.0930 0.9212+-0.0382 might be 1.0728x faster string-fasta 6.3002+-0.0695 ? 6.3312+-0.1114 ? string-tagcloud 2.2417+-0.0299 ? 2.2778+-0.0528 ? might be 1.0161x slower string-unpack-code 3.7908+-0.3662 3.6120+-0.0588 might be 1.0495x faster string-validate-input 1.8718+-0.0306 ? 1.9398+-0.1335 ? might be 1.0364x slower <arithmetic> 3.4301+-0.0197 3.4261+-0.0285 might be 1.0011x faster 1454967 2 348441 saam 2018-08-29 15:48:55 -0700 Created attachment 348441 patch 1454968 3 ews-watchlist 2018-08-29 15:50:54 -0700 Attachment 348441 did not pass style-queue: ERROR: Source/JavaScriptCore/dfg/DFGHeapLocation.h:86: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1455330 4 348441 ysuzuki 2018-08-30 11:55:39 -0700 Comment on attachment 348441 patch View in context: https://bugs.webkit.org/attachment.cgi?id=348441&action=review r=me > Source/JavaScriptCore/dfg/DFGHeapLocation.h:-118 > - return m_kind + m_heap.hash() + m_index.hash() + m_kind; Nice! 1455350 5 348441 commit-queue 2018-08-30 12:28:06 -0700 Comment on attachment 348441 patch Clearing flags on attachment: 348441 Committed r235515: <https://trac.webkit.org/changeset/235515> 1455351 6 commit-queue 2018-08-30 12:28:08 -0700 All reviewed patches have been landed. Closing bug. 1455702 7 webkit-bug-importer 2018-08-31 08:56:44 -0700 <rdar://problem/43941941> 348441 2018-08-29 15:48:55 -0700 2018-08-30 12:28:06 -0700 patch b-backup.diff text/plain 11786 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzU0NzkpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDI4IEBACisyMDE4LTA4LTI5ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIENTRSBEYXRhVmlld0dldCogREZHIG5vZGVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODg3NjgKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1pY3JvYmVuY2htYXJrcy9kYXRh dmlldy1jc2UuanM6IEFkZGVkLgorICAgICAgICAoYXNzZXJ0KToKKyAgICAgICAgKHRlc3QpOgor ICAgICAgICAqIHN0cmVzcy9kYXRhdmlldy1nZXQtY3NlLmpzOiBBZGRlZC4KKyAgICAgICAgKGFz c2VydCk6CisgICAgICAgICh0ZXN0MS5mb28pOgorICAgICAgICAodGVzdDEpOgorICAgICAgICAo dGVzdDIuZm9vKToKKyAgICAgICAgKHRlc3QyKToKKyAgICAgICAgKHRlc3QzLmZvbyk6CisgICAg ICAgICh0ZXN0Myk6CisgICAgICAgICh0ZXN0NC5mb28pOgorICAgICAgICAodGVzdDQpOgorICAg ICAgICAodGVzdDUuZm9vKToKKyAgICAgICAgKHRlc3Q1KToKKyAgICAgICAgKHRlc3Q2LmZvbyk6 CisgICAgICAgICh0ZXN0Nik6CisKIDIwMTgtMDgtMjcgIFl1c3VrZSBTdXp1a2kgIDx5dXN1a2Vz dXp1a2lAc2xvd3N0YXJ0Lm9yZz4KIAogICAgICAgICBbV2ViQXNzZW1ibHldIFBhcnNlIHdhc20g bW9kdWxlcyBpbiBhIHN0cmVhbWluZyBmYXNoaW9uCkluZGV4OiBKU1Rlc3RzL21pY3JvYmVuY2ht YXJrcy9kYXRhdmlldy1jc2UuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSlNUZXN0cy9taWNyb2JlbmNobWFy a3MvZGF0YXZpZXctY3NlLmpzCShub25leGlzdGVudCkKKysrIEpTVGVzdHMvbWljcm9iZW5jaG1h cmtzL2RhdGF2aWV3LWNzZS5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDI4IEBACisidXNl IHN0cmljdCI7CisKK2Z1bmN0aW9uIGFzc2VydChiKSB7CisgICAgaWYgKCFiKQorICAgICAgICB0 aHJvdyBuZXcgRXJyb3I7Cit9CisKK2Z1bmN0aW9uIHRlc3QoZHYsIGxpdHRsZUVuZGlhbikgewor ICAgIHJldHVybiBkdi5nZXRJbnQzMigwLCBsaXR0bGVFbmRpYW4pCisgICAgKyBkdi5nZXRJbnQz MigwLCBsaXR0bGVFbmRpYW4pCisgICAgKyBkdi5nZXRJbnQzMigwLCBsaXR0bGVFbmRpYW4pCisg ICAgKyBkdi5nZXRJbnQzMigwLCBsaXR0bGVFbmRpYW4pCisgICAgKyBkdi5nZXRJbnQzMigwLCBs aXR0bGVFbmRpYW4pCisgICAgKyBkdi5nZXRJbnQzMigwLCBsaXR0bGVFbmRpYW4pCisgICAgKyBk di5nZXRJbnQzMigwLCBsaXR0bGVFbmRpYW4pCisgICAgKyBkdi5nZXRJbnQzMigwLCBsaXR0bGVF bmRpYW4pCisgICAgKyBkdi5nZXRJbnQzMigwLCBsaXR0bGVFbmRpYW4pCisgICAgKyBkdi5nZXRJ bnQzMigwLCBsaXR0bGVFbmRpYW4pCit9Citub0lubGluZSh0ZXN0KTsKKworbGV0IGFiID0gbmV3 IEFycmF5QnVmZmVyKDQpOworbGV0IGR2ID0gbmV3IERhdGFWaWV3KGFiKTsKK2R2LnNldEludDMy KDAsIDEwLCB0cnVlKTsKK2ZvciAobGV0IGkgPSAwOyBpIDwgMTAwMDAwMDsgKytpKSB7CisgICAg bGV0IHJlc3VsdCA9IHRlc3QoZHYsIHRydWUpOworICAgIGFzc2VydChyZXN1bHQgPT09IDEwKjEw KTsKK30KSW5kZXg6IEpTVGVzdHMvc3RyZXNzL2RhdGF2aWV3LWdldC1jc2UuanMKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gSlNUZXN0cy9zdHJlc3MvZGF0YXZpZXctZ2V0LWNzZS5qcwkobm9uZXhpc3RlbnQpCisr KyBKU1Rlc3RzL3N0cmVzcy9kYXRhdmlldy1nZXQtY3NlLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0w LDAgKzEsMTM3IEBACisidXNlIHN0cmljdCI7CisKK2Z1bmN0aW9uIGFzc2VydChiKSB7CisgICAg aWYgKCFiKQorICAgICAgICB0aHJvdyBuZXcgRXJyb3I7Cit9CisKKworZnVuY3Rpb24gdGVzdDEo KSB7CisgICAgZnVuY3Rpb24gZm9vKGR2KSB7CisgICAgICAgIHJldHVybiBbZHYuZ2V0RmxvYXQz MigwKSwgZHYuZ2V0RmxvYXQ2NCgwKV07CisgICAgfQorICAgIG5vSW5saW5lKGZvbyk7CisKKyAg ICBsZXQgYWIgPSBuZXcgQXJyYXlCdWZmZXIoOCk7CisgICAgbGV0IGR2ID0gbmV3IERhdGFWaWV3 KGFiKTsKKyAgICBkdi5zZXRGbG9hdDY0KDAsIDEyODQzMS40MjM0MjE4OTQzMiwgZmFsc2UpOwor ICAgIGZvciAobGV0IGkgPSAwOyBpIDwgMTAwMDA7ICsraSkgeworICAgICAgICBsZXQgcmVzdWx0 ID0gZm9vKGR2KTsKKyAgICAgICAgYXNzZXJ0KHJlc3VsdFswXSAhPT0gcmVzdWx0WzFdKTsKKyAg ICB9Cit9Cit0ZXN0MSgpOworCitmdW5jdGlvbiB0ZXN0MigpIHsKKyAgICBmdW5jdGlvbiBmb28o ZHYpIHsKKyAgICAgICAgcmV0dXJuIFtkdi5nZXRGbG9hdDMyKDApLCBkdi5nZXRGbG9hdDMyKDAp XTsKKyAgICB9CisgICAgbm9JbmxpbmUoZm9vKTsKKworICAgIGxldCBhYiA9IG5ldyBBcnJheUJ1 ZmZlcig4KTsKKyAgICBsZXQgZHYgPSBuZXcgRGF0YVZpZXcoYWIpOworICAgIGR2LnNldEZsb2F0 NjQoMCwgMTI4NDMxLjQyMzQyMTg5NDMyLCBmYWxzZSk7CisgICAgZm9yIChsZXQgaSA9IDA7IGkg PCAxMDAwMDsgKytpKSB7CisgICAgICAgIGxldCByZXN1bHQgPSBmb28oZHYpOworICAgICAgICBh c3NlcnQocmVzdWx0WzBdID09PSByZXN1bHRbMV0pOworICAgIH0KK30KK3Rlc3QyKCk7CisKK2Z1 bmN0aW9uIHRlc3QzKCkgeworICAgIGZ1bmN0aW9uIGZvbyhkdiwgdGEpIHsKKyAgICAgICAgbGV0 IGEgPSBkdi5nZXRGbG9hdDY0KDAsIHRydWUpOworICAgICAgICB0YVswXSA9IE1hdGguUEk7Cisg ICAgICAgIGxldCBiID0gZHYuZ2V0RmxvYXQ2NCgwLCB0cnVlKTsKKyAgICAgICAgcmV0dXJuIFth LCBiXTsKKyAgICB9CisgICAgbm9JbmxpbmUoZm9vKTsKKworICAgIGxldCBhYiA9IG5ldyBBcnJh eUJ1ZmZlcig4KTsKKyAgICBsZXQgZHYgPSBuZXcgRGF0YVZpZXcoYWIpOworICAgIGxldCB0YSA9 IG5ldyBGbG9hdDY0QXJyYXkoYWIpOworICAgIGZvciAobGV0IGkgPSAwOyBpIDwgNDAwMDA7ICsr aSkgeworICAgICAgICBkdi5zZXRGbG9hdDY0KDAsIDAuMCwgdHJ1ZSk7CisgICAgICAgIGxldCBy ZXN1bHQgPSBmb28oZHYsIHRhKTsKKyAgICAgICAgYXNzZXJ0KHJlc3VsdFswXSA9PT0gMC4wKTsK KyAgICAgICAgYXNzZXJ0KHJlc3VsdFsxXSA9PT0gTWF0aC5QSSk7CisgICAgfQorfQordGVzdDMo KTsKKworZnVuY3Rpb24gdGVzdDQoKSB7CisgICAgZnVuY3Rpb24gZm9vKGR2KSB7CisgICAgICAg IGxldCBhID0gZHYuZ2V0SW50MzIoMCwgdHJ1ZSk7CisgICAgICAgIGxldCBiID0gZHYuZ2V0SW50 MzIoMCwgZmFsc2UpOworICAgICAgICByZXR1cm4gW2EsIGJdOworICAgIH0KKyAgICBub0lubGlu ZShmb28pOworCisgICAgbGV0IGFiID0gbmV3IEFycmF5QnVmZmVyKDgpOworICAgIGxldCBkdiA9 IG5ldyBEYXRhVmlldyhhYik7CisgICAgZHYuc2V0SW50MzIoMCwgMHgxMTIyMzM0NCwgdHJ1ZSk7 CisgICAgZm9yIChsZXQgaSA9IDA7IGkgPCA0MDAwMDsgKytpKSB7CisgICAgICAgIGxldCByZXN1 bHQgPSBmb28oZHYpOworICAgICAgICBhc3NlcnQocmVzdWx0WzBdID09PSAweDExMjIzMzQ0KTsK KyAgICAgICAgYXNzZXJ0KHJlc3VsdFsxXSA9PT0gMHg0NDMzMjIxMSkKKyAgICB9Cit9Cit0ZXN0 NCgpOworCitmdW5jdGlvbiB0ZXN0NSgpIHsKKyAgICBmdW5jdGlvbiBmb28oZHYsIGxpdHRsZUVu ZGlhbikgeworICAgICAgICBsZXQgYSA9IGR2LmdldEludDMyKDAsIGxpdHRsZUVuZGlhbik7Cisg ICAgICAgIGxldCBiID0gZHYuZ2V0SW50MzIoMCwgIWxpdHRsZUVuZGlhbik7CisgICAgICAgIHJl dHVybiBbYSwgYl07CisgICAgfQorICAgIG5vSW5saW5lKGZvbyk7CisKKyAgICBsZXQgYWIgPSBu ZXcgQXJyYXlCdWZmZXIoOCk7CisgICAgbGV0IGR2ID0gbmV3IERhdGFWaWV3KGFiKTsKKyAgICBk di5zZXRJbnQzMigwLCAweDExMjIzMzQ0LCB0cnVlKTsKKyAgICBmb3IgKGxldCBpID0gMDsgaSA8 IDQwMDAwOyArK2kpIHsKKyAgICAgICAgbGV0IHJlc3VsdCA9IGZvbyhkdiwgdHJ1ZSk7CisgICAg ICAgIGFzc2VydChyZXN1bHRbMF0gPT09IDB4MTEyMjMzNDQpOworICAgICAgICBhc3NlcnQocmVz dWx0WzFdID09PSAweDQ0MzMyMjExKQorICAgIH0KK30KK3Rlc3Q1KCk7CisKK2Z1bmN0aW9uIHRl c3Q2KCkgeworICAgIGZ1bmN0aW9uIGZvbyhkdiwgbGl0dGxlRW5kaWFuKSB7CisgICAgICAgIGxl dCBhID0gZHYuZ2V0SW50MzIoMCwgbGl0dGxlRW5kaWFuKTsKKyAgICAgICAgbGV0IGIgPSBkdi5n ZXRJbnQzMigwLCBsaXR0bGVFbmRpYW4pOworICAgICAgICByZXR1cm4gW2EsIGJdOworICAgIH0K KyAgICBub0lubGluZShmb28pOworCisgICAgbGV0IGFiID0gbmV3IEFycmF5QnVmZmVyKDgpOwor ICAgIGxldCBkdiA9IG5ldyBEYXRhVmlldyhhYik7CisgICAgZHYuc2V0SW50MzIoMCwgMHgxMTIy MzM0NCwgdHJ1ZSk7CisgICAgZm9yIChsZXQgaSA9IDA7IGkgPCA0MDAwMDsgKytpKSB7CisgICAg ICAgIGxldCByZXN1bHQgPSBmb28oZHYsIHRydWUpOworICAgICAgICBhc3NlcnQocmVzdWx0WzBd ID09PSAweDExMjIzMzQ0KTsKKyAgICAgICAgYXNzZXJ0KHJlc3VsdFsxXSA9PT0gMHgxMTIyMzM0 NCkKKyAgICB9Cit9Cit0ZXN0NigpOworCitmdW5jdGlvbiB0ZXN0NygpIHsKKyAgICBmdW5jdGlv biBmb28oZHYpIHsKKyAgICAgICAgbGV0IGEgPSBkdi5nZXRJbnQzMigwLCB0cnVlKTsKKyAgICAg ICAgbGV0IGIgPSBkdi5nZXRJbnQzMig0LCB0cnVlKTsKKyAgICAgICAgcmV0dXJuIFthLCBiXTsK KyAgICB9CisgICAgbm9JbmxpbmUoZm9vKTsKKworICAgIGxldCBhYiA9IG5ldyBBcnJheUJ1ZmZl cig4KTsKKyAgICBsZXQgZHYgPSBuZXcgRGF0YVZpZXcoYWIpOworICAgIGR2LnNldEludDMyKDAs IDB4MTEyMjMzNDQsIHRydWUpOworICAgIGR2LnNldEludDMyKDQsIDB4MTIxMjEyMTIsIHRydWUp OworICAgIGZvciAobGV0IGkgPSAwOyBpIDwgNDAwMDA7ICsraSkgeworICAgICAgICBsZXQgcmVz dWx0ID0gZm9vKGR2LCB0cnVlKTsKKyAgICAgICAgYXNzZXJ0KHJlc3VsdFswXSA9PT0gMHgxMTIy MzM0NCk7CisgICAgICAgIGFzc2VydChyZXN1bHRbMV0gPT09IDB4MTIxMjEyMTIpOworICAgIH0K K30KK3Rlc3Q3KCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNTQ3 NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwyNyBAQAorMjAxOC0wOC0yOSAgU2FhbSBiYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNv bT4KKworICAgICAgICBDU0UgRGF0YVZpZXdHZXQqIERGRyBub2RlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4NzY4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtYWtlcyBpdCBzbyB0 aGF0IHdlIENTRSBEYXRhVmlld0dldCogYWNjZXNzZXMuIFRvIGRvIHRoaXMsCisgICAgICAgIEkg bmVlZGVkIHRvIGFkZCBhIHRoaXJkIGRlc2NyaXB0b3IgdG8gSGVhcExvY2F0aW9uIHRvIHJlcHJl c2VudCB0aGUKKyAgICAgICAgaXNMaXR0bGVFbmRpYW4gY2hpbGQuIFRoaXMgcGF0Y2ggaXMgbmV1 dHJhbCBvbiBjb21waWxlIHRpbWUgYmVuY2htYXJrcywKKyAgICAgICAgYW5kIGlzIGEgNTAlIHNw ZWVkdXAgb24gYSB0cml2aWFsIENTRSBtaWNyb2JlbmNobWFyayB0aGF0IEkgYWRkZWQuCisKKyAg ICAgICAgKiBkZmcvREZHQ2xvYmJlcml6ZS5oOgorICAgICAgICAoSlNDOjpERkc6OmNsb2JiZXJp emUpOgorICAgICAgICAqIGRmZy9ERkdGaXh1cFBoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZH OjpGaXh1cFBoYXNlOjpmaXh1cE5vZGUpOgorICAgICAgICAqIGRmZy9ERkdIZWFwTG9jYXRpb24u Y3BwOgorICAgICAgICAoV1RGOjpwcmludEludGVybmFsKToKKyAgICAgICAgKiBkZmcvREZHSGVh cExvY2F0aW9uLmg6CisgICAgICAgIChKU0M6OkRGRzo6SGVhcExvY2F0aW9uOjpIZWFwTG9jYXRp b24pOgorICAgICAgICAoSlNDOjpERkc6OkhlYXBMb2NhdGlvbjo6aGFzaCBjb25zdCk6CisgICAg ICAgIChKU0M6OkRGRzo6SGVhcExvY2F0aW9uOjpvcGVyYXRvcj09IGNvbnN0KToKKyAgICAgICAg KEpTQzo6REZHOjppbmRleGVkUHJvcGVydHlMb2NGb3JSZXN1bHRUeXBlKToKKwogMjAxOC0wOC0y OSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIzNTQzMiBhbmQgcjIzNTQzNi4KSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQ2xvYmJlcml6ZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQ2xvYmJlcml6ZS5oCShyZXZpc2lvbiAyMzU0NzUpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Nsb2JiZXJpemUuaAkod29ya2luZyBjb3B5KQpA QCAtMTc2Myw2ICsxNzYzLDkgQEAgdm9pZCBjbG9iYmVyaXplKEdyYXBoJiBncmFwaCwgTm9kZSog bm9kZQogICAgIGNhc2UgRGF0YVZpZXdHZXRJbnQ6IHsKICAgICAgICAgcmVhZChNaXNjRmllbGRz KTsKICAgICAgICAgcmVhZChUeXBlZEFycmF5UHJvcGVydGllcyk7CisgICAgICAgIExvY2F0aW9u S2luZCBpbmRleGVkUHJvcGVydHlMb2MgPSBpbmRleGVkUHJvcGVydHlMb2NGb3JSZXN1bHRUeXBl KG5vZGUtPnJlc3VsdCgpKTsKKyAgICAgICAgZGVmKEhlYXBMb2NhdGlvbihpbmRleGVkUHJvcGVy dHlMb2MsIEFic3RyYWN0SGVhcChUeXBlZEFycmF5UHJvcGVydGllcywgbm9kZS0+ZGF0YVZpZXdE YXRhKCkuYXNRdWFkV29yZCksCisgICAgICAgICAgICBub2RlLT5jaGlsZDEoKSwgbm9kZS0+Y2hp bGQyKCksIG5vZGUtPmNoaWxkMygpKSwgTGF6eU5vZGUobm9kZSkpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ZpeHVwUGhhc2Uu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFz ZS5jcHAJKHJldmlzaW9uIDIzNTQ3NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Rml4dXBQaGFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMTksNyArMjExOSw3IEBAIHByaXZh dGU6CiAgICAgICAgICAgICAgICAgICAgIG5vZGUtPnNldFJlc3VsdChOb2RlUmVzdWx0SW50MzIp OwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNlIDQ6Ci0g ICAgICAgICAgICAgICAgICAgIGlmIChkYXRhLmlzU2lnbmVkKSAKKyAgICAgICAgICAgICAgICAg ICAgaWYgKGRhdGEuaXNTaWduZWQpCiAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLT5zZXRS ZXN1bHQoTm9kZVJlc3VsdEludDMyKTsKICAgICAgICAgICAgICAgICAgICAgZWxzZQogICAgICAg ICAgICAgICAgICAgICAgICAgbm9kZS0+c2V0UmVzdWx0KE5vZGVSZXN1bHRJbnQ1Mik7CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0hlYXBMb2NhdGlvbi5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdIZWFwTG9jYXRpb24uY3BwCShyZXZp c2lvbiAyMzU0NzUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0hlYXBMb2NhdGlv bi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMiw2ICsxMzIsMTAgQEAgdm9pZCBwcmludEludGVy bmFsKFByaW50U3RyZWFtJiBvdXQsIExvYwogICAgICAgICBvdXQucHJpbnQoIkluZGV4ZWRQcm9w ZXJ0eURvdWJsZVNhbmVDaGFpbkxvYyIpOwogICAgICAgICByZXR1cm47CiAKKyAgICBjYXNlIElu ZGV4ZWRQcm9wZXJ0eUludDMyTG9jOgorICAgICAgICBvdXQucHJpbnQoIkluZGV4ZWRQcm9wZXJ0 eUludDMyTG9jIik7CisgICAgICAgIHJldHVybjsKKwogICAgIGNhc2UgSW5kZXhlZFByb3BlcnR5 SW50NTJMb2M6CiAgICAgICAgIG91dC5wcmludCgiSW5kZXhlZFByb3BlcnR5SW50NTJMb2MiKTsK ICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdIZWFw TG9jYXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0hl YXBMb2NhdGlvbi5oCShyZXZpc2lvbiAyMzU0NzUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR0hlYXBMb2NhdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC00OSw2ICs0OSw3IEBAIGVu dW0gTG9jYXRpb25LaW5kIHsKICAgICBIYXNJbmRleGVkUHJvcGVydHlMb2MsCiAgICAgSW5kZXhl ZFByb3BlcnR5RG91YmxlTG9jLAogICAgIEluZGV4ZWRQcm9wZXJ0eURvdWJsZVNhbmVDaGFpbkxv YywKKyAgICBJbmRleGVkUHJvcGVydHlJbnQzMkxvYywKICAgICBJbmRleGVkUHJvcGVydHlJbnQ1 MkxvYywKICAgICBJbmRleGVkUHJvcGVydHlKU0xvYywKICAgICBJbmRleGVkUHJvcGVydHlTdG9y YWdlTG9jLApAQCAtNzcsMjQgKzc4LDI1IEBAIHB1YmxpYzoKICAgICBIZWFwTG9jYXRpb24oCiAg ICAgICAgIExvY2F0aW9uS2luZCBraW5kID0gSW52YWxpZExvY2F0aW9uS2luZCwKICAgICAgICAg QWJzdHJhY3RIZWFwIGhlYXAgPSBBYnN0cmFjdEhlYXAoKSwKLSAgICAgICAgTm9kZSogYmFzZSA9 IG51bGxwdHIsIExhenlOb2RlIGluZGV4ID0gTGF6eU5vZGUoKSkKKyAgICAgICAgTm9kZSogYmFz ZSA9IG51bGxwdHIsIExhenlOb2RlIGluZGV4ID0gTGF6eU5vZGUoKSwgTm9kZSogZGVzY3JpcHRv ciA9IG51bGxwdHIpCiAgICAgICAgIDogbV9raW5kKGtpbmQpCiAgICAgICAgICwgbV9oZWFwKGhl YXApCiAgICAgICAgICwgbV9iYXNlKGJhc2UpCiAgICAgICAgICwgbV9pbmRleChpbmRleCkKKyAg ICAgICAgLCBtX2Rlc2NyaXB0b3IoZGVzY3JpcHRvcikKICAgICB7CiAgICAgICAgIEFTU0VSVCgo a2luZCA9PSBJbnZhbGlkTG9jYXRpb25LaW5kKSA9PSAhaGVhcCk7CiAgICAgICAgIEFTU0VSVCgh IW1faGVhcCB8fCAhbV9iYXNlKTsKLSAgICAgICAgQVNTRVJUKG1fYmFzZSB8fCAhbV9pbmRleCk7 CisgICAgICAgIEFTU0VSVChtX2Jhc2UgfHwgKCFtX2luZGV4ICYmICFtX2Rlc2NyaXB0b3IpKTsK ICAgICB9CiAKLSAgICBIZWFwTG9jYXRpb24oTG9jYXRpb25LaW5kIGtpbmQsIEFic3RyYWN0SGVh cCBoZWFwLCBOb2RlKiBiYXNlLCBOb2RlKiBpbmRleCkKLSAgICAgICAgOiBIZWFwTG9jYXRpb24o a2luZCwgaGVhcCwgYmFzZSwgTGF6eU5vZGUoaW5kZXgpKQorICAgIEhlYXBMb2NhdGlvbihMb2Nh dGlvbktpbmQga2luZCwgQWJzdHJhY3RIZWFwIGhlYXAsIE5vZGUqIGJhc2UsIE5vZGUqIGluZGV4 LCBOb2RlKiBkZXNjcmlwdG9yID0gbnVsbHB0cikKKyAgICAgICAgOiBIZWFwTG9jYXRpb24oa2lu ZCwgaGVhcCwgYmFzZSwgTGF6eU5vZGUoaW5kZXgpLCBkZXNjcmlwdG9yKQogICAgIHsKICAgICB9 CiAgICAgCi0gICAgSGVhcExvY2F0aW9uKExvY2F0aW9uS2luZCBraW5kLCBBYnN0cmFjdEhlYXAg aGVhcCwgRWRnZSBiYXNlLCBFZGdlIGluZGV4ID0gRWRnZSgpKQotICAgICAgICA6IEhlYXBMb2Nh dGlvbihraW5kLCBoZWFwLCBiYXNlLm5vZGUoKSwgaW5kZXgubm9kZSgpKQorICAgIEhlYXBMb2Nh dGlvbihMb2NhdGlvbktpbmQga2luZCwgQWJzdHJhY3RIZWFwIGhlYXAsIEVkZ2UgYmFzZSwgRWRn ZSBpbmRleCA9IEVkZ2UoKSwgRWRnZSBkZXNjcmlwdG9yID0gRWRnZSgpKQorICAgICAgICA6IEhl YXBMb2NhdGlvbihraW5kLCBoZWFwLCBiYXNlLm5vZGUoKSwgaW5kZXgubm9kZSgpLCBkZXNjcmlw dG9yLm5vZGUoKSkKICAgICB7CiAgICAgfQogICAgIApAQCAtMTAzLDYgKzEwNSw3IEBAIHB1Ymxp YzoKICAgICAgICAgLCBtX2hlYXAoV1RGOjpIYXNoVGFibGVEZWxldGVkVmFsdWUpCiAgICAgICAg ICwgbV9iYXNlKG51bGxwdHIpCiAgICAgICAgICwgbV9pbmRleChudWxscHRyKQorICAgICAgICAs IG1fZGVzY3JpcHRvcihudWxscHRyKQogICAgIHsKICAgICB9CiAgICAgCkBAIC0xMTUsNyArMTE4 LDcgQEAgcHVibGljOgogICAgIAogICAgIHVuc2lnbmVkIGhhc2goKSBjb25zdAogICAgIHsKLSAg ICAgICAgcmV0dXJuIG1fa2luZCArIG1faGVhcC5oYXNoKCkgKyBtX2luZGV4Lmhhc2goKSArIG1f a2luZDsKKyAgICAgICAgcmV0dXJuIG1fa2luZCArIG1faGVhcC5oYXNoKCkgKyBtX2luZGV4Lmhh c2goKSArIHN0YXRpY19jYXN0PHVuc2lnbmVkPihiaXR3aXNlX2Nhc3Q8dWludHB0cl90PihtX2Jh c2UpKSArIHN0YXRpY19jYXN0PHVuc2lnbmVkPihiaXR3aXNlX2Nhc3Q8dWludHB0cl90PihtX2Rl c2NyaXB0b3IpKTsKICAgICB9CiAgICAgCiAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IEhlYXBM b2NhdGlvbiYgb3RoZXIpIGNvbnN0CkBAIC0xMjMsNyArMTI2LDggQEAgcHVibGljOgogICAgICAg ICByZXR1cm4gbV9raW5kID09IG90aGVyLm1fa2luZAogICAgICAgICAgICAgJiYgbV9oZWFwID09 IG90aGVyLm1faGVhcAogICAgICAgICAgICAgJiYgbV9iYXNlID09IG90aGVyLm1fYmFzZQotICAg ICAgICAgICAgJiYgbV9pbmRleCA9PSBvdGhlci5tX2luZGV4OworICAgICAgICAgICAgJiYgbV9p bmRleCA9PSBvdGhlci5tX2luZGV4CisgICAgICAgICAgICAmJiBtX2Rlc2NyaXB0b3IgPT0gb3Ro ZXIubV9kZXNjcmlwdG9yOwogICAgIH0KICAgICAKICAgICBib29sIGlzSGFzaFRhYmxlRGVsZXRl ZFZhbHVlKCkgY29uc3QKQEAgLTEzOCw2ICsxNDIsNyBAQCBwcml2YXRlOgogICAgIEFic3RyYWN0 SGVhcCBtX2hlYXA7CiAgICAgTm9kZSogbV9iYXNlOwogICAgIExhenlOb2RlIG1faW5kZXg7Cisg ICAgTm9kZSogbV9kZXNjcmlwdG9yOwogfTsKIAogc3RydWN0IEhlYXBMb2NhdGlvbkhhc2ggewpA QCAtMTU5LDYgKzE2NCw4IEBAIGlubGluZSBMb2NhdGlvbktpbmQgaW5kZXhlZFByb3BlcnR5TG9j Rm8KICAgICAgICAgcmV0dXJuIEluZGV4ZWRQcm9wZXJ0eURvdWJsZUxvYzsKICAgICBjYXNlIE5v ZGVSZXN1bHRJbnQ1MjoKICAgICAgICAgcmV0dXJuIEluZGV4ZWRQcm9wZXJ0eUludDUyTG9jOwor ICAgIGNhc2UgTm9kZVJlc3VsdEludDMyOgorICAgICAgICByZXR1cm4gSW5kZXhlZFByb3BlcnR5 SW50MzJMb2M7CiAgICAgY2FzZSBOb2RlUmVzdWx0SlM6CiAgICAgICAgIHJldHVybiBJbmRleGVk UHJvcGVydHlKU0xvYzsKICAgICBjYXNlIE5vZGVSZXN1bHRTdG9yYWdlOgo=