134730 2014-07-08 10:14:44 -0700 [ftlopt] Get rid of Node::misc by moving the fields out of the union so that you can use replacement and owner simultaneously 2014-07-08 10:51:06 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 134677 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 1021113 0 fpizlo 2014-07-08 10:14:44 -0700 This will allow for a better GCSE implementation. 1021116 1 234569 fpizlo 2014-07-08 10:25:15 -0700 Created attachment 234569 the patch 1021117 2 234569 mark.lam 2014-07-08 10:26:43 -0700 Comment on attachment 234569 the patch r=me 1021129 3 fpizlo 2014-07-08 10:51:06 -0700 Landed in http://trac.webkit.org/changeset/170890 234569 2014-07-08 10:25:15 -0700 2014-07-08 10:26:42 -0700 the patch blah.patch text/plain 13374 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTcwODg4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDE0LTA3LTA4ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg W2Z0bG9wdF0gR2V0IHJpZCBvZiBOb2RlOjptaXNjIGJ5IG1vdmluZyB0aGUgZmllbGRzIG91dCBv ZiB0aGUgdW5pb24gc28gdGhhdCB5b3UgY2FuIHVzZSByZXBsYWNlbWVudCBhbmQgb3duZXIgc2lt dWx0YW5lb3VzbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzNDczMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAg ICAKKyAgICAgICAgVGhpcyB3aWxsIGFsbG93IGZvciBhIGJldHRlciBHQ1NFIGltcGxlbWVudGF0 aW9uLgorCisgICAgICAgICogZGZnL0RGR0NQU1JldGhyZWFkaW5nUGhhc2UuY3BwOgorICAgICAg ICAoSlNDOjpERkc6OkNQU1JldGhyZWFkaW5nUGhhc2U6OmNhbm9uaWNhbGl6ZUdldExvY2FsRm9y KToKKyAgICAgICAgKiBkZmcvREZHQ1NFUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkNT RVBoYXNlOjpzZXRSZXBsYWNlbWVudCk6CisgICAgICAgICogZGZnL0RGR0VkZ2VEb21pbmF0ZXMu aDoKKyAgICAgICAgKEpTQzo6REZHOjpFZGdlRG9taW5hdGVzOjpvcGVyYXRvcigpKToKKyAgICAg ICAgKiBkZmcvREZHR3JhcGguY3BwOgorICAgICAgICAoSlNDOjpERkc6OkdyYXBoOjpjbGVhclJl cGxhY2VtZW50cyk6CisgICAgICAgIChKU0M6OkRGRzo6R3JhcGg6OmluaXRpYWxpemVOb2RlT3du ZXJzKToKKyAgICAgICAgKiBkZmcvREZHR3JhcGguaDoKKyAgICAgICAgKEpTQzo6REZHOjpHcmFw aDo6cGVyZm9ybVN1YnN0aXR1dGlvbkZvckVkZ2UpOgorICAgICAgICAqIGRmZy9ERkdMSUNNUGhh c2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkxJQ01QaGFzZTo6YXR0ZW1wdEhvaXN0KToKKyAg ICAgICAgKiBkZmcvREZHTm9kZS5oOgorICAgICAgICAoSlNDOjpERkc6Ok5vZGU6Ok5vZGUpOgor ICAgICAgICAqIGRmZy9ERkdTU0FDb252ZXJzaW9uUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpE Rkc6OlNTQUNvbnZlcnNpb25QaGFzZTo6cnVuKToKKwogMjAxNC0wNy0wNyAgTWFyayBIYWhuZW5i ZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAgICAgIE1lcmdlIHIxNzAwMTEgZnJv bSB0cnVuay4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ1BTUmV0aHJlYWRp bmdQaGFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdD UFNSZXRocmVhZGluZ1BoYXNlLmNwcAkocmV2aXNpb24gMTcwODc0KQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdDUFNSZXRocmVhZGluZ1BoYXNlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjAxLDEyICsyMDEsMTIgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIAogICAgICAgICAgICAg aWYgKG90aGVyTm9kZS0+b3AoKSA9PSBHZXRMb2NhbCkgewogICAgICAgICAgICAgICAgIC8vIFJl cGxhY2UgYWxsIHJlZmVyZW5jZXMgdG8gdGhpcyBHZXRMb2NhbCB3aXRoIG90aGVyTm9kZS4KLSAg ICAgICAgICAgICAgICBub2RlLT5taXNjLnJlcGxhY2VtZW50ID0gb3RoZXJOb2RlOworICAgICAg ICAgICAgICAgIG5vZGUtPnJlcGxhY2VtZW50ID0gb3RoZXJOb2RlOwogICAgICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIAogICAgICAgICAgICAgQVNTRVJU KG90aGVyTm9kZS0+b3AoKSA9PSBTZXRMb2NhbCk7Ci0gICAgICAgICAgICBub2RlLT5taXNjLnJl cGxhY2VtZW50ID0gb3RoZXJOb2RlLT5jaGlsZDEoKS5ub2RlKCk7CisgICAgICAgICAgICBub2Rl LT5yZXBsYWNlbWVudCA9IG90aGVyTm9kZS0+Y2hpbGQxKCkubm9kZSgpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdDU0VQaGFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdDU0VQaGFzZS5jcHAJKHJldmlzaW9uIDE3MDg3NCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHQ1NFUGhhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NTcsNyArODU3 LDcgQEAgcHJpdmF0ZToKICAgICAgICAgZWxpbWluYXRlSXJyZWxldmFudFBoYW50b21DaGlsZHJl bihtX2N1cnJlbnROb2RlKTsKICAgICAgICAgCiAgICAgICAgIC8vIEF0IHRoaXMgcG9pbnQgd2Ug d2lsbCBlbGltaW5hdGUgYWxsIHJlZmVyZW5jZXMgdG8gdGhpcyBub2RlLgotICAgICAgICBtX2N1 cnJlbnROb2RlLT5taXNjLnJlcGxhY2VtZW50ID0gcmVwbGFjZW1lbnQ7CisgICAgICAgIG1fY3Vy cmVudE5vZGUtPnJlcGxhY2VtZW50ID0gcmVwbGFjZW1lbnQ7CiAgICAgICAgIAogICAgICAgICBt X2NoYW5nZWQgPSB0cnVlOwogICAgICAgICAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHRWRnZURvbWluYXRlcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHRWRnZURvbWluYXRlcy5oCShyZXZpc2lvbiAxNzA4NzQpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR0VkZ2VEb21pbmF0ZXMuaAkod29ya2luZyBjb3B5KQpAQCAtNDUs MTAgKzQ1LDEwIEBAIHB1YmxpYzoKICAgICAKICAgICB2b2lkIG9wZXJhdG9yKCkoTm9kZSosIEVk Z2UgZWRnZSkKICAgICB7Ci0gICAgICAgIGJvb2wgcmVzdWx0ID0gbV9ncmFwaC5tX2RvbWluYXRv cnMuZG9taW5hdGVzKGVkZ2Uubm9kZSgpLT5taXNjLm93bmVyLCBtX2Jsb2NrKTsKKyAgICAgICAg Ym9vbCByZXN1bHQgPSBtX2dyYXBoLm1fZG9taW5hdG9ycy5kb21pbmF0ZXMoZWRnZS5ub2RlKCkt Pm93bmVyLCBtX2Jsb2NrKTsKICAgICAgICAgaWYgKHZlcmJvc2UpIHsKICAgICAgICAgICAgIGRh dGFMb2coCi0gICAgICAgICAgICAgICAgIkNoZWNraW5nIGlmICIsIGVkZ2UsICIgaW4gIiwgKmVk Z2Uubm9kZSgpLT5taXNjLm93bmVyLAorICAgICAgICAgICAgICAgICJDaGVja2luZyBpZiAiLCBl ZGdlLCAiIGluICIsICplZGdlLm5vZGUoKS0+b3duZXIsCiAgICAgICAgICAgICAgICAgIiBkb21p bmF0ZXMgIiwgKm1fYmxvY2ssICI6ICIsIHJlc3VsdCwgIlxuIik7CiAgICAgICAgIH0KICAgICAg ICAgbV9yZXN1bHQgJj0gcmVzdWx0OwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdHcmFwaC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdH cmFwaC5jcHAJKHJldmlzaW9uIDE3MDg3NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHR3JhcGguY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NjgsOSArNjY4LDkgQEAgdm9pZCBHcmFw aDo6Y2xlYXJSZXBsYWNlbWVudHMoKQogICAgICAgICBpZiAoIWJsb2NrKQogICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIGZvciAodW5zaWduZWQgcGhpSW5kZXggPSBibG9jay0+cGhpcy5z aXplKCk7IHBoaUluZGV4LS07KQotICAgICAgICAgICAgYmxvY2stPnBoaXNbcGhpSW5kZXhdLT5t aXNjLnJlcGxhY2VtZW50ID0gMDsKKyAgICAgICAgICAgIGJsb2NrLT5waGlzW3BoaUluZGV4XS0+ cmVwbGFjZW1lbnQgPSAwOwogICAgICAgICBmb3IgKHVuc2lnbmVkIG5vZGVJbmRleCA9IGJsb2Nr LT5zaXplKCk7IG5vZGVJbmRleC0tOykKLSAgICAgICAgICAgIGJsb2NrLT5hdChub2RlSW5kZXgp LT5taXNjLnJlcGxhY2VtZW50ID0gMDsKKyAgICAgICAgICAgIGJsb2NrLT5hdChub2RlSW5kZXgp LT5yZXBsYWNlbWVudCA9IDA7CiAgICAgfQogfQogCkBAIC02ODEsOSArNjgxLDkgQEAgdm9pZCBH cmFwaDo6aW5pdGlhbGl6ZU5vZGVPd25lcnMoKQogICAgICAgICBpZiAoIWJsb2NrKQogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIGZvciAodW5zaWduZWQgcGhpSW5kZXggPSBibG9jay0+ cGhpcy5zaXplKCk7IHBoaUluZGV4LS07KQotICAgICAgICAgICAgYmxvY2stPnBoaXNbcGhpSW5k ZXhdLT5taXNjLm93bmVyID0gYmxvY2s7CisgICAgICAgICAgICBibG9jay0+cGhpc1twaGlJbmRl eF0tPm93bmVyID0gYmxvY2s7CiAgICAgICAgIGZvciAodW5zaWduZWQgbm9kZUluZGV4ID0gYmxv Y2stPnNpemUoKTsgbm9kZUluZGV4LS07KQotICAgICAgICAgICAgYmxvY2stPmF0KG5vZGVJbmRl eCktPm1pc2Mub3duZXIgPSBibG9jazsKKyAgICAgICAgICAgIGJsb2NrLT5hdChub2RlSW5kZXgp LT5vd25lciA9IGJsb2NrOwogICAgIH0KIH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdHcmFwaC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHR3JhcGguaAkocmV2aXNpb24gMTcwODc0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdHcmFwaC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjQsNyArMTI0LDcgQEAgcHVibGljOgog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAKICAgICAgICAgLy8gQ2hlY2sgaWYgdGhlcmUg aXMgYW55IHJlcGxhY2VtZW50LgotICAgICAgICBOb2RlKiByZXBsYWNlbWVudCA9IGNoaWxkLT5t aXNjLnJlcGxhY2VtZW50OworICAgICAgICBOb2RlKiByZXBsYWNlbWVudCA9IGNoaWxkLT5yZXBs YWNlbWVudDsKICAgICAgICAgaWYgKCFyZXBsYWNlbWVudCkKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgCkBAIC0xMzIsNyArMTMyLDcgQEAgcHVibGljOgogICAgICAgICAKICAgICAgICAg Ly8gVGhlcmUgaXMgZGVmaW5pdGVseSBhIHJlcGxhY2VtZW50LiBBc3NlcnQgdGhhdCB0aGUgcmVw bGFjZW1lbnQgZG9lcyBub3QKICAgICAgICAgLy8gaGF2ZSBhIHJlcGxhY2VtZW50LgotICAgICAg ICBBU1NFUlQoIWNoaWxkLT5taXNjLnJlcGxhY2VtZW50KTsKKyAgICAgICAgQVNTRVJUKCFjaGls ZC0+cmVwbGFjZW1lbnQpOwogICAgIH0KICAgICAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZS4uLiBQ YXJhbXM+CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0xJQ01QaGFzZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdMSUNNUGhhc2UuY3Bw CShyZXZpc2lvbiAxNzA4NzQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0xJQ01Q aGFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0NSw3ICsyNDUsNyBAQCBwcml2YXRlOgogICAg ICAgICB9CiAgICAgICAgIAogICAgICAgICBkYXRhLnByZUhlYWRlci0+aW5zZXJ0QmVmb3JlTGFz dChub2RlKTsKLSAgICAgICAgbm9kZS0+bWlzYy5vd25lciA9IGRhdGEucHJlSGVhZGVyOworICAg ICAgICBub2RlLT5vd25lciA9IGRhdGEucHJlSGVhZGVyOwogICAgICAgICBOb2RlT3JpZ2luIG9y aWdpbmFsT3JpZ2luID0gbm9kZS0+b3JpZ2luOwogICAgICAgICBub2RlLT5vcmlnaW4uZm9yRXhp dCA9IGRhdGEucHJlSGVhZGVyLT5sYXN0KCktPm9yaWdpbi5mb3JFeGl0OwogICAgICAgICAKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZS5oCShyZXZpc2lvbiAxNzA4NzQpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaAkod29ya2luZyBjb3B5KQpAQCAtMjA4 LDggKzIwOCw5IEBAIHN0cnVjdCBOb2RlIHsKICAgICAgICAgLCBtX3ZpcnR1YWxSZWdpc3RlcihW aXJ0dWFsUmVnaXN0ZXIoKSkKICAgICAgICAgLCBtX3JlZkNvdW50KDEpCiAgICAgICAgICwgbV9w cmVkaWN0aW9uKFNwZWNOb25lKQorICAgICAgICAsIHJlcGxhY2VtZW50KG51bGxwdHIpCisgICAg ICAgICwgb3duZXIobnVsbHB0cikKICAgICB7Ci0gICAgICAgIG1pc2MucmVwbGFjZW1lbnQgPSAw OwogICAgICAgICBzZXRPcEFuZERlZmF1bHRGbGFncyhvcCk7CiAgICAgfQogICAgIApAQCAtMjIy LDggKzIyMyw5IEBAIHN0cnVjdCBOb2RlIHsKICAgICAgICAgLCBtX3ByZWRpY3Rpb24oU3BlY05v bmUpCiAgICAgICAgICwgbV9vcEluZm8oMCkKICAgICAgICAgLCBtX29wSW5mbzIoMCkKKyAgICAg ICAgLCByZXBsYWNlbWVudChudWxscHRyKQorICAgICAgICAsIG93bmVyKG51bGxwdHIpCiAgICAg ewotICAgICAgICBtaXNjLnJlcGxhY2VtZW50ID0gMDsKICAgICAgICAgc2V0T3BBbmREZWZhdWx0 RmxhZ3Mob3ApOwogICAgICAgICBBU1NFUlQoIShtX2ZsYWdzICYgTm9kZUhhc1ZhckFyZ3MpKTsK ICAgICB9CkBAIC0yMzcsOCArMjM5LDkgQEAgc3RydWN0IE5vZGUgewogICAgICAgICAsIG1fcHJl ZGljdGlvbihTcGVjTm9uZSkKICAgICAgICAgLCBtX29wSW5mbygwKQogICAgICAgICAsIG1fb3BJ bmZvMigwKQorICAgICAgICAsIHJlcGxhY2VtZW50KG51bGxwdHIpCisgICAgICAgICwgb3duZXIo bnVsbHB0cikKICAgICB7Ci0gICAgICAgIG1pc2MucmVwbGFjZW1lbnQgPSAwOwogICAgICAgICBz ZXRPcEFuZERlZmF1bHRGbGFncyhvcCk7CiAgICAgICAgIHNldFJlc3VsdChyZXN1bHQpOwogICAg ICAgICBBU1NFUlQoIShtX2ZsYWdzICYgTm9kZUhhc1ZhckFyZ3MpKTsKQEAgLTI1Myw4ICsyNTYs OSBAQCBzdHJ1Y3QgTm9kZSB7CiAgICAgICAgICwgbV9wcmVkaWN0aW9uKFNwZWNOb25lKQogICAg ICAgICAsIG1fb3BJbmZvKGltbS5tX3ZhbHVlKQogICAgICAgICAsIG1fb3BJbmZvMigwKQorICAg ICAgICAsIHJlcGxhY2VtZW50KG51bGxwdHIpCisgICAgICAgICwgb3duZXIobnVsbHB0cikKICAg ICB7Ci0gICAgICAgIG1pc2MucmVwbGFjZW1lbnQgPSAwOwogICAgICAgICBzZXRPcEFuZERlZmF1 bHRGbGFncyhvcCk7CiAgICAgICAgIEFTU0VSVCghKG1fZmxhZ3MgJiBOb2RlSGFzVmFyQXJncykp OwogICAgIH0KQEAgLTI2OCw4ICsyNzIsOSBAQCBzdHJ1Y3QgTm9kZSB7CiAgICAgICAgICwgbV9w cmVkaWN0aW9uKFNwZWNOb25lKQogICAgICAgICAsIG1fb3BJbmZvKGltbS5tX3ZhbHVlKQogICAg ICAgICAsIG1fb3BJbmZvMigwKQorICAgICAgICAsIHJlcGxhY2VtZW50KG51bGxwdHIpCisgICAg ICAgICwgb3duZXIobnVsbHB0cikKICAgICB7Ci0gICAgICAgIG1pc2MucmVwbGFjZW1lbnQgPSAw OwogICAgICAgICBzZXRPcEFuZERlZmF1bHRGbGFncyhvcCk7CiAgICAgICAgIHNldFJlc3VsdChy ZXN1bHQpOwogICAgICAgICBBU1NFUlQoIShtX2ZsYWdzICYgTm9kZUhhc1ZhckFyZ3MpKTsKQEAg LTI4NCw4ICsyODksOSBAQCBzdHJ1Y3QgTm9kZSB7CiAgICAgICAgICwgbV9wcmVkaWN0aW9uKFNw ZWNOb25lKQogICAgICAgICAsIG1fb3BJbmZvKGltbTEubV92YWx1ZSkKICAgICAgICAgLCBtX29w SW5mbzIoaW1tMi5tX3ZhbHVlKQorICAgICAgICAsIHJlcGxhY2VtZW50KG51bGxwdHIpCisgICAg ICAgICwgb3duZXIobnVsbHB0cikKICAgICB7Ci0gICAgICAgIG1pc2MucmVwbGFjZW1lbnQgPSAw OwogICAgICAgICBzZXRPcEFuZERlZmF1bHRGbGFncyhvcCk7CiAgICAgICAgIEFTU0VSVCghKG1f ZmxhZ3MgJiBOb2RlSGFzVmFyQXJncykpOwogICAgIH0KQEAgLTI5OSw4ICszMDUsOSBAQCBzdHJ1 Y3QgTm9kZSB7CiAgICAgICAgICwgbV9wcmVkaWN0aW9uKFNwZWNOb25lKQogICAgICAgICAsIG1f b3BJbmZvKGltbTEubV92YWx1ZSkKICAgICAgICAgLCBtX29wSW5mbzIoaW1tMi5tX3ZhbHVlKQor ICAgICAgICAsIHJlcGxhY2VtZW50KG51bGxwdHIpCisgICAgICAgICwgb3duZXIobnVsbHB0cikK ICAgICB7Ci0gICAgICAgIG1pc2MucmVwbGFjZW1lbnQgPSAwOwogICAgICAgICBzZXRPcEFuZERl ZmF1bHRGbGFncyhvcCk7CiAgICAgICAgIEFTU0VSVChtX2ZsYWdzICYgTm9kZUhhc1ZhckFyZ3Mp OwogICAgIH0KQEAgLTE3MzIsMTkgKzE3MzksMTcgQEAgcHVibGljOgogICAgIEFic3RyYWN0VmFs dWUgdmFsdWU7CiAgICAgCiAgICAgLy8gTWlzY2VsbGFuZW91cyBkYXRhIHRoYXQgaXMgdXN1YWxs eSBtZWFuaW5nbGVzcywgYnV0IGNhbiBob2xkIHNvbWUgYW5hbHlzaXMgcmVzdWx0cwotICAgIC8v IGlmIHlvdSBhc2sgcmlnaHQuIEZvciBleGFtcGxlLCBpZiB5b3UgZG8gR3JhcGg6OmluaXRpYWxp emVOb2RlT3duZXJzKCksIG1pc2Mub3duZXIKKyAgICAvLyBpZiB5b3UgYXNrIHJpZ2h0LiBGb3Ig ZXhhbXBsZSwgaWYgeW91IGRvIEdyYXBoOjppbml0aWFsaXplTm9kZU93bmVycygpLCBOb2RlOjpv d25lcgogICAgIC8vIHdpbGwgdGVsbCB5b3Ugd2hpY2ggYmFzaWMgYmxvY2sgYSBub2RlIGJlbG9u Z3MgdG8uIFlvdSBjYW5ub3QgcmVseSBvbiB0aGlzIHBlcnNpc3RpbmcKICAgICAvLyBhY3Jvc3Mg dHJhbnNmb3JtYXRpb25zIHVubGVzcyB5b3UgZG8gdGhlIG1haW50ZW5hbmNlIHdvcmsgeW91cnNl bGYuIE90aGVyIHBoYXNlcyB1c2UKLSAgICAvLyBtaXNjLnJlcGxhY2VtZW50LCBidXQgdGhleSBk byBzbyBtYW51YWxseTogZmlyc3QgeW91IGRvIEdyYXBoOjpjbGVhclJlcGxhY2VtZW50cygpCisg ICAgLy8gTm9kZTo6cmVwbGFjZW1lbnQsIGJ1dCB0aGV5IGRvIHNvIG1hbnVhbGx5OiBmaXJzdCB5 b3UgZG8gR3JhcGg6OmNsZWFyUmVwbGFjZW1lbnRzKCkKICAgICAvLyBhbmQgdGhlbiB5b3Ugc2V0 LCBhbmQgdXNlLCByZXBsYWNlbWVudCdzIHlvdXJzZWxmLgogICAgIC8vCiAgICAgLy8gQm90dG9t IGxpbmU6IGRvbid0IHVzZSB0aGVzZSBmaWVsZHMgdW5sZXNzIHlvdSBpbml0aWFsaXplIHRoZW0g eW91cnNlbGYsIG9yIGJ5CiAgICAgLy8gY2FsbGluZyBzb21lIGFwcHJvcHJpYXRlIG1ldGhvZHMg dGhhdCBpbml0aWFsaXplIHRoZW0gdGhlIHdheSB5b3Ugd2FudC4gT3RoZXJ3aXNlLAogICAgIC8v IHRoZXNlIGZpZWxkcyBhcmUgbWVhbmluZ2xlc3MuCi0gICAgdW5pb24gewotICAgICAgICBOb2Rl KiByZXBsYWNlbWVudDsKLSAgICAgICAgQmFzaWNCbG9jayogb3duZXI7Ci0gICAgfSBtaXNjOwor ICAgIE5vZGUqIHJlcGxhY2VtZW50OworICAgIEJhc2ljQmxvY2sqIG93bmVyOwogfTsKIAogaW5s aW5lIGJvb2wgbm9kZUNvbXBhcmF0b3IoTm9kZSogYSwgTm9kZSogYikKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHU1NBQ29udmVyc2lvblBoYXNlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NTQUNvbnZlcnNpb25QaGFzZS5jcHAJKHJl dmlzaW9uIDE3MDg3NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU1NBQ29udmVy c2lvblBoYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ2LDcgKzI0Niw3IEBAIHB1YmxpYzoK ICAgICAgICAgICAgICAgICAgICAgICAgIGJsb2NrLT52YXJpYWJsZXNBdEhlYWQub3BlcmFuZChw aGktPmxvY2FsKCkpLCAiXG4iKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAg QVNTRVJUKHBoaSAhPSBibG9jay0+dmFyaWFibGVzQXRIZWFkLm9wZXJhbmQocGhpLT5sb2NhbCgp KSk7Ci0gICAgICAgICAgICAgICAgcGhpLT5taXNjLnJlcGxhY2VtZW50ID0gYmxvY2stPnZhcmlh Ymxlc0F0SGVhZC5vcGVyYW5kKHBoaS0+bG9jYWwoKSk7CisgICAgICAgICAgICAgICAgcGhpLT5y ZXBsYWNlbWVudCA9IGJsb2NrLT52YXJpYWJsZXNBdEhlYWQub3BlcmFuZChwaGktPmxvY2FsKCkp OwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIApAQCAtMjYxLDkgKzI2MSw5IEBA IHB1YmxpYzoKICAgICAgICAgICAgICAgICBOb2RlKiBub2RlID0gYmxvY2stPnZhcmlhYmxlc0F0 SGVhZFtpXTsKICAgICAgICAgICAgICAgICBpZiAoIW5vZGUpCiAgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIHdoaWxlIChub2RlLT5taXNjLnJlcGxhY2VtZW50 KSB7Ci0gICAgICAgICAgICAgICAgICAgIEFTU0VSVChub2RlICE9IG5vZGUtPm1pc2MucmVwbGFj ZW1lbnQpOwotICAgICAgICAgICAgICAgICAgICBub2RlID0gbm9kZS0+bWlzYy5yZXBsYWNlbWVu dDsKKyAgICAgICAgICAgICAgICB3aGlsZSAobm9kZS0+cmVwbGFjZW1lbnQpIHsKKyAgICAgICAg ICAgICAgICAgICAgQVNTRVJUKG5vZGUgIT0gbm9kZS0+cmVwbGFjZW1lbnQpOworICAgICAgICAg ICAgICAgICAgICBub2RlID0gbm9kZS0+cmVwbGFjZW1lbnQ7CiAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgIGJsb2NrLT52YXJpYWJsZXNBdEhlYWRbaV0gPSBub2RlOwogICAgICAg ICAgICAgfQpAQCAtMzAxLDExICszMDEsMTEgQEAgcHVibGljOgogICAgICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIHBoaUluZGV4 ID0gYmxvY2stPnBoaXMuc2l6ZSgpOyBwaGlJbmRleC0tOykgewotICAgICAgICAgICAgICAgIGJs b2NrLT5waGlzW3BoaUluZGV4XS0+bWlzYy5yZXBsYWNlbWVudCA9CisgICAgICAgICAgICAgICAg YmxvY2stPnBoaXNbcGhpSW5kZXhdLT5yZXBsYWNlbWVudCA9CiAgICAgICAgICAgICAgICAgICAg IGJsb2NrLT52YXJpYWJsZXNBdEhlYWQub3BlcmFuZChibG9jay0+cGhpc1twaGlJbmRleF0tPmxv Y2FsKCkpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBub2RlSW5k ZXggPSBibG9jay0+c2l6ZSgpOyBub2RlSW5kZXgtLTspCi0gICAgICAgICAgICAgICAgQVNTRVJU KCFibG9jay0+YXQobm9kZUluZGV4KS0+bWlzYy5yZXBsYWNlbWVudCk7CisgICAgICAgICAgICAg ICAgQVNTRVJUKCFibG9jay0+YXQobm9kZUluZGV4KS0+cmVwbGFjZW1lbnQpOwogICAgICAgICAg ICAgCiAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIG5vZGVJbmRleCA9IDA7IG5vZGVJbmRleCA8 IGJsb2NrLT5zaXplKCk7ICsrbm9kZUluZGV4KSB7CiAgICAgICAgICAgICAgICAgTm9kZSogbm9k ZSA9IGJsb2NrLT5hdChub2RlSW5kZXgpOwpAQCAtMzE5LDcgKzMxOSw3IEBAIHB1YmxpYzoKICAg ICAgICAgICAgICAgICAgICAgICAgIG5vZGUtPm1lcmdlRmxhZ3MoTm9kZU11c3RHZW5lcmF0ZSk7 CiAgICAgICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUt PnNldE9wQW5kRGVmYXVsdEZsYWdzKENoZWNrKTsKLSAgICAgICAgICAgICAgICAgICAgbm9kZS0+ bWlzYy5yZXBsYWNlbWVudCA9IG5vZGUtPmNoaWxkMSgpLm5vZGUoKTsgLy8gT25seSBmb3IgVXBz aWxvbnMuCisgICAgICAgICAgICAgICAgICAgIG5vZGUtPnJlcGxhY2VtZW50ID0gbm9kZS0+Y2hp bGQxKCkubm9kZSgpOyAvLyBPbmx5IGZvciBVcHNpbG9ucy4KICAgICAgICAgICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAKQEAgLTMzMyw3 ICszMzMsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgICAgIGlmICh2YXJpYWJsZS0+aXND YXB0dXJlZCgpKQogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAg ICAgICAgIG5vZGUtPmNvbnZlcnRUb1BoYW50b20oKTsKLSAgICAgICAgICAgICAgICAgICAgbm9k ZS0+bWlzYy5yZXBsYWNlbWVudCA9IGJsb2NrLT52YXJpYWJsZXNBdEhlYWQub3BlcmFuZCh2YXJp YWJsZS0+bG9jYWwoKSk7CisgICAgICAgICAgICAgICAgICAgIG5vZGUtPnJlcGxhY2VtZW50ID0g YmxvY2stPnZhcmlhYmxlc0F0SGVhZC5vcGVyYW5kKHZhcmlhYmxlLT5sb2NhbCgpKTsKICAgICAg ICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAg ICAgICAKQEAgLTM0Miw3ICszNDIsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgICAgIG5v ZGUtPmNvbnZlcnRUb1BoYW50b20oKTsKICAgICAgICAgICAgICAgICAgICAgLy8gVGhpcyBpcyBv bmx5IGZvciBVcHNpbG9ucy4gQW4gVXBzaWxvbiB3aWxsIG9ubHkgcmVmZXIgdG8gYSBGbHVzaCBp ZgogICAgICAgICAgICAgICAgICAgICAvLyB0aGVyZSB3ZXJlIG5vIFNldExvY2FscyBvciBHZXRM b2NhbHMgaW4gdGhlIGJsb2NrLgotICAgICAgICAgICAgICAgICAgICBub2RlLT5taXNjLnJlcGxh Y2VtZW50ID0gYmxvY2stPnZhcmlhYmxlc0F0SGVhZC5vcGVyYW5kKG5vZGUtPmxvY2FsKCkpOwor ICAgICAgICAgICAgICAgICAgICBub2RlLT5yZXBsYWNlbWVudCA9IGJsb2NrLT52YXJpYWJsZXNB dEhlYWQub3BlcmFuZChub2RlLT5sb2NhbCgpKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAKQEAgLTM2Nyw3ICszNjcs NyBAQCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgICAgIG5vZGUtPmNvbnZlcnRUb1BoYW50b20o KTsKICAgICAgICAgICAgICAgICAgICAgLy8gVGhpcyBpcyBvbmx5IGZvciBVcHNpbG9ucy4gQW4g VXBzaWxvbiB3aWxsIG9ubHkgcmVmZXIgdG8gYQogICAgICAgICAgICAgICAgICAgICAvLyBQaGFu dG9tTG9jYWwgaWYgdGhlcmUgd2VyZSBubyBTZXRMb2NhbHMgb3IgR2V0TG9jYWxzIGluIHRoZSBi bG9jay4KLSAgICAgICAgICAgICAgICAgICAgbm9kZS0+bWlzYy5yZXBsYWNlbWVudCA9IGJsb2Nr LT52YXJpYWJsZXNBdEhlYWQub3BlcmFuZCh2YXJpYWJsZS0+bG9jYWwoKSk7CisgICAgICAgICAg ICAgICAgICAgIG5vZGUtPnJlcGxhY2VtZW50ID0gYmxvY2stPnZhcmlhYmxlc0F0SGVhZC5vcGVy YW5kKHZhcmlhYmxlLT5sb2NhbCgpKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAK