107147 2013-01-17 11:21:02 -0800 DFG Node::ref() and Node::deref() should not return bool, and should have postfixRef variants 2013-01-17 12:46:46 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 106868 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 809535 0 fpizlo 2013-01-17 11:21:02 -0800 This small refactoring will enable a world where ref() returns Node*, which is useful for https://bugs.webkit.org/show_bug.cgi?id=106868. Also, while this refactoring does lead to slightly less terse code, it's also slightly more self-explanatory. I could never quite remember what the meaning of the bool return from ref() and deref() was. 809536 1 183226 fpizlo 2013-01-17 11:22:01 -0800 Created attachment 183226 the patch 809590 2 183226 oliver 2013-01-17 12:00:49 -0800 Comment on attachment 183226 the patch I don't understand what "exchangeAnd(Der|Re)f" is exchanging, so the meaning of the name doesn't seem obvious to me. 809635 3 fpizlo 2013-01-17 12:35:50 -0800 (In reply to comment #2) > (From update of attachment 183226 [details]) > I don't understand what "exchangeAnd(Der|Re)f" is exchanging, so the meaning of the name doesn't seem obvious to me. It's exchanging the ref count. 809648 4 183248 fpizlo 2013-01-17 12:43:04 -0800 Created attachment 183248 the patch 809649 5 183248 mhahnenberg 2013-01-17 12:44:29 -0800 Comment on attachment 183248 the patch r=me 809655 6 fpizlo 2013-01-17 12:46:46 -0800 Landed in http://trac.webkit.org/changeset/140030 183226 2013-01-17 11:22:01 -0800 2013-01-17 12:43:04 -0800 the patch blah.patch text/plain 4576 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQwMDA3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDEzLTAxLTE3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHIE5vZGU6OnJlZigpIGFuZCBOb2RlOjpkZXJlZigpIHNob3VsZCBub3QgcmV0dXJuIGJvb2ws IGFuZCBzaG91bGQgaGF2ZSBleGNoYW5nZUFuZFJlZiB2YXJpYW50cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MTQ3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBUaGlzIHNtYWxsIHJlZmFj dG9yaW5nIHdpbGwgZW5hYmxlIGEgd29ybGQgd2hlcmUgcmVmKCkgcmV0dXJucyBOb2RlKiwgd2hp Y2ggaXMgdXNlZnVsIGZvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA2ODY4LiAgQWxzbywgd2hpbGUgdGhpcyByZWZhY3RvcmluZyBkb2VzIGxlYWQg dG8KKyAgICAgICAgc2xpZ2h0bHkgbGVzcyB0ZXJzZSBjb2RlLCBpdCdzIGFsc28gc2xpZ2h0bHkg bW9yZSBzZWxmLWV4cGxhbmF0b3J5LiAgSSBjb3VsZCBuZXZlciBxdWl0ZQorICAgICAgICByZW1l bWJlciB3aGF0IHRoZSBtZWFuaW5nIG9mIHRoZSBib29sIHJldHVybiBmcm9tIHJlZigpIGFuZCBk ZXJlZigpIHdhcy4KKworICAgICAgICAqIGRmZy9ERkdHcmFwaC5jcHA6CisgICAgICAgIChKU0M6 OkRGRzo6R3JhcGg6OmNvbGxlY3RHYXJiYWdlKToKKyAgICAgICAgKiBkZmcvREZHR3JhcGguaDoK KyAgICAgICAgKEpTQzo6REZHOjpHcmFwaDo6cmVmKToKKyAgICAgICAgKEpTQzo6REZHOjpHcmFw aDo6ZGVyZWYpOgorICAgICAgICAqIGRmZy9ERkdOb2RlLmg6CisgICAgICAgIChKU0M6OkRGRzo6 Tm9kZTo6cmVmKToKKyAgICAgICAgKE5vZGUpOgorICAgICAgICAoSlNDOjpERkc6Ok5vZGU6OmV4 Y2hhbmdlQW5kUmVmKToKKyAgICAgICAgKEpTQzo6REZHOjpOb2RlOjpkZXJlZik6CisgICAgICAg IChKU0M6OkRGRzo6Tm9kZTo6ZXhjaGFuZ2VBbmREZXJlZik6CisKIDIwMTMtMDEtMTcgIEFsZXhl eSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkZWQgc3ZuOmlnbm9y ZT0qLnB5Yywgc28gdGhhdCB1ZF9vcGNvZGUucHljIGFuZCB1ZF9vcHRhYmxlLnB5YyBkb24ndCBz aG93IHVwCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmNwcAkocmV2aXNp b24gMTQwMDAyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdHcmFwaC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQ4OCwxOCArNDg4LDE4IEBAIHZvaWQgR3JhcGg6OmNvbGxlY3RHYXJi YWdlKCkKICAgICAgICAgICAgICAgICBpZiAoIW1fdmFyQXJnQ2hpbGRyZW5bY2hpbGRJZHhdKQog ICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICBOb2RlSW5kZXgg Y2hpbGROb2RlSW5kZXggPSBtX3ZhckFyZ0NoaWxkcmVuW2NoaWxkSWR4XS5pbmRleCgpOwotICAg ICAgICAgICAgICAgIGlmICghYXQoY2hpbGROb2RlSW5kZXgpLnJlZigpKQorICAgICAgICAgICAg ICAgIGlmIChhdChjaGlsZE5vZGVJbmRleCkuZXhjaGFuZ2VBbmRSZWYoKSkKICAgICAgICAgICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICAgICAgd29ya2xpc3QuYXBwZW5kKGNoaWxk Tm9kZUluZGV4KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIGlmIChub2RlLmNoaWxk MSgpKSB7Ci0gICAgICAgICAgICBpZiAoYXQobm9kZS5jaGlsZDEoKSkucmVmKCkpCisgICAgICAg ICAgICBpZiAoIWF0KG5vZGUuY2hpbGQxKCkpLmV4Y2hhbmdlQW5kUmVmKCkpCiAgICAgICAgICAg ICAgICAgd29ya2xpc3QuYXBwZW5kKG5vZGUuY2hpbGQxKCkuaW5kZXgoKSk7CiAgICAgICAgICAg ICBpZiAobm9kZS5jaGlsZDIoKSkgewotICAgICAgICAgICAgICAgIGlmIChhdChub2RlLmNoaWxk MigpKS5yZWYoKSkKKyAgICAgICAgICAgICAgICBpZiAoIWF0KG5vZGUuY2hpbGQyKCkpLmV4Y2hh bmdlQW5kUmVmKCkpCiAgICAgICAgICAgICAgICAgICAgIHdvcmtsaXN0LmFwcGVuZChub2RlLmNo aWxkMigpLmluZGV4KCkpOwogICAgICAgICAgICAgICAgIGlmIChub2RlLmNoaWxkMygpKSB7Ci0g ICAgICAgICAgICAgICAgICAgIGlmIChhdChub2RlLmNoaWxkMygpKS5yZWYoKSkKKyAgICAgICAg ICAgICAgICAgICAgaWYgKCFhdChub2RlLmNoaWxkMygpKS5leGNoYW5nZUFuZFJlZigpKQogICAg ICAgICAgICAgICAgICAgICAgICAgd29ya2xpc3QuYXBwZW5kKG5vZGUuY2hpbGQzKCkuaW5kZXgo KSk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdHcmFwaC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHR3JhcGguaAkocmV2aXNpb24gMTQwMDAyKQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdHcmFwaC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDMsNyArMTAzLDcgQEAg cHVibGljOgogICAgIHsKICAgICAgICAgTm9kZSYgbm9kZSA9IGF0KG5vZGVJbmRleCk7CiAgICAg ICAgIC8vIElmIHRoZSB2YWx1ZSAoYmVmb3JlIGluY3JlbWVudGluZykgd2FzIGF0IHJlZkNvdW50 IHplcm8gdGhlbiB3ZSBuZWVkIHRvIHJlZiBpdHMgY2hpbGRyZW4uCi0gICAgICAgIGlmIChub2Rl LnJlZigpKQorICAgICAgICBpZiAoIW5vZGUuZXhjaGFuZ2VBbmRSZWYoKSkKICAgICAgICAgICAg IHJlZkNoaWxkcmVuKG5vZGVJbmRleCk7CiAgICAgfQogICAgIHZvaWQgcmVmKEVkZ2Ugbm9kZVVz ZSkKQEAgLTExMyw5ICsxMTMsNyBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBkZXJlZihOb2Rl SW5kZXggbm9kZUluZGV4KQogICAgIHsKLSAgICAgICAgaWYgKCFhdChub2RlSW5kZXgpLnJlZkNv dW50KCkpCi0gICAgICAgICAgICBkdW1wKCk7Ci0gICAgICAgIGlmIChhdChub2RlSW5kZXgpLmRl cmVmKCkpCisgICAgICAgIGlmIChhdChub2RlSW5kZXgpLmV4Y2hhbmdlQW5kRGVyZWYoKSA9PSAx KQogICAgICAgICAgICAgZGVyZWZDaGlsZHJlbihub2RlSW5kZXgpOwogICAgIH0KICAgICB2b2lk IGRlcmVmKEVkZ2Ugbm9kZVVzZSkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Tm9kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZS5o CShyZXZpc2lvbiAxNDAwMDIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUu aAkod29ya2luZyBjb3B5KQpAQCAtOTA5LDEwICs5MDksMTQgQEAgc3RydWN0IE5vZGUgewogICAg ICAgICByZXR1cm4gbV9yZWZDb3VudDsKICAgICB9CiAKLSAgICAvLyByZXR1cm5zIHRydWUgd2hl biByZWYgY291bnQgcGFzc2VzIGZyb20gMCB0byAxLgotICAgIGJvb2wgcmVmKCkKKyAgICB2b2lk IHJlZigpCiAgICAgewotICAgICAgICByZXR1cm4gIW1fcmVmQ291bnQrKzsKKyAgICAgICAgbV9y ZWZDb3VudCsrOworICAgIH0KKworICAgIHVuc2lnbmVkIGV4Y2hhbmdlQW5kUmVmKCkKKyAgICB7 CisgICAgICAgIHJldHVybiBtX3JlZkNvdW50Kys7CiAgICAgfQogCiAgICAgdW5zaWduZWQgYWRq dXN0ZWRSZWZDb3VudCgpCkBAIC05MjUsMTMgKzkyOSwxNiBAQCBzdHJ1Y3QgTm9kZSB7CiAgICAg ICAgIG1fcmVmQ291bnQgPSByZWZDb3VudDsKICAgICB9CiAgICAgCi0gICAgLy8gRGVyZWZzIHRo ZSBub2RlIGFuZCByZXR1cm5zIHRydWUgaWYgdGhlIHJlZiBjb3VudCByZWFjaGVkIHplcm8uCi0g ICAgLy8gSW4gZ2VuZXJhbCB5b3UgZG9uJ3Qgd2FudCB0byB1c2UgdGhpcyBkaXJlY3RseTsgdXNl IEdyYXBoOjpkZXJlZgotICAgIC8vIGluc3RlYWQuCi0gICAgYm9vbCBkZXJlZigpCisgICAgdm9p ZCBkZXJlZigpCisgICAgeworICAgICAgICBBU1NFUlQobV9yZWZDb3VudCk7CisgICAgICAgIC0t bV9yZWZDb3VudDsKKyAgICB9CisgICAgCisgICAgdW5zaWduZWQgZXhjaGFuZ2VBbmREZXJlZigp CiAgICAgewogICAgICAgICBBU1NFUlQobV9yZWZDb3VudCk7Ci0gICAgICAgIHJldHVybiAhLS1t X3JlZkNvdW50OworICAgICAgICByZXR1cm4gbV9yZWZDb3VudC0tOwogICAgIH0KICAgICAKICAg ICBFZGdlIGNoaWxkMSgpCg== 183248 2013-01-17 12:43:04 -0800 2013-01-17 12:44:28 -0800 the patch blah.patch text/plain 4532 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQwMDI4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDEzLTAxLTE3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHIE5vZGU6OnJlZigpIGFuZCBOb2RlOjpkZXJlZigpIHNob3VsZCBub3QgcmV0dXJuIGJvb2ws IGFuZCBzaG91bGQgaGF2ZSBwb3N0Zml4UmVmIHZhcmlhbnRzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDcxNDcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRoaXMgc21hbGwgcmVmYWN0b3Jp bmcgd2lsbCBlbmFibGUgYSB3b3JsZCB3aGVyZSByZWYoKSByZXR1cm5zIE5vZGUqLCB3aGljaCBp cyB1c2VmdWwgZm9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMDY4NjguICBBbHNvLCB3aGlsZSB0aGlzIHJlZmFjdG9yaW5nIGRvZXMgbGVhZCB0bwor ICAgICAgICBzbGlnaHRseSBsZXNzIHRlcnNlIGNvZGUsIGl0J3MgYWxzbyBzbGlnaHRseSBtb3Jl IHNlbGYtZXhwbGFuYXRvcnkuICBJIGNvdWxkIG5ldmVyIHF1aXRlCisgICAgICAgIHJlbWVtYmVy IHdoYXQgdGhlIG1lYW5pbmcgb2YgdGhlIGJvb2wgcmV0dXJuIGZyb20gcmVmKCkgYW5kIGRlcmVm KCkgd2FzLgorCisgICAgICAgICogZGZnL0RGR0dyYXBoLmNwcDoKKyAgICAgICAgKEpTQzo6REZH OjpHcmFwaDo6Y29sbGVjdEdhcmJhZ2UpOgorICAgICAgICAqIGRmZy9ERkdHcmFwaC5oOgorICAg ICAgICAoSlNDOjpERkc6OkdyYXBoOjpyZWYpOgorICAgICAgICAoSlNDOjpERkc6OkdyYXBoOjpk ZXJlZik6CisgICAgICAgICogZGZnL0RGR05vZGUuaDoKKyAgICAgICAgKEpTQzo6REZHOjpOb2Rl OjpyZWYpOgorICAgICAgICAoTm9kZSk6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6cG9zdGZp eFJlZik6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6ZGVyZWYpOgorICAgICAgICAoSlNDOjpE Rkc6Ok5vZGU6OnBvc3RmaXhEZXJlZik6CisKIDIwMTMtMDEtMTcgIEFsZXhleSBQcm9za3VyeWFr b3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkZWQgc3ZuOmlnbm9yZT0qLnB5Yywgc28g dGhhdCB1ZF9vcGNvZGUucHljIGFuZCB1ZF9vcHRhYmxlLnB5YyBkb24ndCBzaG93IHVwCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmNwcAkocmV2aXNpb24gMTQwMDAyKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdHcmFwaC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ4OCwxOCArNDg4LDE4IEBAIHZvaWQgR3JhcGg6OmNvbGxlY3RHYXJiYWdlKCkKICAgICAg ICAgICAgICAgICBpZiAoIW1fdmFyQXJnQ2hpbGRyZW5bY2hpbGRJZHhdKQogICAgICAgICAgICAg ICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICBOb2RlSW5kZXggY2hpbGROb2RlSW5k ZXggPSBtX3ZhckFyZ0NoaWxkcmVuW2NoaWxkSWR4XS5pbmRleCgpOwotICAgICAgICAgICAgICAg IGlmICghYXQoY2hpbGROb2RlSW5kZXgpLnJlZigpKQorICAgICAgICAgICAgICAgIGlmIChhdChj aGlsZE5vZGVJbmRleCkucG9zdGZpeFJlZigpKQogICAgICAgICAgICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgICAgICAgICB3b3JrbGlzdC5hcHBlbmQoY2hpbGROb2RlSW5kZXgpOwogICAg ICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKG5vZGUuY2hpbGQxKCkpIHsKLSAgICAgICAg ICAgIGlmIChhdChub2RlLmNoaWxkMSgpKS5yZWYoKSkKKyAgICAgICAgICAgIGlmICghYXQobm9k ZS5jaGlsZDEoKSkucG9zdGZpeFJlZigpKQogICAgICAgICAgICAgICAgIHdvcmtsaXN0LmFwcGVu ZChub2RlLmNoaWxkMSgpLmluZGV4KCkpOwogICAgICAgICAgICAgaWYgKG5vZGUuY2hpbGQyKCkp IHsKLSAgICAgICAgICAgICAgICBpZiAoYXQobm9kZS5jaGlsZDIoKSkucmVmKCkpCisgICAgICAg ICAgICAgICAgaWYgKCFhdChub2RlLmNoaWxkMigpKS5wb3N0Zml4UmVmKCkpCiAgICAgICAgICAg ICAgICAgICAgIHdvcmtsaXN0LmFwcGVuZChub2RlLmNoaWxkMigpLmluZGV4KCkpOwogICAgICAg ICAgICAgICAgIGlmIChub2RlLmNoaWxkMygpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChh dChub2RlLmNoaWxkMygpKS5yZWYoKSkKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFhdChub2Rl LmNoaWxkMygpKS5wb3N0Zml4UmVmKCkpCiAgICAgICAgICAgICAgICAgICAgICAgICB3b3JrbGlz dC5hcHBlbmQobm9kZS5jaGlsZDMoKS5pbmRleCgpKTsKICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdHcmFwaC5oCShyZXZpc2lv biAxNDAwMDIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmgJKHdvcmtp bmcgY29weSkKQEAgLTEwMyw3ICsxMDMsNyBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICBOb2Rl JiBub2RlID0gYXQobm9kZUluZGV4KTsKICAgICAgICAgLy8gSWYgdGhlIHZhbHVlIChiZWZvcmUg aW5jcmVtZW50aW5nKSB3YXMgYXQgcmVmQ291bnQgemVybyB0aGVuIHdlIG5lZWQgdG8gcmVmIGl0 cyBjaGlsZHJlbi4KLSAgICAgICAgaWYgKG5vZGUucmVmKCkpCisgICAgICAgIGlmICghbm9kZS5w b3N0Zml4UmVmKCkpCiAgICAgICAgICAgICByZWZDaGlsZHJlbihub2RlSW5kZXgpOwogICAgIH0K ICAgICB2b2lkIHJlZihFZGdlIG5vZGVVc2UpCkBAIC0xMTMsOSArMTEzLDcgQEAgcHVibGljOgog ICAgIAogICAgIHZvaWQgZGVyZWYoTm9kZUluZGV4IG5vZGVJbmRleCkKICAgICB7Ci0gICAgICAg IGlmICghYXQobm9kZUluZGV4KS5yZWZDb3VudCgpKQotICAgICAgICAgICAgZHVtcCgpOwotICAg ICAgICBpZiAoYXQobm9kZUluZGV4KS5kZXJlZigpKQorICAgICAgICBpZiAoYXQobm9kZUluZGV4 KS5wb3N0Zml4RGVyZWYoKSA9PSAxKQogICAgICAgICAgICAgZGVyZWZDaGlsZHJlbihub2RlSW5k ZXgpOwogICAgIH0KICAgICB2b2lkIGRlcmVmKEVkZ2Ugbm9kZVVzZSkKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHTm9kZS5oCShyZXZpc2lvbiAxNDAwMDIpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR05vZGUuaAkod29ya2luZyBjb3B5KQpAQCAtOTA5LDEwICs5MDksMTQg QEAgc3RydWN0IE5vZGUgewogICAgICAgICByZXR1cm4gbV9yZWZDb3VudDsKICAgICB9CiAKLSAg ICAvLyByZXR1cm5zIHRydWUgd2hlbiByZWYgY291bnQgcGFzc2VzIGZyb20gMCB0byAxLgotICAg IGJvb2wgcmVmKCkKKyAgICB2b2lkIHJlZigpCiAgICAgewotICAgICAgICByZXR1cm4gIW1fcmVm Q291bnQrKzsKKyAgICAgICAgbV9yZWZDb3VudCsrOworICAgIH0KKworICAgIHVuc2lnbmVkIHBv c3RmaXhSZWYoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIG1fcmVmQ291bnQrKzsKICAgICB9CiAK ICAgICB1bnNpZ25lZCBhZGp1c3RlZFJlZkNvdW50KCkKQEAgLTkyNSwxMyArOTI5LDE2IEBAIHN0 cnVjdCBOb2RlIHsKICAgICAgICAgbV9yZWZDb3VudCA9IHJlZkNvdW50OwogICAgIH0KICAgICAK LSAgICAvLyBEZXJlZnMgdGhlIG5vZGUgYW5kIHJldHVybnMgdHJ1ZSBpZiB0aGUgcmVmIGNvdW50 IHJlYWNoZWQgemVyby4KLSAgICAvLyBJbiBnZW5lcmFsIHlvdSBkb24ndCB3YW50IHRvIHVzZSB0 aGlzIGRpcmVjdGx5OyB1c2UgR3JhcGg6OmRlcmVmCi0gICAgLy8gaW5zdGVhZC4KLSAgICBib29s IGRlcmVmKCkKKyAgICB2b2lkIGRlcmVmKCkKKyAgICB7CisgICAgICAgIEFTU0VSVChtX3JlZkNv dW50KTsKKyAgICAgICAgLS1tX3JlZkNvdW50OworICAgIH0KKyAgICAKKyAgICB1bnNpZ25lZCBw b3N0Zml4RGVyZWYoKQogICAgIHsKICAgICAgICAgQVNTRVJUKG1fcmVmQ291bnQpOwotICAgICAg ICByZXR1cm4gIS0tbV9yZWZDb3VudDsKKyAgICAgICAgcmV0dXJuIG1fcmVmQ291bnQtLTsKICAg ICB9CiAgICAgCiAgICAgRWRnZSBjaGlsZDEoKQo=