195653 2019-03-12 17:17:25 -0700 [JSC] OSR entry should respect abstract values in addition to flush formats 2019-03-14 13:16:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki commit-queue ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1515771 0 ysuzuki 2019-03-12 17:17:25 -0700 [JSC] OSR entry should respect abstract values in addition to flush formats 1515808 1 364490 ysuzuki 2019-03-12 18:13:19 -0700 Created attachment 364490 Patch 1515809 2 ews-watchlist 2019-03-12 18:14:21 -0700 Attachment 364490 did not pass style-queue: ERROR: Source/JavaScriptCore/ChangeLog:14: Line contains tab character. [whitespace/tab] [5] ERROR: Source/JavaScriptCore/ChangeLog:15: Line contains tab character. [whitespace/tab] [5] ERROR: Source/JavaScriptCore/ChangeLog:16: Line contains tab character. [whitespace/tab] [5] Total errors found: 3 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1515811 3 364491 ysuzuki 2019-03-12 18:25:57 -0700 Created attachment 364491 Patch 1515815 4 364491 mark.lam 2019-03-12 18:38:54 -0700 Comment on attachment 364491 Patch r=me 1515835 5 364491 commit-queue 2019-03-12 19:34:34 -0700 Comment on attachment 364491 Patch Clearing flags on attachment: 364491 Committed r242841: <https://trac.webkit.org/changeset/242841> 1515836 6 commit-queue 2019-03-12 19:34:35 -0700 All reviewed patches have been landed. Closing bug. 1515837 7 webkit-bug-importer 2019-03-12 19:35:17 -0700 <rdar://problem/48834271> 1515844 8 mark.lam 2019-03-12 19:58:13 -0700 <rdar://problem/48766554> 1516303 9 364491 saam 2019-03-13 18:09:11 -0700 Comment on attachment 364491 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=364491&action=review > Source/JavaScriptCore/dfg/DFGOSREntry.cpp:228 > + if (!value) { how is this the right check? 1516307 10 364491 saam 2019-03-13 18:11:05 -0700 Comment on attachment 364491 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=364491&action=review > Source/JavaScriptCore/dfg/DFGOSREntry.cpp:215 > + if (!entry->m_expectedValues.local(local).validate(value)) { > + if (Options::verboseOSR()) { > + dataLog( > + " OSR failed because variable ", VirtualRegister(localOffset), " is ", > + value, ", expected ", > + entry->m_expectedValues.local(local), ".\n"); > + } > + return 0; > + } Why are any below checks needed if this is done? 1516605 11 364491 ysuzuki 2019-03-14 13:16:18 -0700 Comment on attachment 364491 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=364491&action=review >> Source/JavaScriptCore/dfg/DFGOSREntry.cpp:215 >> + } > > Why are any below checks needed if this is done? Yes, and I found that this patch is conservative for AnyInt and Double cases. I've created the follow-up patch. https://bugs.webkit.org/show_bug.cgi?id=195752 >> Source/JavaScriptCore/dfg/DFGOSREntry.cpp:228 >> + if (!value) { > > how is this the right check? Ooooops, fixed in the follow-up patch. 364490 2019-03-12 18:13:19 -0700 2019-03-12 18:25:56 -0700 Patch bug-195653-20190312181318.patch text/plain 7305 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ODNjOGExYmI0NmMwMjViZGMwMGQ5YmNhMzFmZTZmNzZhZTMyNzI5Li4wNGY0ODQyZmFlZDY5NzQ2 ZGE5YTI0NzM4MDc1MTc4NjNjNGNlNTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MCBAQAorMjAxOS0wMy0xMiAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIE9TUiBlbnRyeSBzaG91bGQgcmVzcGVjdCBhYnN0cmFjdCB2YWx1 ZXMgaW4gYWRkaXRpb24gdG8gZmx1c2ggZm9ybWF0cworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1NjUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTGV0J3MgY29uc2lkZXIgdGhlIGZvbGxvd2luZyBncmFw aC4KKworICAgICAgICBCbG9jayAjMAorICAgICAgICAgICAgLi4uCisgICAgICAgICAgICAyNzo8 IDI6bG9jMTM+IEpTQ29uc3RhbnQoSlN8VXNlQXNPdGhlciwgU3RyaW5nSWRlbnQsIFN0cm9uZzpT dHJpbmcgKGF0b21pYykgKGlkZW50aWZpZXIpOiAsIFN0cnVjdHVyZUlEOiA0MjY3OSwgYmMjMTAs IEV4aXRWYWxpZCkKKyAgICAgICAgICAgIC4uLgorICAgICAgICAgICAgMjg6PCAyOmxvYzEzPglB cml0aFBvdyhEb3VibGVSZXA6QDQzNzxEb3VibGU+LCBJbnQzMjpAMjcsIERvdWJsZXxVc2VBc090 aGVyLCBCeXRlY29kZURvdWJsZSwgRXhpdHMsIGJjIzEwLCBFeGl0VmFsaWQpCisgICAgICAgICAg ICAyOTo8ITA6LT4JTW92SGludChEb3VibGVSZXA6QDI4PERvdWJsZT4sIE11c3RHZW4sIGxvYzcs IFc6U2lkZVN0YXRlLCBDbG9iYmVyc0V4aXQsIGJjIzEwLCBFeGl0VmFsaWQpCisgICAgICAgICAg ICAzMDo8IDE6LT4JU2V0TG9jYWwoRG91YmxlUmVwOkAyODxEb3VibGU+LCBsb2M3KE08RG91Ymxl Pi9GbHVzaGVkRG91YmxlKSwgbWFjaGluZTpsb2M2LCBXOlN0YWNrKC04KSwgYmMjMTAsIGV4aXQ6 IGJjIzE0LCBFeGl0VmFsaWQpICBwcmVkaWN0aW5nIEJ5dGVjb2RlRG91YmxlCisgICAgICAgICAg ICAuLi4KKyAgICAgICAgICAgIDczOjwhMDotPiBKdW1wKE11c3RHZW4sIFQ6IzEsIFc6U2lkZVN0 YXRlLCBiYyM3MSwgRXhpdFZhbGlkKQorCisgICAgICAgIEJsb2NrICMxIChiYyM3MSk6IChPU1Ig dGFyZ2V0KSBwcmVkLCAjMAorICAgICAgICAgICAgLi4uCisgICAgICAgICAgICAxMDI6PCEyOmxv YzE1PiBHZXRMb2NhbChDaGVjazpVbnR5cGVkOkA0MDAsIERvdWJsZXxNdXN0R2VufFB1cmVJbnQs IEJ5dGVjb2RlRG91YmxlLCBsb2M3KE08RG91YmxlPi9GbHVzaGVkRG91YmxlKSwgbWFjaGluZTps b2M2LCBSOlN0YWNrKC04KSwgYmMjMTIwLCBFeGl0VmFsaWQpICBwcmVkaWN0aW5nIEJ5dGVjb2Rl RG91YmxlCisgICAgICAgICAgICAuLi4KKworICAgICAgICBDRkEgYXQgQDI4IHNheXMgaXQgaXMg aW52YWxpZCBzaW5jZSB0aGVyZSBhcmUgdHlwZSBjb250cmFkaWN0aW9uIChJbnQzMjpAMjcgdi5z LiBTdHJpbmdJZGVudCkuIFNvLCBvZiBjb3Vyc2UsIHdlIGRvIG5vdCBwcm9wYWdhdGUgIzAncyB0 eXBlIGluZm9ybWF0aW9uIHRvICMxIHNpbmNlIHdlIGJlY29tZSBpbnZhbGlkIHN0YXRlLgorICAg ICAgICBIb3dldmVyLCAjMSBpcyBzdGlsbCByZWFjaGFibGUgc2luY2UgaXQgaXMgYW4gT1NSIHRh cmdldC4gU2luY2UgIzAgd2FzIG9ubHkgdGhlIHByZWRlY2Vzc29yIG9mICMxLCBsb2M3J3MgdHlw ZSBpbmZvcm1hdGlvbiBiZWNvbWVzIE5vbmUgYXQgdGhlIGhlYWQgb2YgIzEuCisgICAgICAgIFNp bmNlIGxvYzcncyBBYnN0cmFjdFZhbHVlIGlzIE5vbmUsIEAxMDIgR2V0TG9jYWwgZW1pdHMgYnJl YWtwb2ludC4gSXQgaXMgT0sgYXMgbG9uZyBhcyBPU1IgZW50cnkgZmFpbHMgYmVjYXVzZSBBYnN0 cmFjdFZhbHVlIHZhbGlkYXRpb24gcmVxdWlyZXMgdGhlIGdpdmVuIHZhbHVlIGlzIE5vbmUgdHlw ZS4KKworICAgICAgICBUaGUgaXNzdWUgaGVyZSBpcyB0aGF0IHdlIHNraXBwZWQgQWJzdHJhY3RW YWx1ZSB2YWxpZGF0aW9uIHdoZW4gd2UgaGF2ZSBGbHVzaEZvcm1hdCBpbmZvcm1hdGlvbi4gU2lu Y2UgbG9jNyBoYXMgRmx1c2hlZERvdWJsZSBmb3JtYXQsIERGRyBPU1IgZW50cnkgY29kZSBkb2Vz IG5vdCB2YWxpZGF0ZSBpdCBhZ2FpbnN0IEFic3RyYWN0VmFsdWUsCisgICAgICAgIHdoaWNoIGlz IE5vbmUuIFRoZW4sIHdlIGhpdCB0aGUgYnJlYWtwb2ludCBlbWl0dGVkIGJ5IEAxMDIuCisKKyAg ICAgICAgVGhpcyBwYXRjaCBwZXJmb3JtcyBBYnN0cmFjdFZhbHVlIHZhbGlkYXRpb24gYWdhaW5z dCB2YWx1ZXMgZXZlbiBpZiB3ZSBoYXZlIEZsdXNoRm9ybWF0LiBXZSBzaG91bGQgY29ycmVjdGx5 IGNvbmZpZ3VyZSBBYnN0cmFjdFZhbHVlIGZvciBPU1IgZW50cnkncyBsb2NhbHMgdG9vIHRvIGF2 b2lkIHVubmVjZXNzYXJ5IE9TUiBlbnRyeQorICAgICAgICBmYWlsdXJlcyBpbiB0aGUgZnV0dXJl IGJ1dCBhbnl3YXkgdmFsaWRhdGluZyBsb2NhbHMgd2l0aCBBYnN0cmFjdFZhbHVlIGlzIGNvcnJl Y3QgYmVoYXZpb3IgaGVyZSBzaW5jZSBERkdTcGVjdWxhdGl2ZUpJVCByZWxpZXMgb24gdGhhdC4K KworICAgICAgICAqIGRmZy9ERkdPU1JFbnRyeS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6cHJl cGFyZU9TUkVudHJ5KToKKwogMjAxOS0wMy0xMiAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRA YXBwbGUuY29tPgogCiAgICAgICAgIEEgbG90IG1vcmUgY2xhc3NlcyBoYXZlIHBhZGRpbmcgdGhh dCBjYW4gYmUgcmVkdWNlZCBieSByZW9yZGVyaW5nIHRoZWlyIGZpZWxkcwpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFbnRyeS5jcHAgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR09TUkVudHJ5LmNwcAppbmRleCBkMWY2OWFiNGRkYmEwNmMzOTBkMGFh NTg1ZGU3YzVhZWZiYTc5ZGQxLi5jYmYyYmFjNTY0MDhhNTNjNmE1OGNiYWM5ZDAxYWU2NWJkNDhj ZmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkVudHJ5LmNw cAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkVudHJ5LmNwcApAQCAtMjAz LDM4ICsyMDMsMzkgQEAgdm9pZCogcHJlcGFyZU9TUkVudHJ5KEV4ZWNTdGF0ZSogZXhlYywgQ29k ZUJsb2NrKiBjb2RlQmxvY2ssIHVuc2lnbmVkIGJ5dGVjb2RlSW4KICAgICAKICAgICBmb3IgKHNp emVfdCBsb2NhbCA9IDA7IGxvY2FsIDwgZW50cnktPm1fZXhwZWN0ZWRWYWx1ZXMubnVtYmVyT2ZM b2NhbHMoKTsgKytsb2NhbCkgewogICAgICAgICBpbnQgbG9jYWxPZmZzZXQgPSB2aXJ0dWFsUmVn aXN0ZXJGb3JMb2NhbChsb2NhbCkub2Zmc2V0KCk7CisgICAgICAgIEpTVmFsdWUgdmFsdWUgPSBl eGVjLT5yZWdpc3RlcnMoKVtsb2NhbE9mZnNldF0uYXNhblVuc2FmZUpTVmFsdWUoKTsKKyAgICAg ICAgaWYgKCFlbnRyeS0+bV9leHBlY3RlZFZhbHVlcy5sb2NhbChsb2NhbCkudmFsaWRhdGUodmFs dWUpKSB7CisgICAgICAgICAgICBpZiAoT3B0aW9uczo6dmVyYm9zZU9TUigpKSB7CisgICAgICAg ICAgICAgICAgZGF0YUxvZygKKyAgICAgICAgICAgICAgICAgICAgIiAgICBPU1IgZmFpbGVkIGJl Y2F1c2UgdmFyaWFibGUgIiwgVmlydHVhbFJlZ2lzdGVyKGxvY2FsT2Zmc2V0KSwgIiBpcyAiLAor ICAgICAgICAgICAgICAgICAgICB2YWx1ZSwgIiwgZXhwZWN0ZWQgIiwKKyAgICAgICAgICAgICAg ICAgICAgZW50cnktPm1fZXhwZWN0ZWRWYWx1ZXMubG9jYWwobG9jYWwpLCAiLlxuIik7CisgICAg ICAgICAgICB9CisgICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgfQogICAgICAgICBpZiAo ZW50cnktPm1fbG9jYWxzRm9yY2VkRG91YmxlLmdldChsb2NhbCkpIHsKLSAgICAgICAgICAgIGlm ICghZXhlYy0+cmVnaXN0ZXJzKClbbG9jYWxPZmZzZXRdLmFzYW5VbnNhZmVKU1ZhbHVlKCkuaXNO dW1iZXIoKSkgeworICAgICAgICAgICAgaWYgKCF2YWx1ZS5pc051bWJlcigpKSB7CiAgICAgICAg ICAgICAgICAgaWYgKE9wdGlvbnM6OnZlcmJvc2VPU1IoKSkgewogICAgICAgICAgICAgICAgICAg ICBkYXRhTG9nKAogICAgICAgICAgICAgICAgICAgICAgICAgIiAgICBPU1IgZmFpbGVkIGJlY2F1 c2UgdmFyaWFibGUgIiwgbG9jYWxPZmZzZXQsICIgaXMgIiwKLSAgICAgICAgICAgICAgICAgICAg ICAgIGV4ZWMtPnJlZ2lzdGVycygpW2xvY2FsT2Zmc2V0XS5hc2FuVW5zYWZlSlNWYWx1ZSgpLCAi LCBleHBlY3RlZCBudW1iZXIuXG4iKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHZhbHVlLCAi LCBleHBlY3RlZCBudW1iZXIuXG4iKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgcmV0dXJuIDA7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgfQogICAgICAgICBpZiAoZW50cnktPm1fbG9jYWxzRm9yY2VkQW55SW50LmdldChsb2NhbCkp IHsKLSAgICAgICAgICAgIGlmICghZXhlYy0+cmVnaXN0ZXJzKClbbG9jYWxPZmZzZXRdLmFzYW5V bnNhZmVKU1ZhbHVlKCkuaXNBbnlJbnQoKSkgeworICAgICAgICAgICAgaWYgKCF2YWx1ZSkgewog ICAgICAgICAgICAgICAgIGlmIChPcHRpb25zOjp2ZXJib3NlT1NSKCkpIHsKICAgICAgICAgICAg ICAgICAgICAgZGF0YUxvZygKICAgICAgICAgICAgICAgICAgICAgICAgICIgICAgT1NSIGZhaWxl ZCBiZWNhdXNlIHZhcmlhYmxlICIsIGxvY2FsT2Zmc2V0LCAiIGlzICIsCi0gICAgICAgICAgICAg ICAgICAgICAgICBleGVjLT5yZWdpc3RlcnMoKVtsb2NhbE9mZnNldF0uYXNhblVuc2FmZUpTVmFs dWUoKSwgIiwgZXhwZWN0ZWQgIiwKKyAgICAgICAgICAgICAgICAgICAgICAgIHZhbHVlLCAiLCBl eHBlY3RlZCAiLAogICAgICAgICAgICAgICAgICAgICAgICAgIm1hY2hpbmUgaW50LlxuIik7CiAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHJldHVybiAwOwogICAgICAgICAgICAg fQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKCFlbnRyeS0+ bV9leHBlY3RlZFZhbHVlcy5sb2NhbChsb2NhbCkudmFsaWRhdGUoZXhlYy0+cmVnaXN0ZXJzKClb bG9jYWxPZmZzZXRdLmFzYW5VbnNhZmVKU1ZhbHVlKCkpKSB7Ci0gICAgICAgICAgICBpZiAoT3B0 aW9uczo6dmVyYm9zZU9TUigpKSB7Ci0gICAgICAgICAgICAgICAgZGF0YUxvZygKLSAgICAgICAg ICAgICAgICAgICAgIiAgICBPU1IgZmFpbGVkIGJlY2F1c2UgdmFyaWFibGUgIiwgVmlydHVhbFJl Z2lzdGVyKGxvY2FsT2Zmc2V0KSwgIiBpcyAiLAotICAgICAgICAgICAgICAgICAgICBleGVjLT5y ZWdpc3RlcnMoKVtsb2NhbE9mZnNldF0uYXNhblVuc2FmZUpTVmFsdWUoKSwgIiwgZXhwZWN0ZWQg IiwKLSAgICAgICAgICAgICAgICAgICAgZW50cnktPm1fZXhwZWN0ZWRWYWx1ZXMubG9jYWwobG9j YWwpLCAiLlxuIik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gMDsKLSAgICAg ICAgfQogICAgIH0KIAogICAgIC8vIDIpIENoZWNrIHRoZSBzdGFjayBoZWlnaHQuIFRoZSBERkcg SklUIG1heSByZXF1aXJlIGEgdGFsbGVyIHN0YWNrIHRoYW4gdGhlCmRpZmYgLS1naXQgYS9KU1Rl c3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGI3Zjk1ODFkZDI0MzBjZGU5 ZDQ2NjllZGFhOTM3YjRjMzIwMTRmODguLjg1OWQzOGIyNzNjOGEwY2MzZTk5Y2E3ZWEwYTRlYTcy MmIyMGE2NjkgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTktMDMtMTIgIFl1c3VrZSBTdXp1a2kgIDx5c3V6 dWtpQGFwcGxlLmNvbT4KKworICAgICAgICBbSlNDXSBPU1IgZW50cnkgc2hvdWxkIHJlc3BlY3Qg YWJzdHJhY3QgdmFsdWVzIGluIGFkZGl0aW9uIHRvIGZsdXNoIGZvcm1hdHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTY1MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3RyZXNzL29zci1lbnRyeS1s b2NhbHMtbm9uZS5qczogQWRkZWQuCisKIDIwMTktMDMtMTIgIE1hcmsgTGFtICA8bWFyay5sYW1A YXBwbGUuY29tPgogCiAgICAgICAgIFRoZSBIYXNJbmRleGVkUHJvcGVydHkgbm9kZSBkb2VzIEdD LgpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3Mvb3NyLWVudHJ5LWxvY2Fscy1ub25lLmpzIGIv SlNUZXN0cy9zdHJlc3Mvb3NyLWVudHJ5LWxvY2Fscy1ub25lLmpzCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjJmNzVk YmJjNTAzMDNkMzYxZjJhMWU0ZTE4NDFjY2VhNThlZmRmNTkKLS0tIC9kZXYvbnVsbAorKysgYi9K U1Rlc3RzL3N0cmVzcy9vc3ItZW50cnktbG9jYWxzLW5vbmUuanMKQEAgLTAsMCArMSwzMyBAQAor Ly9AIHJ1bkRlZmF1bHQoIi0taml0UG9saWN5U2NhbGU9MCIpCitsZXQgb2JqID0geworICAgIHA6 IFt7CisgICAgICAgIHE6IFt7CisgICAgICAgICAgICB4OiAwLAorICAgICAgICAgICAgdzogW3sK KyAgICAgICAgICAgICAgICB5OiBbeworICAgICAgICAgICAgICAgICAgICBhOiBbIHsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGI6IFt7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYzog W3sKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZDogW3t9LCB7fSwge31dCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfV0KKyAgICAgICAgICAgICAgICAgICAgICAgIH1dCisg ICAgICAgICAgICAgICAgICAgIH1dCisgICAgICAgICAgICAgICAgfSwge30sIHt9XQorICAgICAg ICAgICAgfV0KKyAgICAgICAgfV0KKyAgICB9XQorfTsKKworZnVuY3Rpb24gZHVtcE9iaihvYmop IHsKKyAgICBsZXQgb3V0cHV0ID0gJycgKiogJycKKyAgICBtYWxsb2NJbkFMb29wKCk7CisgICAg bWFsbG9jSW5BTG9vcCgpOworICAgIGZvciAobGV0IGl0ZW0gaW4gb2JqKSB7CisgICAgICAgIGxl dCBjaGlsZCA9IG9ialtpdGVtXTsKKyAgICAgICAgb3V0cHV0ICs9IGR1bXBPYmooY2hpbGQpOwor ICAgIH0KKyAgICByZXR1cm4gb3V0cHV0OworfQorbm9JbmxpbmUoZHVtcE9iaik7CisKK2R1bXBP Ymoob2JqKTsK 364491 2019-03-12 18:25:57 -0700 2019-03-12 19:34:34 -0700 Patch bug-195653-20190312182556.patch text/plain 7316 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyODM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ODNjOGExYmI0NmMwMjViZGMwMGQ5YmNhMzFmZTZmNzZhZTMyNzI5Li4zYjA3YWViMzhlNDViNWVh MzZjYTlkMDkzZjY1NjA3NDc4YmI5YWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MCBAQAorMjAxOS0wMy0xMiAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIE9TUiBlbnRyeSBzaG91bGQgcmVzcGVjdCBhYnN0cmFjdCB2YWx1 ZXMgaW4gYWRkaXRpb24gdG8gZmx1c2ggZm9ybWF0cworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1NjUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTGV0J3MgY29uc2lkZXIgdGhlIGZvbGxvd2luZyBncmFw aC4KKworICAgICAgICBCbG9jayAjMAorICAgICAgICAgICAgLi4uCisgICAgICAgICAgICAyNzo8 IDI6bG9jMTM+IEpTQ29uc3RhbnQoSlN8VXNlQXNPdGhlciwgU3RyaW5nSWRlbnQsIFN0cm9uZzpT dHJpbmcgKGF0b21pYykgKGlkZW50aWZpZXIpOiAsIFN0cnVjdHVyZUlEOiA0MjY3OSwgYmMjMTAs IEV4aXRWYWxpZCkKKyAgICAgICAgICAgIC4uLgorICAgICAgICAgICAgMjg6PCAyOmxvYzEzPiBB cml0aFBvdyhEb3VibGVSZXA6QDQzNzxEb3VibGU+LCBJbnQzMjpAMjcsIERvdWJsZXxVc2VBc090 aGVyLCBCeXRlY29kZURvdWJsZSwgRXhpdHMsIGJjIzEwLCBFeGl0VmFsaWQpCisgICAgICAgICAg ICAyOTo8ITA6LT4gICAgIE1vdkhpbnQoRG91YmxlUmVwOkAyODxEb3VibGU+LCBNdXN0R2VuLCBs b2M3LCBXOlNpZGVTdGF0ZSwgQ2xvYmJlcnNFeGl0LCBiYyMxMCwgRXhpdFZhbGlkKQorICAgICAg ICAgICAgMzA6PCAxOi0+ICAgICBTZXRMb2NhbChEb3VibGVSZXA6QDI4PERvdWJsZT4sIGxvYzco TTxEb3VibGU+L0ZsdXNoZWREb3VibGUpLCBtYWNoaW5lOmxvYzYsIFc6U3RhY2soLTgpLCBiYyMx MCwgZXhpdDogYmMjMTQsIEV4aXRWYWxpZCkgIHByZWRpY3RpbmcgQnl0ZWNvZGVEb3VibGUKKyAg ICAgICAgICAgIC4uLgorICAgICAgICAgICAgNzM6PCEwOi0+ICAgICBKdW1wKE11c3RHZW4sIFQ6 IzEsIFc6U2lkZVN0YXRlLCBiYyM3MSwgRXhpdFZhbGlkKQorCisgICAgICAgIEJsb2NrICMxIChi YyM3MSk6IChPU1IgdGFyZ2V0KSBwcmVkLCAjMAorICAgICAgICAgICAgLi4uCisgICAgICAgICAg IDEwMjo8ITI6bG9jMTU+IEdldExvY2FsKENoZWNrOlVudHlwZWQ6QDQwMCwgRG91YmxlfE11c3RH ZW58UHVyZUludCwgQnl0ZWNvZGVEb3VibGUsIGxvYzcoTTxEb3VibGU+L0ZsdXNoZWREb3VibGUp LCBtYWNoaW5lOmxvYzYsIFI6U3RhY2soLTgpLCBiYyMxMjAsIEV4aXRWYWxpZCkgIHByZWRpY3Rp bmcgQnl0ZWNvZGVEb3VibGUKKyAgICAgICAgICAgIC4uLgorCisgICAgICAgIENGQSBhdCBAMjgg c2F5cyBpdCBpcyBpbnZhbGlkIHNpbmNlIHRoZXJlIGFyZSB0eXBlIGNvbnRyYWRpY3Rpb24gKElu dDMyOkAyNyB2LnMuIFN0cmluZ0lkZW50KS4gU28sIG9mIGNvdXJzZSwgd2UgZG8gbm90IHByb3Bh Z2F0ZSAjMCdzIHR5cGUgaW5mb3JtYXRpb24gdG8gIzEgc2luY2Ugd2UgYmVjb21lIGludmFsaWQg c3RhdGUuCisgICAgICAgIEhvd2V2ZXIsICMxIGlzIHN0aWxsIHJlYWNoYWJsZSBzaW5jZSBpdCBp cyBhbiBPU1IgdGFyZ2V0LiBTaW5jZSAjMCB3YXMgb25seSB0aGUgcHJlZGVjZXNzb3Igb2YgIzEs IGxvYzcncyB0eXBlIGluZm9ybWF0aW9uIGJlY29tZXMgTm9uZSBhdCB0aGUgaGVhZCBvZiAjMS4K KyAgICAgICAgU2luY2UgbG9jNydzIEFic3RyYWN0VmFsdWUgaXMgTm9uZSwgQDEwMiBHZXRMb2Nh bCBlbWl0cyBicmVha3BvaW50LiBJdCBpcyBPSyBhcyBsb25nIGFzIE9TUiBlbnRyeSBmYWlscyBi ZWNhdXNlIEFic3RyYWN0VmFsdWUgdmFsaWRhdGlvbiByZXF1aXJlcyB0aGUgZ2l2ZW4gdmFsdWUg aXMgTm9uZSB0eXBlLgorCisgICAgICAgIFRoZSBpc3N1ZSBoZXJlIGlzIHRoYXQgd2Ugc2tpcHBl ZCBBYnN0cmFjdFZhbHVlIHZhbGlkYXRpb24gd2hlbiB3ZSBoYXZlIEZsdXNoRm9ybWF0IGluZm9y bWF0aW9uLiBTaW5jZSBsb2M3IGhhcyBGbHVzaGVkRG91YmxlIGZvcm1hdCwgREZHIE9TUiBlbnRy eSBjb2RlIGRvZXMgbm90IHZhbGlkYXRlIGl0IGFnYWluc3QgQWJzdHJhY3RWYWx1ZSwKKyAgICAg ICAgd2hpY2ggaXMgTm9uZS4gVGhlbiwgd2UgaGl0IHRoZSBicmVha3BvaW50IGVtaXR0ZWQgYnkg QDEwMi4KKworICAgICAgICBUaGlzIHBhdGNoIHBlcmZvcm1zIEFic3RyYWN0VmFsdWUgdmFsaWRh dGlvbiBhZ2FpbnN0IHZhbHVlcyBldmVuIGlmIHdlIGhhdmUgRmx1c2hGb3JtYXQuIFdlIHNob3Vs ZCBjb3JyZWN0bHkgY29uZmlndXJlIEFic3RyYWN0VmFsdWUgZm9yIE9TUiBlbnRyeSdzIGxvY2Fs cyB0b28gdG8gYXZvaWQgdW5uZWNlc3NhcnkgT1NSIGVudHJ5CisgICAgICAgIGZhaWx1cmVzIGlu IHRoZSBmdXR1cmUgYnV0IGFueXdheSB2YWxpZGF0aW5nIGxvY2FscyB3aXRoIEFic3RyYWN0VmFs dWUgaXMgY29ycmVjdCBiZWhhdmlvciBoZXJlIHNpbmNlIERGR1NwZWN1bGF0aXZlSklUIHJlbGll cyBvbiB0aGF0LgorCisgICAgICAgICogZGZnL0RGR09TUkVudHJ5LmNwcDoKKyAgICAgICAgKEpT Qzo6REZHOjpwcmVwYXJlT1NSRW50cnkpOgorCiAyMDE5LTAzLTEyICBSb2JpbiBNb3Jpc3NldCAg PHJtb3Jpc3NldEBhcHBsZS5jb20+CiAKICAgICAgICAgQSBsb3QgbW9yZSBjbGFzc2VzIGhhdmUg cGFkZGluZyB0aGF0IGNhbiBiZSByZWR1Y2VkIGJ5IHJlb3JkZXJpbmcgdGhlaXIgZmllbGRzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkVudHJ5LmNwcCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRW50cnkuY3BwCmluZGV4IGQxZjY5YWI0ZGRi YTA2YzM5MGQwYWE1ODVkZTdjNWFlZmJhNzlkZDEuLmNiZjJiYWM1NjQwOGE1M2M2YTU4Y2JhYzlk MDFhZTY1YmQ0OGNmY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH T1NSRW50cnkuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRW50cnku Y3BwCkBAIC0yMDMsMzggKzIwMywzOSBAQCB2b2lkKiBwcmVwYXJlT1NSRW50cnkoRXhlY1N0YXRl KiBleGVjLCBDb2RlQmxvY2sqIGNvZGVCbG9jaywgdW5zaWduZWQgYnl0ZWNvZGVJbgogICAgIAog ICAgIGZvciAoc2l6ZV90IGxvY2FsID0gMDsgbG9jYWwgPCBlbnRyeS0+bV9leHBlY3RlZFZhbHVl cy5udW1iZXJPZkxvY2FscygpOyArK2xvY2FsKSB7CiAgICAgICAgIGludCBsb2NhbE9mZnNldCA9 IHZpcnR1YWxSZWdpc3RlckZvckxvY2FsKGxvY2FsKS5vZmZzZXQoKTsKKyAgICAgICAgSlNWYWx1 ZSB2YWx1ZSA9IGV4ZWMtPnJlZ2lzdGVycygpW2xvY2FsT2Zmc2V0XS5hc2FuVW5zYWZlSlNWYWx1 ZSgpOworICAgICAgICBpZiAoIWVudHJ5LT5tX2V4cGVjdGVkVmFsdWVzLmxvY2FsKGxvY2FsKS52 YWxpZGF0ZSh2YWx1ZSkpIHsKKyAgICAgICAgICAgIGlmIChPcHRpb25zOjp2ZXJib3NlT1NSKCkp IHsKKyAgICAgICAgICAgICAgICBkYXRhTG9nKAorICAgICAgICAgICAgICAgICAgICAiICAgIE9T UiBmYWlsZWQgYmVjYXVzZSB2YXJpYWJsZSAiLCBWaXJ0dWFsUmVnaXN0ZXIobG9jYWxPZmZzZXQp LCAiIGlzICIsCisgICAgICAgICAgICAgICAgICAgIHZhbHVlLCAiLCBleHBlY3RlZCAiLAorICAg ICAgICAgICAgICAgICAgICBlbnRyeS0+bV9leHBlY3RlZFZhbHVlcy5sb2NhbChsb2NhbCksICIu XG4iKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICB9CiAg ICAgICAgIGlmIChlbnRyeS0+bV9sb2NhbHNGb3JjZWREb3VibGUuZ2V0KGxvY2FsKSkgewotICAg ICAgICAgICAgaWYgKCFleGVjLT5yZWdpc3RlcnMoKVtsb2NhbE9mZnNldF0uYXNhblVuc2FmZUpT VmFsdWUoKS5pc051bWJlcigpKSB7CisgICAgICAgICAgICBpZiAoIXZhbHVlLmlzTnVtYmVyKCkp IHsKICAgICAgICAgICAgICAgICBpZiAoT3B0aW9uczo6dmVyYm9zZU9TUigpKSB7CiAgICAgICAg ICAgICAgICAgICAgIGRhdGFMb2coCiAgICAgICAgICAgICAgICAgICAgICAgICAiICAgIE9TUiBm YWlsZWQgYmVjYXVzZSB2YXJpYWJsZSAiLCBsb2NhbE9mZnNldCwgIiBpcyAiLAotICAgICAgICAg ICAgICAgICAgICAgICAgZXhlYy0+cmVnaXN0ZXJzKClbbG9jYWxPZmZzZXRdLmFzYW5VbnNhZmVK U1ZhbHVlKCksICIsIGV4cGVjdGVkIG51bWJlci5cbiIpOworICAgICAgICAgICAgICAgICAgICAg ICAgdmFsdWUsICIsIGV4cGVjdGVkIG51bWJlci5cbiIpOwogICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICB9CiAgICAgICAgIGlmIChlbnRyeS0+bV9sb2NhbHNGb3JjZWRBbnlJbnQu Z2V0KGxvY2FsKSkgewotICAgICAgICAgICAgaWYgKCFleGVjLT5yZWdpc3RlcnMoKVtsb2NhbE9m ZnNldF0uYXNhblVuc2FmZUpTVmFsdWUoKS5pc0FueUludCgpKSB7CisgICAgICAgICAgICBpZiAo IXZhbHVlKSB7CiAgICAgICAgICAgICAgICAgaWYgKE9wdGlvbnM6OnZlcmJvc2VPU1IoKSkgewog ICAgICAgICAgICAgICAgICAgICBkYXRhTG9nKAogICAgICAgICAgICAgICAgICAgICAgICAgIiAg ICBPU1IgZmFpbGVkIGJlY2F1c2UgdmFyaWFibGUgIiwgbG9jYWxPZmZzZXQsICIgaXMgIiwKLSAg ICAgICAgICAgICAgICAgICAgICAgIGV4ZWMtPnJlZ2lzdGVycygpW2xvY2FsT2Zmc2V0XS5hc2Fu VW5zYWZlSlNWYWx1ZSgpLCAiLCBleHBlY3RlZCAiLAorICAgICAgICAgICAgICAgICAgICAgICAg dmFsdWUsICIsIGV4cGVjdGVkICIsCiAgICAgICAgICAgICAgICAgICAgICAgICAibWFjaGluZSBp bnQuXG4iKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAg ICAgICAgICAgICB9CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQotICAgICAgICBp ZiAoIWVudHJ5LT5tX2V4cGVjdGVkVmFsdWVzLmxvY2FsKGxvY2FsKS52YWxpZGF0ZShleGVjLT5y ZWdpc3RlcnMoKVtsb2NhbE9mZnNldF0uYXNhblVuc2FmZUpTVmFsdWUoKSkpIHsKLSAgICAgICAg ICAgIGlmIChPcHRpb25zOjp2ZXJib3NlT1NSKCkpIHsKLSAgICAgICAgICAgICAgICBkYXRhTG9n KAotICAgICAgICAgICAgICAgICAgICAiICAgIE9TUiBmYWlsZWQgYmVjYXVzZSB2YXJpYWJsZSAi LCBWaXJ0dWFsUmVnaXN0ZXIobG9jYWxPZmZzZXQpLCAiIGlzICIsCi0gICAgICAgICAgICAgICAg ICAgIGV4ZWMtPnJlZ2lzdGVycygpW2xvY2FsT2Zmc2V0XS5hc2FuVW5zYWZlSlNWYWx1ZSgpLCAi LCBleHBlY3RlZCAiLAotICAgICAgICAgICAgICAgICAgICBlbnRyeS0+bV9leHBlY3RlZFZhbHVl cy5sb2NhbChsb2NhbCksICIuXG4iKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVy biAwOwotICAgICAgICB9CiAgICAgfQogCiAgICAgLy8gMikgQ2hlY2sgdGhlIHN0YWNrIGhlaWdo dC4gVGhlIERGRyBKSVQgbWF5IHJlcXVpcmUgYSB0YWxsZXIgc3RhY2sgdGhhbiB0aGUKZGlmZiAt LWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjdmOTU4 MWRkMjQzMGNkZTlkNDY2OWVkYWE5MzdiNGMzMjAxNGY4OC4uODU5ZDM4YjI3M2M4YTBjYzNlOTlj YTdlYTBhNGVhNzIyYjIwYTY2OSAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIv SlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxOS0wMy0xMiAgWXVzdWtlIFN1 enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgorCisgICAgICAgIFtKU0NdIE9TUiBlbnRyeSBzaG91 bGQgcmVzcGVjdCBhYnN0cmFjdCB2YWx1ZXMgaW4gYWRkaXRpb24gdG8gZmx1c2ggZm9ybWF0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1NjUzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdHJlc3Mv b3NyLWVudHJ5LWxvY2Fscy1ub25lLmpzOiBBZGRlZC4KKwogMjAxOS0wMy0xMiAgTWFyayBMYW0g IDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgVGhlIEhhc0luZGV4ZWRQcm9wZXJ0eSBu b2RlIGRvZXMgR0MuCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9vc3ItZW50cnktbG9jYWxz LW5vbmUuanMgYi9KU1Rlc3RzL3N0cmVzcy9vc3ItZW50cnktbG9jYWxzLW5vbmUuanMKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uMmY3NWRiYmM1MDMwM2QzNjFmMmExZTRlMTg0MWNjZWE1OGVmZGY1OQotLS0gL2Rldi9u dWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL29zci1lbnRyeS1sb2NhbHMtbm9uZS5qcwpAQCAtMCww ICsxLDMzIEBACisvL0AgcnVuRGVmYXVsdCgiLS1qaXRQb2xpY3lTY2FsZT0wIikKK2xldCBvYmog PSB7CisgICAgcDogW3sKKyAgICAgICAgcTogW3sKKyAgICAgICAgICAgIHg6IDAsCisgICAgICAg ICAgICB3OiBbeworICAgICAgICAgICAgICAgIHk6IFt7CisgICAgICAgICAgICAgICAgICAgIGE6 IFsgeworICAgICAgICAgICAgICAgICAgICAgICAgYjogW3sKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjOiBbeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkOiBbe30sIHt9 LCB7fV0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB9XQorICAgICAgICAgICAgICAgICAg ICAgICAgfV0KKyAgICAgICAgICAgICAgICAgICAgfV0KKyAgICAgICAgICAgICAgICB9LCB7fSwg e31dCisgICAgICAgICAgICB9XQorICAgICAgICB9XQorICAgIH1dCit9OworCitmdW5jdGlvbiBk dW1wT2JqKG9iaikgeworICAgIGxldCBvdXRwdXQgPSAnJyAqKiAnJworICAgIG1hbGxvY0luQUxv b3AoKTsKKyAgICBtYWxsb2NJbkFMb29wKCk7CisgICAgZm9yIChsZXQgaXRlbSBpbiBvYmopIHsK KyAgICAgICAgbGV0IGNoaWxkID0gb2JqW2l0ZW1dOworICAgICAgICBvdXRwdXQgKz0gZHVtcE9i aihjaGlsZCk7CisgICAgfQorICAgIHJldHVybiBvdXRwdXQ7Cit9Citub0lubGluZShkdW1wT2Jq KTsKKworZHVtcE9iaihvYmopOwo=