193304 2019-01-09 15:00:02 -0800 DFG combined liveness can be wrong for terminal basic blocks 2019-01-11 16:26:13 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov keith_miller mark.lam msaboff rmorisset ticaiolima webkit-bug-importer ysuzuki oldest_to_newest 1493125 0 saam 2019-01-09 15:00:02 -0800 If a block doesn't have any successors, it can't rely on the typical backwards liveness propagation that CombinedLiveness was doing. For such terminal blocks, we must account for what's bytecode live at the end of the block. Consider a block that ends with: ``` ForceOSRExit Unreachable ``` Things may definitely be live in bytecode at the tail. However, we'll report nothing as being alive. This probably subtly breaks many analyses, but we have a test case of it breaking the interference analysis that the ArgumentsEliminationPhase performs. 1493126 1 saam 2019-01-09 15:00:46 -0800 <rdar://problem/45268632> 1493133 2 358753 saam 2019-01-09 15:05:36 -0800 Created attachment 358753 patch 1493495 3 358753 ysuzuki 2019-01-10 15:00:11 -0800 Comment on attachment 358753 patch r=me 1493853 4 saam 2019-01-11 15:13:42 -0800 (In reply to Yusuke Suzuki from comment #3) > Comment on attachment 358753 [details] > patch > > r=me Thanks for the review. Yusuke and I also spoke offline, and I'll make this patch fix some errors in a comment in the CombinedLiveness header. 1493856 5 358955 saam 2019-01-11 15:18:29 -0800 Created attachment 358955 patch for landing 1493876 6 358955 commit-queue 2019-01-11 16:26:12 -0800 Comment on attachment 358955 patch for landing Clearing flags on attachment: 358955 Committed r239882: <https://trac.webkit.org/changeset/239882> 1493877 7 commit-queue 2019-01-11 16:26:13 -0800 All reviewed patches have been landed. Closing bug. 358753 2019-01-09 15:05:36 -0800 2019-01-11 15:18:29 -0800 patch c-backup.diff text/plain 6935 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzk3ODcpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE2IEBACisyMDE5LTAxLTA5ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIERGRyBjb21iaW5lZCBsaXZlbmVzcyBjYW4gYmUgd3JvbmcgZm9yIHRl cm1pbmFsIGJhc2ljIGJsb2NrcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkzMzA0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NTI2ODYzMj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0cmVzcy9k ZmctY29tYmluZWQtbGl2ZW5lc3MtY29uc2lkZXItdGVybWluYWwtYmxvY2tzLWJ5dGVjb2RlLWxp dmVuZXNzLmpzOiBBZGRlZC4KKyAgICAgICAgKGZvby5hcmdzMSk6CisgICAgICAgIChmb28uYXJn czIpOgorICAgICAgICAoZm9vKToKKwogMjAxOS0wMS0wOCAgWXVzdWtlIFN1enVraSAgPHl1c3Vr ZXN1enVraUBzbG93c3RhcnQub3JnPgogCiAgICAgICAgIEFycmF5LnByb3RvdHlwZS5mbGF0L2Zs YXRNYXAgaGF2ZSBhIG1pbm9yIGJ1ZyBpbiBBcnJheVNwZWNpZXNDcmVhdGUKSW5kZXg6IEpTVGVz dHMvc3RyZXNzL2RmZy1jb21iaW5lZC1saXZlbmVzcy1jb25zaWRlci10ZXJtaW5hbC1ibG9ja3Mt Ynl0ZWNvZGUtbGl2ZW5lc3MuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSlNUZXN0cy9zdHJlc3MvZGZnLWNv bWJpbmVkLWxpdmVuZXNzLWNvbnNpZGVyLXRlcm1pbmFsLWJsb2Nrcy1ieXRlY29kZS1saXZlbmVz cy5qcwkobm9uZXhpc3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9kZmctY29tYmluZWQtbGl2ZW5l c3MtY29uc2lkZXItdGVybWluYWwtYmxvY2tzLWJ5dGVjb2RlLWxpdmVuZXNzLmpzCSh3b3JraW5n IGNvcHkpCkBAIC0wLDAgKzEsMTkgQEAKKy8vQCBydW5EZWZhdWx0KCItLXVzZUNvbmN1cnJlbnRK SVQ9MCIsICItLXVzZVB1dFN0YWNrU2lua2luZz0wIikKKworZnVuY3Rpb24gZm9vKCkgeworICAg IHZhciBhcmdzMSA9IGZ1bmN0aW9uICgpIHsKKyAgICAgICAgcmV0dXJuIGFyZ3VtZW50czsKKyAg ICB9KCk7CisgICAgdmFyIGFyZ3MyID0gZnVuY3Rpb24gKCkgeworICAgICAgICB2YXIgcmVzdWx0 ID0gYXJndW1lbnRzOworICAgICAgICByZXN1bHQubGVuZ3RoID0gMTsKKyAgICAgICAgcmV0dXJu IHJlc3VsdDsKKyAgICB9KDEpOworICAgIGZvciAodmFyIGkgPSAwOyBpIDwgMTAwMDAwMDA7ICsr aSkgeworICAgICAgICBhcmdzMS5sZW5ndGg7CisgICAgICAgIGFyZ3MyLmxlbmd0aDsKKyAgICB9 Cit9Citmb28oKTsKK2ZvbygpOworZm9vKCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJ KHJldmlzaW9uIDIzOTc2MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwzNiBAQAorMjAxOS0wMS0wOSAgU2FhbSBCYXJhdGkgIDxz YmFyYXRpQGFwcGxlLmNvbT4KKworICAgICAgICBERkcgY29tYmluZWQgbGl2ZW5lc3MgY2FuIGJl IHdyb25nIGZvciB0ZXJtaW5hbCBiYXNpYyBibG9ja3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzMwNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NDUyNjg2MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSWYgYSBibG9jayBkb2Vzbid0IGhhdmUgYW55IHN1Y2Nlc3NvcnMsIGl0IGNhbid0IHJlbHkg b24gdGhlIHR5cGljYWwKKyAgICAgICAgYmFja3dhcmRzIGxpdmVuZXNzIHByb3BhZ2F0aW9uIHRo YXQgQ29tYmluZWRMaXZlbmVzcyB3YXMgZG9pbmcuIFRoZSBwaGFzZQorICAgICAgICBmaXJzdCBn b3Qgd2hhdCB3YXMgbGl2ZSBpbiBieXRlY29kZSBhbmQgSVIgYXQgdGhlIGhlYWRzIG9mIGVhY2gg YmxvY2suIFRoZW4KKyAgICAgICAgZm9yIGVhY2ggYmxvY2ssIGl0IG1hZGUgdGhlIGxpdmUgYXQg dGFpbCB0aGUgdW5pb24gb2YgdGhlIGxpdmUgYXQgaGVhZCBmb3IKKyAgICAgICAgZWFjaCBzdWNj ZXNzb3IuIEZvciBhIHRlcm1pbmFsIGJsb2NrIHRob3VnaCwgdGhpcyBjb3VsZCBiZSB3cm9uZy4g V2UgY291bGQKKyAgICAgICAgZW5kIHVwIHNheWluZyBub3RoaW5nIGlzIGxpdmUgZXZlbiB0aG91 Z2ggbWFueSB0aGluZ3MgbWF5IGJlIGxpdmUgaW4gYnl0ZWNvZGUuCisgICAgICAgIFdlIG11c3Qg YWNjb3VudCBmb3Igd2hhdCdzIGJ5dGVjb2RlIGxpdmUgYXQgdGhlIGVuZCBvZiB0aGUgYmxvY2su IENvbnNpZGVyIGEKKyAgICAgICAgYmxvY2sgdGhhdCBlbmRzIHdpdGg6CisgICAgICAgIGBgYAor ICAgICAgICBGb3JjZU9TUkV4aXQKKyAgICAgICAgVW5yZWFjaGFibGUKKyAgICAgICAgYGBgCisg ICAgICAgIAorICAgICAgICBUaGluZ3MgbWF5IGRlZmluaXRlbHkgYmUgbGl2ZSBpbiBieXRlY29k ZSBhdCB0aGUgdGFpbC4gSG93ZXZlciwgd2UnbGwKKyAgICAgICAgcmVwb3J0IG5vdGhpbmcgYXMg YmVpbmcgYWxpdmUuIFRoaXMgcHJvYmFibHkgc3VidGx5IGJyZWFrcyBtYW55IGFuYWx5c2VzLAor ICAgICAgICBidXQgd2UgaGF2ZSBhIHRlc3QgY2FzZSBvZiBpdCBicmVha2luZyB0aGUgaW50ZXJm ZXJlbmNlIGFuYWx5c2lzIHRoYXQKKyAgICAgICAgdGhlIEFyZ3VtZW50c0VsaW1pbmF0aW9uUGhh c2UgcGVyZm9ybXMuCisKKyAgICAgICAgKiBkZmcvREZHQmFzaWNCbG9jay5oOgorICAgICAgICAo SlNDOjpERkc6OkJhc2ljQmxvY2s6Omxhc3QgY29uc3QpOgorICAgICAgICAqIGRmZy9ERkdDb21i aW5lZExpdmVuZXNzLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjphZGRCeXRlY29kZUxpdmVuZXNz KToKKyAgICAgICAgKEpTQzo6REZHOjpsaXZlTm9kZXNBdEhlYWQpOgorICAgICAgICAoSlNDOjpE Rkc6OkNvbWJpbmVkTGl2ZW5lc3M6OkNvbWJpbmVkTGl2ZW5lc3MpOgorCiAyMDE5LTAxLTA4ICBZ dXN1a2UgU3V6dWtpICA8eXVzdWtlc3V6dWtpQHNsb3dzdGFydC5vcmc+CiAKICAgICAgICAgQXJy YXkucHJvdG90eXBlLmZsYXQvZmxhdE1hcCBoYXZlIGEgbWlub3IgYnVnIGluIEFycmF5U3BlY2ll c0NyZWF0ZQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCYXNpY0Jsb2NrLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCYXNpY0Jsb2NrLmgJ KHJldmlzaW9uIDIzOTc2MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQmFzaWNC bG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC02NCw2ICs2NCwxMSBAQCBzdHJ1Y3QgQmFzaWNCbG9j ayA6IFJlZkNvdW50ZWQ8QmFzaWNCbG9jCiAgICAgfQogICAgIE5vZGUqJiBvcGVyYXRvcltdKHNp emVfdCBpKSB7IHJldHVybiBhdChpKTsgfQogICAgIE5vZGUqIG9wZXJhdG9yW10oc2l6ZV90IGkp IGNvbnN0IHsgcmV0dXJuIGF0KGkpOyB9CisgICAgTm9kZSogbGFzdCgpIGNvbnN0CisgICAgewor ICAgICAgICBSRUxFQVNFX0FTU0VSVCghIXNpemUoKSk7CisgICAgICAgIHJldHVybiBhdChzaXpl KCkgLSAxKTsKKyAgICB9CiAgICAgCiAgICAgLy8gVXNlIHRoaXMgdG8gZmluZCBib3RoIHRoZSBp bmRleCBvZiB0aGUgdGVybWluYWwgYW5kIHRoZSB0ZXJtaW5hbCBpdHNlbGYgaW4gb25lIGdvLiBN YXkKICAgICAvLyByZXR1cm4gYSBjbGVhciBOb2RlQW5kSW5kZXggaWYgdGhlIGJhc2ljIGJsb2Nr IGN1cnJlbnRseSBsYWNrcyBhIHRlcm1pbmFsLiBUaGF0IG1heSBoYXBwZW4KSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ29tYmluZWRMaXZlbmVzcy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDb21iaW5lZExpdmVuZXNzLmNwcAkocmV2 aXNpb24gMjM5NzYxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDb21iaW5lZExp dmVuZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzUsMTcgKzM1LDEwIEBACiAKIG5hbWVzcGFj ZSBKU0MgeyBuYW1lc3BhY2UgREZHIHsKIAotTm9kZVNldCBsaXZlTm9kZXNBdEhlYWQoR3JhcGgm IGdyYXBoLCBCYXNpY0Jsb2NrKiBibG9jaykKK3N0YXRpYyB2b2lkIGFkZEJ5dGVjb2RlTGl2ZW5l c3MoR3JhcGgmIGdyYXBoLCBBdmFpbGFiaWxpdHlNYXAmIGF2YWlsYWJpbGl0eU1hcCwgTm9kZVNl dCYgc2VlbiwgTm9kZSogbm9kZSkKIHsKLSAgICBOb2RlU2V0IHNlZW47Ci0gICAgZm9yIChOb2Rl Rmxvd1Byb2plY3Rpb24gbm9kZSA6IGJsb2NrLT5zc2EtPmxpdmVBdEhlYWQpIHsKLSAgICAgICAg aWYgKG5vZGUua2luZCgpID09IE5vZGVGbG93UHJvamVjdGlvbjo6UHJpbWFyeSkKLSAgICAgICAg ICAgIHNlZW4uYWRkVm9pZChub2RlLm5vZGUoKSk7Ci0gICAgfQotICAgIAotICAgIEF2YWlsYWJp bGl0eU1hcCYgYXZhaWxhYmlsaXR5TWFwID0gYmxvY2stPnNzYS0+YXZhaWxhYmlsaXR5QXRIZWFk OwogICAgIGdyYXBoLmZvckFsbExpdmVJbkJ5dGVjb2RlKAotICAgICAgICBibG9jay0+YXQoMCkt Pm9yaWdpbi5mb3JFeGl0LAorICAgICAgICBub2RlLT5vcmlnaW4uZm9yRXhpdCwKICAgICAgICAg WyZdIChWaXJ0dWFsUmVnaXN0ZXIgcmVnKSB7CiAgICAgICAgICAgICBhdmFpbGFiaWxpdHlNYXAu Y2xvc2VTdGFydGluZ1dpdGhMb2NhbCgKICAgICAgICAgICAgICAgICByZWcsCkBAIC01Niw3ICs0 OSwxNyBAQCBOb2RlU2V0IGxpdmVOb2Rlc0F0SGVhZChHcmFwaCYgZ3JhcGgsIEJhCiAgICAgICAg ICAgICAgICAgICAgIHJldHVybiBzZWVuLmFkZChub2RlKS5pc05ld0VudHJ5OwogICAgICAgICAg ICAgICAgIH0pOwogICAgICAgICB9KTsKLSAgICAKK30KKworTm9kZVNldCBsaXZlTm9kZXNBdEhl YWQoR3JhcGgmIGdyYXBoLCBCYXNpY0Jsb2NrKiBibG9jaykKK3sKKyAgICBOb2RlU2V0IHNlZW47 CisgICAgZm9yIChOb2RlRmxvd1Byb2plY3Rpb24gbm9kZSA6IGJsb2NrLT5zc2EtPmxpdmVBdEhl YWQpIHsKKyAgICAgICAgaWYgKG5vZGUua2luZCgpID09IE5vZGVGbG93UHJvamVjdGlvbjo6UHJp bWFyeSkKKyAgICAgICAgICAgIHNlZW4uYWRkVm9pZChub2RlLm5vZGUoKSk7CisgICAgfQorCisg ICAgYWRkQnl0ZWNvZGVMaXZlbmVzcyhncmFwaCwgYmxvY2stPnNzYS0+YXZhaWxhYmlsaXR5QXRI ZWFkLCBzZWVuLCBibG9jay0+YXQoMCkpOwogICAgIHJldHVybiBzZWVuOwogfQogCkBAIC02NCw5 ICs2NywyNyBAQCBDb21iaW5lZExpdmVuZXNzOjpDb21iaW5lZExpdmVuZXNzKEdyYXBoCiAgICAg OiBsaXZlQXRIZWFkKGdyYXBoKQogICAgICwgbGl2ZUF0VGFpbChncmFwaCkKIHsKLSAgICAvLyBG aXJzdCBjb21wdXRlIHRoZSBsaXZlQXRIZWFkIGZvciBlYWNoIGJsb2NrLgotICAgIGZvciAoQmFz aWNCbG9jayogYmxvY2sgOiBncmFwaC5ibG9ja3NJbk5hdHVyYWxPcmRlcigpKQorICAgIC8vIEZp cnN0IGNvbXB1dGUgCisgICAgLy8gLSBUaGUgbGl2ZUF0SGVhZCBmb3IgZWFjaCBibG9jay4KKyAg ICAvLyAtIFRoZSBsaXZlQXRUYWlsIGZvciBibG9ja3MgdGhhdCB3b24ndCBwcm9wZXJseSBwcm9w YWdhdGUKKyAgICAvLyAgIHRoZSBpbmZvcm1hdGlvbiBiYXNlZCBvbiB0aGVpciBlbXB0eSBzdWNj ZXNzb3IgbGlzdC4KKyAgICBmb3IgKEJhc2ljQmxvY2sqIGJsb2NrIDogZ3JhcGguYmxvY2tzSW5O YXR1cmFsT3JkZXIoKSkgewogICAgICAgICBsaXZlQXRIZWFkW2Jsb2NrXSA9IGxpdmVOb2Rlc0F0 SGVhZChncmFwaCwgYmxvY2spOworCisgICAgICAgIC8vIElmIHdlIGRvbid0IGhhdmUgc3VjY2Vz c29ycywgd2UgY2FuJ3QgcmVseSBvbiB0aGUgcHJvcGFnYXRpb24gYmVsb3cuIFRoaXMgZG9lc24n dCB1c3VhbGx5CisgICAgICAgIC8vIGRvIGFueXRoaW5nIGZvciB0ZXJtaW5hbCBibG9ja3MsIHNp bmNlIHRoZSBsYXN0IG5vZGUgaXMgdXN1YWxseSBhIHJldHVybiwgc28gbm90aGluZyBpcyBsaXZl CisgICAgICAgIC8vIGFmdGVyIGl0LiBIb3dldmVyLCB3ZSBtYXkgYWxzbyBoYXZlIHRoZSBlbmQg b2YgdGhlIGJhc2ljIGJsb2NrIGJlOgorICAgICAgICAvLworICAgICAgICAvLyBGb3JjZU9TUkV4 aXQKKyAgICAgICAgLy8gVW5yZWFjaGFibGUKKyAgICAgICAgLy8KKyAgICAgICAgLy8gQW5kIHRo aW5ncyBtYXkgZGVmaW5pdGVseSBiZSBsaXZlIGluIGJ5dGVjb2RlIGF0IHRoYXQgcG9pbnQgaW4g dGhlIHByb2dyYW0uCisgICAgICAgIGlmICghYmxvY2stPm51bVN1Y2Nlc3NvcnMoKSkgeworICAg ICAgICAgICAgTm9kZVNldCBzZWVuOworICAgICAgICAgICAgYWRkQnl0ZWNvZGVMaXZlbmVzcyhn cmFwaCwgYmxvY2stPnNzYS0+YXZhaWxhYmlsaXR5QXRUYWlsLCBzZWVuLCBibG9jay0+bGFzdCgp KTsKKyAgICAgICAgICAgIGxpdmVBdFRhaWxbYmxvY2tdID0gc2VlbjsKKyAgICAgICAgfQorICAg IH0KICAgICAKICAgICAvLyBOb3cgY29tcHV0ZSB0aGUgbGl2ZUF0VGFpbCBieSB1bmlmeWluZyB0 aGUgbGl2ZUF0SGVhZCBvZiB0aGUgc3VjY2Vzc29ycy4KICAgICBmb3IgKEJhc2ljQmxvY2sqIGJs b2NrIDogZ3JhcGguYmxvY2tzSW5OYXR1cmFsT3JkZXIoKSkgewo= 358955 2019-01-11 15:18:29 -0800 2019-01-11 16:26:12 -0800 patch for landing b-backup.diff text/plain 7608 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzk4NzkpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDE5LTAxLTExICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIERGRyBjb21iaW5lZCBsaXZlbmVzcyBjYW4gYmUgd3JvbmcgZm9yIHRl cm1pbmFsIGJhc2ljIGJsb2NrcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkzMzA0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NTI2ODYzMj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6dWtpLgorCisgICAgICAgICogc3RyZXNzL2Rm Zy1jb21iaW5lZC1saXZlbmVzcy1jb25zaWRlci10ZXJtaW5hbC1ibG9ja3MtYnl0ZWNvZGUtbGl2 ZW5lc3MuanM6IEFkZGVkLgorCiAyMDE5LTAxLTExICBZdXN1a2UgU3V6dWtpICA8eXVzdWtlc3V6 dWtpQHNsb3dzdGFydC5vcmc+CiAKICAgICAgICAgW0pTQ10gR2xvYmFsIGxleGljYWwgYmluZGlu Z3MgY2FuIHNoYWRvdyBnbG9iYWwgdmFyaWFibGVzIGlmIGl0IGlzIGBjb25maWd1cmFibGUgPSB0 cnVlYApJbmRleDogSlNUZXN0cy9zdHJlc3MvZGZnLWNvbWJpbmVkLWxpdmVuZXNzLWNvbnNpZGVy LXRlcm1pbmFsLWJsb2Nrcy1ieXRlY29kZS1saXZlbmVzcy5qcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKU1Rl c3RzL3N0cmVzcy9kZmctY29tYmluZWQtbGl2ZW5lc3MtY29uc2lkZXItdGVybWluYWwtYmxvY2tz LWJ5dGVjb2RlLWxpdmVuZXNzLmpzCShub25leGlzdGVudCkKKysrIEpTVGVzdHMvc3RyZXNzL2Rm Zy1jb21iaW5lZC1saXZlbmVzcy1jb25zaWRlci10ZXJtaW5hbC1ibG9ja3MtYnl0ZWNvZGUtbGl2 ZW5lc3MuanMJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxOSBAQAorLy9AIHJ1bkRlZmF1bHQo Ii0tdXNlQ29uY3VycmVudEpJVD0wIiwgIi0tdXNlUHV0U3RhY2tTaW5raW5nPTAiKQorCitmdW5j dGlvbiBmb28oKSB7CisgICAgdmFyIGFyZ3MxID0gZnVuY3Rpb24gKCkgeworICAgICAgICByZXR1 cm4gYXJndW1lbnRzOworICAgIH0oKTsKKyAgICB2YXIgYXJnczIgPSBmdW5jdGlvbiAoKSB7Cisg ICAgICAgIHZhciByZXN1bHQgPSBhcmd1bWVudHM7CisgICAgICAgIHJlc3VsdC5sZW5ndGggPSAx OworICAgICAgICByZXR1cm4gcmVzdWx0OworICAgIH0oMSk7CisgICAgZm9yICh2YXIgaSA9IDA7 IGkgPCAxMDAwMDAwMDsgKytpKSB7CisgICAgICAgIGFyZ3MxLmxlbmd0aDsKKyAgICAgICAgYXJn czIubGVuZ3RoOworICAgIH0KK30KK2ZvbygpOworZm9vKCk7Citmb28oKTsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjM5ODc5KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisyMDE5LTAxLTEx ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIERGRyBjb21iaW5l ZCBsaXZlbmVzcyBjYW4gYmUgd3JvbmcgZm9yIHRlcm1pbmFsIGJhc2ljIGJsb2NrcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMzA0CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NTI2ODYzMj4KKworICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2Ug U3V6dWtpLgorCisgICAgICAgIElmIGEgYmxvY2sgZG9lc24ndCBoYXZlIGFueSBzdWNjZXNzb3Jz LCBpdCBjYW4ndCByZWx5IG9uIHRoZSB0eXBpY2FsCisgICAgICAgIGJhY2t3YXJkcyBsaXZlbmVz cyBwcm9wYWdhdGlvbiB0aGF0IENvbWJpbmVkTGl2ZW5lc3Mgd2FzIGRvaW5nLiBUaGUgcGhhc2UK KyAgICAgICAgZmlyc3QgZ290IHdoYXQgd2FzIGxpdmUgaW4gYnl0ZWNvZGUgYW5kIElSIGF0IHRo ZSBoZWFkcyBvZiBlYWNoIGJsb2NrLiBUaGVuCisgICAgICAgIGZvciBlYWNoIGJsb2NrLCBpdCBt YWRlIHRoZSBsaXZlIGF0IHRhaWwgdGhlIHVuaW9uIG9mIHRoZSBsaXZlIGF0IGhlYWQgZm9yCisg ICAgICAgIGVhY2ggc3VjY2Vzc29yLiBGb3IgYSB0ZXJtaW5hbCBibG9jayB0aG91Z2gsIHRoaXMg Y291bGQgYmUgd3JvbmcuIFdlIGNvdWxkCisgICAgICAgIGVuZCB1cCBzYXlpbmcgbm90aGluZyBp cyBsaXZlIGV2ZW4gdGhvdWdoIG1hbnkgdGhpbmdzIG1heSBiZSBsaXZlIGluIGJ5dGVjb2RlLgor ICAgICAgICBXZSBtdXN0IGFjY291bnQgZm9yIHdoYXQncyBieXRlY29kZSBsaXZlIGF0IHRoZSBl bmQgb2YgdGhlIGJsb2NrLiBDb25zaWRlciBhCisgICAgICAgIGJsb2NrIHRoYXQgZW5kcyB3aXRo OgorICAgICAgICBgYGAKKyAgICAgICAgRm9yY2VPU1JFeGl0CisgICAgICAgIFVucmVhY2hhYmxl CisgICAgICAgIGBgYAorICAgICAgICAKKyAgICAgICAgVGhpbmdzIG1heSBkZWZpbml0ZWx5IGJl IGxpdmUgaW4gYnl0ZWNvZGUgYXQgdGhlIHRhaWwuIEhvd2V2ZXIsIHdlJ2xsCisgICAgICAgIHJl cG9ydCBub3RoaW5nIGFzIGJlaW5nIGFsaXZlLiBUaGlzIHByb2JhYmx5IHN1YnRseSBicmVha3Mg bWFueSBhbmFseXNlcywKKyAgICAgICAgYnV0IHdlIGhhdmUgYSB0ZXN0IGNhc2Ugb2YgaXQgYnJl YWtpbmcgdGhlIGludGVyZmVyZW5jZSBhbmFseXNpcyB0aGF0CisgICAgICAgIHRoZSBBcmd1bWVu dHNFbGltaW5hdGlvblBoYXNlIHBlcmZvcm1zLgorCisgICAgICAgICogZGZnL0RGR0Jhc2ljQmxv Y2suaDoKKyAgICAgICAgKEpTQzo6REZHOjpCYXNpY0Jsb2NrOjpsYXN0IGNvbnN0KToKKyAgICAg ICAgKiBkZmcvREZHQ29tYmluZWRMaXZlbmVzcy5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6YWRk Qnl0ZWNvZGVMaXZlbmVzcyk6CisgICAgICAgIChKU0M6OkRGRzo6bGl2ZU5vZGVzQXRIZWFkKToK KyAgICAgICAgKEpTQzo6REZHOjpDb21iaW5lZExpdmVuZXNzOjpDb21iaW5lZExpdmVuZXNzKToK KyAgICAgICAgKiBkZmcvREZHQ29tYmluZWRMaXZlbmVzcy5oOgorCiAyMDE5LTAxLTExICBZdXN1 a2UgU3V6dWtpICA8eXVzdWtlc3V6dWtpQHNsb3dzdGFydC5vcmc+CiAKICAgICAgICAgW0pTQ10g R2xvYmFsIGxleGljYWwgYmluZGluZ3MgY2FuIHNoYWRvdyBnbG9iYWwgdmFyaWFibGVzIGlmIGl0 IGlzIGBjb25maWd1cmFibGUgPSB0cnVlYApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdCYXNpY0Jsb2NrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdCYXNpY0Jsb2NrLmgJKHJldmlzaW9uIDIzOTg3OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHQmFzaWNCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC02NCw2ICs2NCwxMSBA QCBzdHJ1Y3QgQmFzaWNCbG9jayA6IFJlZkNvdW50ZWQ8QmFzaWNCbG9jCiAgICAgfQogICAgIE5v ZGUqJiBvcGVyYXRvcltdKHNpemVfdCBpKSB7IHJldHVybiBhdChpKTsgfQogICAgIE5vZGUqIG9w ZXJhdG9yW10oc2l6ZV90IGkpIGNvbnN0IHsgcmV0dXJuIGF0KGkpOyB9CisgICAgTm9kZSogbGFz dCgpIGNvbnN0CisgICAgeworICAgICAgICBSRUxFQVNFX0FTU0VSVCghIXNpemUoKSk7CisgICAg ICAgIHJldHVybiBhdChzaXplKCkgLSAxKTsKKyAgICB9CiAgICAgCiAgICAgLy8gVXNlIHRoaXMg dG8gZmluZCBib3RoIHRoZSBpbmRleCBvZiB0aGUgdGVybWluYWwgYW5kIHRoZSB0ZXJtaW5hbCBp dHNlbGYgaW4gb25lIGdvLiBNYXkKICAgICAvLyByZXR1cm4gYSBjbGVhciBOb2RlQW5kSW5kZXgg aWYgdGhlIGJhc2ljIGJsb2NrIGN1cnJlbnRseSBsYWNrcyBhIHRlcm1pbmFsLiBUaGF0IG1heSBo YXBwZW4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ29tYmluZWRMaXZlbmVz cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDb21iaW5l ZExpdmVuZXNzLmNwcAkocmV2aXNpb24gMjM5ODc5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdDb21iaW5lZExpdmVuZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzUsMTcgKzM1 LDEwIEBACiAKIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgREZHIHsKIAotTm9kZVNldCBsaXZl Tm9kZXNBdEhlYWQoR3JhcGgmIGdyYXBoLCBCYXNpY0Jsb2NrKiBibG9jaykKK3N0YXRpYyB2b2lk IGFkZEJ5dGVjb2RlTGl2ZW5lc3MoR3JhcGgmIGdyYXBoLCBBdmFpbGFiaWxpdHlNYXAmIGF2YWls YWJpbGl0eU1hcCwgTm9kZVNldCYgc2VlbiwgTm9kZSogbm9kZSkKIHsKLSAgICBOb2RlU2V0IHNl ZW47Ci0gICAgZm9yIChOb2RlRmxvd1Byb2plY3Rpb24gbm9kZSA6IGJsb2NrLT5zc2EtPmxpdmVB dEhlYWQpIHsKLSAgICAgICAgaWYgKG5vZGUua2luZCgpID09IE5vZGVGbG93UHJvamVjdGlvbjo6 UHJpbWFyeSkKLSAgICAgICAgICAgIHNlZW4uYWRkVm9pZChub2RlLm5vZGUoKSk7Ci0gICAgfQot ICAgIAotICAgIEF2YWlsYWJpbGl0eU1hcCYgYXZhaWxhYmlsaXR5TWFwID0gYmxvY2stPnNzYS0+ YXZhaWxhYmlsaXR5QXRIZWFkOwogICAgIGdyYXBoLmZvckFsbExpdmVJbkJ5dGVjb2RlKAotICAg ICAgICBibG9jay0+YXQoMCktPm9yaWdpbi5mb3JFeGl0LAorICAgICAgICBub2RlLT5vcmlnaW4u Zm9yRXhpdCwKICAgICAgICAgWyZdIChWaXJ0dWFsUmVnaXN0ZXIgcmVnKSB7CiAgICAgICAgICAg ICBhdmFpbGFiaWxpdHlNYXAuY2xvc2VTdGFydGluZ1dpdGhMb2NhbCgKICAgICAgICAgICAgICAg ICByZWcsCkBAIC01Niw3ICs0OSwxNyBAQCBOb2RlU2V0IGxpdmVOb2Rlc0F0SGVhZChHcmFwaCYg Z3JhcGgsIEJhCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBzZWVuLmFkZChub2RlKS5pc05l d0VudHJ5OwogICAgICAgICAgICAgICAgIH0pOwogICAgICAgICB9KTsKLSAgICAKK30KKworTm9k ZVNldCBsaXZlTm9kZXNBdEhlYWQoR3JhcGgmIGdyYXBoLCBCYXNpY0Jsb2NrKiBibG9jaykKK3sK KyAgICBOb2RlU2V0IHNlZW47CisgICAgZm9yIChOb2RlRmxvd1Byb2plY3Rpb24gbm9kZSA6IGJs b2NrLT5zc2EtPmxpdmVBdEhlYWQpIHsKKyAgICAgICAgaWYgKG5vZGUua2luZCgpID09IE5vZGVG bG93UHJvamVjdGlvbjo6UHJpbWFyeSkKKyAgICAgICAgICAgIHNlZW4uYWRkVm9pZChub2RlLm5v ZGUoKSk7CisgICAgfQorCisgICAgYWRkQnl0ZWNvZGVMaXZlbmVzcyhncmFwaCwgYmxvY2stPnNz YS0+YXZhaWxhYmlsaXR5QXRIZWFkLCBzZWVuLCBibG9jay0+YXQoMCkpOwogICAgIHJldHVybiBz ZWVuOwogfQogCkBAIC02NCw5ICs2NywyNyBAQCBDb21iaW5lZExpdmVuZXNzOjpDb21iaW5lZExp dmVuZXNzKEdyYXBoCiAgICAgOiBsaXZlQXRIZWFkKGdyYXBoKQogICAgICwgbGl2ZUF0VGFpbChn cmFwaCkKIHsKLSAgICAvLyBGaXJzdCBjb21wdXRlIHRoZSBsaXZlQXRIZWFkIGZvciBlYWNoIGJs b2NrLgotICAgIGZvciAoQmFzaWNCbG9jayogYmxvY2sgOiBncmFwaC5ibG9ja3NJbk5hdHVyYWxP cmRlcigpKQorICAgIC8vIEZpcnN0IGNvbXB1dGUgCisgICAgLy8gLSBUaGUgbGl2ZUF0SGVhZCBm b3IgZWFjaCBibG9jay4KKyAgICAvLyAtIFRoZSBsaXZlQXRUYWlsIGZvciBibG9ja3MgdGhhdCB3 b24ndCBwcm9wZXJseSBwcm9wYWdhdGUKKyAgICAvLyAgIHRoZSBpbmZvcm1hdGlvbiBiYXNlZCBv biB0aGVpciBlbXB0eSBzdWNjZXNzb3IgbGlzdC4KKyAgICBmb3IgKEJhc2ljQmxvY2sqIGJsb2Nr IDogZ3JhcGguYmxvY2tzSW5OYXR1cmFsT3JkZXIoKSkgewogICAgICAgICBsaXZlQXRIZWFkW2Js b2NrXSA9IGxpdmVOb2Rlc0F0SGVhZChncmFwaCwgYmxvY2spOworCisgICAgICAgIC8vIElmIHdl IGRvbid0IGhhdmUgc3VjY2Vzc29ycywgd2UgY2FuJ3QgcmVseSBvbiB0aGUgcHJvcGFnYXRpb24g YmVsb3cuIFRoaXMgZG9lc24ndCB1c3VhbGx5CisgICAgICAgIC8vIGRvIGFueXRoaW5nIGZvciB0 ZXJtaW5hbCBibG9ja3MsIHNpbmNlIHRoZSBsYXN0IG5vZGUgaXMgdXN1YWxseSBhIHJldHVybiwg c28gbm90aGluZyBpcyBsaXZlCisgICAgICAgIC8vIGFmdGVyIGl0LiBIb3dldmVyLCB3ZSBtYXkg YWxzbyBoYXZlIHRoZSBlbmQgb2YgdGhlIGJhc2ljIGJsb2NrIGJlOgorICAgICAgICAvLworICAg ICAgICAvLyBGb3JjZU9TUkV4aXQKKyAgICAgICAgLy8gVW5yZWFjaGFibGUKKyAgICAgICAgLy8K KyAgICAgICAgLy8gQW5kIHRoaW5ncyBtYXkgZGVmaW5pdGVseSBiZSBsaXZlIGluIGJ5dGVjb2Rl IGF0IHRoYXQgcG9pbnQgaW4gdGhlIHByb2dyYW0uCisgICAgICAgIGlmICghYmxvY2stPm51bVN1 Y2Nlc3NvcnMoKSkgeworICAgICAgICAgICAgTm9kZVNldCBzZWVuOworICAgICAgICAgICAgYWRk Qnl0ZWNvZGVMaXZlbmVzcyhncmFwaCwgYmxvY2stPnNzYS0+YXZhaWxhYmlsaXR5QXRUYWlsLCBz ZWVuLCBibG9jay0+bGFzdCgpKTsKKyAgICAgICAgICAgIGxpdmVBdFRhaWxbYmxvY2tdID0gc2Vl bjsKKyAgICAgICAgfQorICAgIH0KICAgICAKICAgICAvLyBOb3cgY29tcHV0ZSB0aGUgbGl2ZUF0 VGFpbCBieSB1bmlmeWluZyB0aGUgbGl2ZUF0SGVhZCBvZiB0aGUgc3VjY2Vzc29ycy4KICAgICBm b3IgKEJhc2ljQmxvY2sqIGJsb2NrIDogZ3JhcGguYmxvY2tzSW5OYXR1cmFsT3JkZXIoKSkgewpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDb21iaW5lZExpdmVuZXNzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDb21iaW5lZExpdmVuZXNz LmgJKHJldmlzaW9uIDIzOTg3OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ29t YmluZWRMaXZlbmVzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw3ICszMiw3IEBACiAKIG5hbWVz cGFjZSBKU0MgeyBuYW1lc3BhY2UgREZHIHsKIAotLy8gUmV0dXJucyB0aGUgc2V0IG9mIG5vZGVz IGxpdmUgYXQgdGFpbCwgYm90aCBkdWUgdG8gZHVlIERGRyBhbmQgZHVlIHRvIGJ5dGVjb2RlIChp LmUuIE9TUiBleGl0KS4KKy8vIFJldHVybnMgdGhlIHNldCBvZiBub2RlcyBsaXZlIGF0IGhlYWQs IGJvdGggZHVlIHRvIERGRyBhbmQgZHVlIHRvIGJ5dGVjb2RlIChpLmUuIE9TUiBleGl0KS4KIE5v ZGVTZXQgbGl2ZU5vZGVzQXRIZWFkKEdyYXBoJiwgQmFzaWNCbG9jayopOwogCiAvLyBXQVJOSU5H OiBUaGlzIGN1cnJlbnRseSBkb2VzIG5vdCByZWFzb24gYWJvdXQgdGhlIGxpdmVuZXNzIG9mIHNo YWRvdyB2YWx1ZXMuIFRoZSBleGVjdXRpb24K