120781 2013-09-05 11:08:03 -0700 REGRESSION(149636, merged in 153145): ToThis conversion doesn't work in the DFG 2013-09-06 12:00:39 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 115542 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 925131 0 fpizlo 2013-09-05 11:08:03 -0700 Patch forthcoming. 925132 1 210638 fpizlo 2013-09-05 11:11:10 -0700 Created attachment 210638 the patch 925141 2 210640 fpizlo 2013-09-05 11:36:14 -0700 Created attachment 210640 the patch 925165 3 210640 oliver 2013-09-05 12:38:58 -0700 Comment on attachment 210640 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=210640&action=review > Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h:1089 > - destination.merge(SpecObjectOther); > + destination.merge(SpecObject); Do we end up with ToThis nodes in strict mode? If we do ToThis can be a primitive as it won't be boxed (this conversion is only for the global object -> global object proxy). 925183 4 fpizlo 2013-09-05 13:14:19 -0700 (In reply to comment #3) > (From update of attachment 210640 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=210640&action=review > > > Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h:1089 > > - destination.merge(SpecObjectOther); > > + destination.merge(SpecObject); > > Do we end up with ToThis nodes in strict mode? If we do ToThis can be a primitive as it won't be boxed (this conversion is only for the global object -> global object proxy). Hence the merge. If the value was a primitive before, this will say "primitive or object". If it was TOP before, then this will still say TOP. 925188 5 210640 mhahnenberg 2013-09-05 13:24:22 -0700 Comment on attachment 210640 the patch r=me 925207 6 fpizlo 2013-09-05 14:18:23 -0700 Landed in http://trac.webkit.org/changeset/155149 925338 7 mrowe 2013-09-05 18:08:16 -0700 This broke the build so I rolled it out in r155166. 925763 8 fpizlo 2013-09-06 12:00:39 -0700 Relanded in http://trac.webkit.org/changeset/155201 210638 2013-09-05 11:11:10 -0700 2013-09-05 11:36:14 -0700 the patch blah.patch text/plain 10717 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU1MTM0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBA CisyMDEzLTA5LTA1ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg UkVHUkVTU0lPTigxNDk2MzYsIG1lcmdlZCBpbiAxNTMxNDUpOiBUb1RoaXMgY29udmVyc2lvbiBk b2Vzbid0IHdvcmsgaW4gdGhlIERGRworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIwNzgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisgICAgICAgIAorICAgICAgICAtIFVzZSBzb21lIG1ldGhvZCB0YWJsZSBoYWNrcyB0byBk ZXRlY3QgaWYgdGhlIENoZWNrU3RydWN0dXJlIG9wdGltaXphdGlvbiBpcworICAgICAgICAgIHZh bGlkIGZvciB0b190aGlzLgorICAgICAgICAKKyAgICAgICAgLSBJbnRyb2R1Y2UgYSBGaW5hbE9i amVjdFVzZSBhbmQgdXNlIGl0IGZvciBUb1RoaXMtPklkZW50aXR5IGNvbnZlcnNpb24uCisgICAg ICAgIAorICAgICAgICBUaGlzIGxvb2tzIGxpa2UgaXQgbWlnaHQgYmUgcGVyZi1uZXV0cmFsIG9u IHRoZSBiZW5jaG1hcmtzIHdlIHRyYWNrIG5vdywgYnV0CisgICAgICAgIGl0IGludHJvZHVjZXMg c29tZSBob3JyaWJsZSBwZXJmb3JtYW5jZSBjbGlmZnMuIEZvciBleGFtcGxlIGlmIHlvdSBhZGQg bWV0aG9kcyB0bworICAgICAgICB0aGUgQXJyYXkgcHJvdG90eXBlLCB5b3UnbGwgZ2V0IGhvcnJp YmxlIHBlcmZvcm1hbmNlIGNsaWZmcy4gQXMgaW4gdmlydHVhbCBjYWxscworICAgICAgICB0byBD KysgZXZlcnkgdGltZSB5b3UgY2FsbCBhIEpTIGZ1bmN0aW9uIGV2ZW4gaWYgaXQncyBpbmxpbmVk LgorCisgICAgICAgICogZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6 REZHOjpCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayk6CisgICAgICAgICogZGZnL0RGR0ZpeHVw UGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkZpeHVwUGhhc2U6OmZpeHVwTm9kZSk6Cisg ICAgICAgICogZGZnL0RGR1NhZmVUb0V4ZWN1dGUuaDoKKyAgICAgICAgKEpTQzo6REZHOjpTYWZl VG9FeGVjdXRlRWRnZTo6b3BlcmF0b3IoKSk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZl SklULmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6c3BlY3VsYXRlRmlu YWxPYmplY3QpOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpzcGVjdWxhdGUp OgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oOgorICAgICAgICAqIGRmZy9ERkdT cGVjdWxhdGl2ZUpJVDMyXzY0LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJ VDo6Y29tcGlsZSk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwOgorICAg ICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlKToKKyAgICAgICAgKiBkZmcv REZHVXNlS2luZC5jcHA6CisgICAgICAgIChXVEY6OnByaW50SW50ZXJuYWwpOgorICAgICAgICAq IGRmZy9ERkdVc2VLaW5kLmg6CisgICAgICAgIChKU0M6OkRGRzo6dHlwZUZpbHRlckZvcik6Cisg ICAgICAgIChKU0M6OkRGRzo6aXNDZWxsKToKKwogMjAxMy0wOS0wNSAgQnJlbnQgRnVsZ2hhbSAg PGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luZG93c10gVW5yZXZpZXdlZCBidWls ZCBmaXggZm9yIERlYnVnU3VmZml4IHRhcmdldC4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCShyZXZpc2lvbiAxNTUxMjQpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTkwMiw3ICsxOTAyLDggQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9j ayh1bnNpZ25lZAogICAgICAgICAgICAgICAgIGlmIChwcm9maWxlLT5tX3NpbmdsZXRvblZhbHVl SXNUb3AKICAgICAgICAgICAgICAgICAgICAgfHwgIXByb2ZpbGUtPm1fc2luZ2xldG9uVmFsdWUK ICAgICAgICAgICAgICAgICAgICAgfHwgIXByb2ZpbGUtPm1fc2luZ2xldG9uVmFsdWUuaXNDZWxs KCkKLSAgICAgICAgICAgICAgICAgICAgfHwgcHJvZmlsZS0+bV9zaW5nbGV0b25WYWx1ZS5hc0Nl bGwoKS0+Y2xhc3NJbmZvKCkgIT0gU3RydWN0dXJlOjppbmZvKCkpCisgICAgICAgICAgICAgICAg ICAgIHx8IHByb2ZpbGUtPm1fc2luZ2xldG9uVmFsdWUuYXNDZWxsKCktPmNsYXNzSW5mbygpICE9 IFN0cnVjdHVyZTo6aW5mbygpCisgICAgICAgICAgICAgICAgICAgIHx8IHN0YXRpY19jYXN0PFN0 cnVjdHVyZSo+KHByb2ZpbGUtPm1fc2luZ2xldG9uVmFsdWUuYXNDZWxsKCkpLT5jbGFzc0luZm8o KS0+bWV0aG9kVGFibGUudG9UaGlzICE9IEpTT2JqZWN0OjppbmZvKCktPm1ldGhvZFRhYmxlLnRv VGhpcykKICAgICAgICAgICAgICAgICAgICAgc2V0VGhpcyhhZGRUb0dyYXBoKFRvVGhpcywgb3Ax KSk7CiAgICAgICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIGFkZFRvR3Jh cGgoCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ZpeHVwUGhhc2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAJ KHJldmlzaW9uIDE1NTEyNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQ aGFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcwNiw3ICs3MDYsNyBAQCBwcml2YXRlOgogICAg ICAgICAgICAgfQogICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAoaXNGaW5hbE9iamVjdFNw ZWN1bGF0aW9uKG5vZGUtPmNoaWxkMSgpLT5wcmVkaWN0aW9uKCkpKSB7Ci0gICAgICAgICAgICAg ICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPE9iamVjdFVzZT4obm9kZS0+Y2hpbGQx KCkpOworICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxGaW5h bE9iamVjdFVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgICAgIG5vZGUtPmNvbnZl cnRUb0lkZW50aXR5KCk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9Cklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NhZmVUb0V4ZWN1dGUuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NhZmVUb0V4ZWN1dGUuaAkocmV2 aXNpb24gMTU1MTI0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTYWZlVG9FeGVj dXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTUzLDYgKzUzLDcgQEAgcHVibGljOgogICAgICAgICBj YXNlIEJvb2xlYW5Vc2U6CiAgICAgICAgIGNhc2UgQ2VsbFVzZToKICAgICAgICAgY2FzZSBPYmpl Y3RVc2U6CisgICAgICAgIGNhc2UgRmluYWxPYmplY3RVc2U6CiAgICAgICAgIGNhc2UgT2JqZWN0 T3JPdGhlclVzZToKICAgICAgICAgY2FzZSBTdHJpbmdJZGVudFVzZToKICAgICAgICAgY2FzZSBT dHJpbmdVc2U6CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZl SklUMzJfNjQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U3BlY3VsYXRpdmVKSVQzMl82NC5jcHAJKHJldmlzaW9uIDE1NTEyNCkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM2NDksMTggKzM2NDksMjYgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2Rl KiBub2RlKQogICAgICAgICAKICAgICBjYXNlIFRvVGhpczogewogICAgICAgICBBU1NFUlQobm9k ZS0+Y2hpbGQxKCkudXNlS2luZCgpID09IFVudHlwZWRVc2UpOwotCiAgICAgICAgIEpTVmFsdWVP cGVyYW5kIHRoaXNWYWx1ZSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgIEdQUlJlZyB0 aGlzVmFsdWVUYWdHUFIgPSB0aGlzVmFsdWUudGFnR1BSKCk7CisgICAgICAgIEdQUlRlbXBvcmFy eSB0ZW1wKHRoaXMpOwogICAgICAgICBHUFJSZWcgdGhpc1ZhbHVlUGF5bG9hZEdQUiA9IHRoaXNW YWx1ZS5wYXlsb2FkR1BSKCk7CisgICAgICAgIEdQUlJlZyB0aGlzVmFsdWVUYWdHUFIgPSB0aGlz VmFsdWUudGFnR1BSKCk7CisgICAgICAgIEdQUlJlZyB0ZW1wR1BSID0gdGVtcC5ncHIoKTsKICAg ICAgICAgCi0gICAgICAgIGZsdXNoUmVnaXN0ZXJzKCk7Ci0gICAgICAgIAotICAgICAgICBHUFJS ZXN1bHQyIHJlc3VsdFRhZyh0aGlzKTsKLSAgICAgICAgR1BSUmVzdWx0IHJlc3VsdFBheWxvYWQo dGhpcyk7Ci0gICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uVG9UaGlzLCByZXN1bHRUYWcu Z3ByKCksIHJlc3VsdFBheWxvYWQuZ3ByKCksIHRoaXNWYWx1ZVRhZ0dQUiwgdGhpc1ZhbHVlUGF5 bG9hZEdQUik7Ci0gICAgICAgIAotICAgICAgICBjZWxsUmVzdWx0KHJlc3VsdFBheWxvYWQuZ3By KCksIG5vZGUpOworICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6SnVtcExpc3Qgc2xvd0Nhc2VzOwor ICAgICAgICBzbG93Q2FzZXMuYXBwZW5kKG1faml0LmJyYW5jaDMyKAorICAgICAgICAgICAgTWFj cm9Bc3NlbWJsZXI6Ok5vdEVxdWFsLCB0aGlzVmFsdWVUYWdHUFIsIFRydXN0ZWRJbW0zMihKU1Zh bHVlOjpDZWxsVGFnKSkpOworICAgICAgICBtX2ppdC5sb2FkUHRyKAorICAgICAgICAgICAgTWFj cm9Bc3NlbWJsZXI6OkFkZHJlc3ModGhpc1ZhbHVlUGF5bG9hZEdQUiwgSlNDZWxsOjpzdHJ1Y3R1 cmVPZmZzZXQoKSksIHRlbXBHUFIpOworICAgICAgICBzbG93Q2FzZXMuYXBwZW5kKG1faml0LmJy YW5jaDgoCisgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6Tm90RXF1YWwsCisgICAgICAgICAg ICBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyh0ZW1wR1BSLCBTdHJ1Y3R1cmU6OnR5cGVJbmZvVHlw ZU9mZnNldCgpKSwKKyAgICAgICAgICAgIFRydXN0ZWRJbW0zMihGaW5hbE9iamVjdFR5cGUpKSk7 CisgICAgICAgIG1faml0Lm1vdmUodGhpc1ZhbHVlUGF5bG9hZEdQUiwgdGVtcEdQUik7CisgICAg ICAgIGFkZFNsb3dQYXRoR2VuZXJhdG9yKAorICAgICAgICAgICAgc2xvd1BhdGhDYWxsKHNsb3dD YXNlcywgdGhpcywgb3BlcmF0aW9uVG9UaGlzLCB0ZW1wR1BSLCB0aGlzVmFsdWVUYWdHUFIsIHRo aXNWYWx1ZVBheWxvYWRHUFIpKTsKKworICAgICAgICBjZWxsUmVzdWx0KHRlbXBHUFIsIG5vZGUp OwogICAgICAgICBicmVhazsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAkocmV2aXNpb24gMTU1MTI0KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMzU3MCwxNCArMzU3MCwyNCBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21w aWxlKE5vZGUqIG5vZGUpCiAgICAgY2FzZSBUb1RoaXM6IHsKICAgICAgICAgQVNTRVJUKG5vZGUt PmNoaWxkMSgpLnVzZUtpbmQoKSA9PSBVbnR5cGVkVXNlKTsKICAgICAgICAgSlNWYWx1ZU9wZXJh bmQgdGhpc1ZhbHVlKHRoaXMsIG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgR1BSVGVtcG9yYXJ5 IHRlbXAodGhpcyk7CiAgICAgICAgIEdQUlJlZyB0aGlzVmFsdWVHUFIgPSB0aGlzVmFsdWUuZ3By KCk7CisgICAgICAgIEdQUlJlZyB0ZW1wR1BSID0gdGVtcC5ncHIoKTsKICAgICAgICAgCi0gICAg ICAgIGZsdXNoUmVnaXN0ZXJzKCk7Ci0gICAgICAgIAotICAgICAgICBHUFJSZXN1bHQgcmVzdWx0 KHRoaXMpOwotICAgICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvblRvVGhpcywgcmVzdWx0Lmdw cigpLCB0aGlzVmFsdWVHUFIpOworICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6SnVtcExpc3Qgc2xv d0Nhc2VzOworICAgICAgICBzbG93Q2FzZXMuYXBwZW5kKG1faml0LmJyYW5jaFRlc3Q2NCgKKyAg ICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpOb25aZXJvLCB0aGlzVmFsdWVHUFIsIEdQUkluZm86 OnRhZ01hc2tSZWdpc3RlcikpOworICAgICAgICBtX2ppdC5sb2FkUHRyKAorICAgICAgICAgICAg TWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3ModGhpc1ZhbHVlR1BSLCBKU0NlbGw6OnN0cnVjdHVyZU9m ZnNldCgpKSwgdGVtcEdQUik7CisgICAgICAgIHNsb3dDYXNlcy5hcHBlbmQobV9qaXQuYnJhbmNo OCgKKyAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwKKyAgICAgICAgICAgIE1h Y3JvQXNzZW1ibGVyOjpBZGRyZXNzKHRlbXBHUFIsIFN0cnVjdHVyZTo6dHlwZUluZm9UeXBlT2Zm c2V0KCkpLAorICAgICAgICAgICAgVHJ1c3RlZEltbTMyKEZpbmFsT2JqZWN0VHlwZSkpKTsKKyAg ICAgICAgbV9qaXQubW92ZSh0aGlzVmFsdWVHUFIsIHRlbXBHUFIpOworICAgICAgICBhZGRTbG93 UGF0aEdlbmVyYXRvcigKKyAgICAgICAgICAgIHNsb3dQYXRoQ2FsbChzbG93Q2FzZXMsIHRoaXMs IG9wZXJhdGlvblRvVGhpcywgdGVtcEdQUiwgdGhpc1ZhbHVlR1BSKSk7CiAKLSAgICAgICAgY2Vs bFJlc3VsdChyZXN1bHQuZ3ByKCksIG5vZGUpOworICAgICAgICBjZWxsUmVzdWx0KHRlbXBHUFIs IG5vZGUpOwogICAgICAgICBicmVhazsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCShyZXZpc2lvbiAxNTUxMjQpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDYxMiw2ICs0NjEyLDIzIEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OnNwZWN1 bGF0ZU9iamVjdChFZGcKICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRy KG1faml0LnZtKCktPnN0cmluZ1N0cnVjdHVyZS5nZXQoKSkpKTsKIH0KIAordm9pZCBTcGVjdWxh dGl2ZUpJVDo6c3BlY3VsYXRlRmluYWxPYmplY3QoRWRnZSBlZGdlKQoreworICAgIGlmICghbmVl ZHNUeXBlQ2hlY2soZWRnZSwgU3BlY0ZpbmFsT2JqZWN0KSkKKyAgICAgICAgcmV0dXJuOworICAg IAorICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIG9wZXJhbmQodGhpcywgZWRnZSk7CisgICAgR1BS VGVtcG9yYXJ5IHN0cnVjdHVyZSh0aGlzKTsKKyAgICBHUFJSZWcgZ3ByID0gb3BlcmFuZC5ncHIo KTsKKyAgICBHUFJSZWcgc3RydWN0dXJlR1BSID0gc3RydWN0dXJlLmdwcigpOworICAgIG1faml0 LmxvYWRQdHIoTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoZ3ByLCBKU0NlbGw6OnN0cnVjdHVyZU9m ZnNldCgpKSwgc3RydWN0dXJlR1BSKTsKKyAgICBERkdfVFlQRV9DSEVDSygKKyAgICAgICAgSlNW YWx1ZVNvdXJjZTo6dW5ib3hlZENlbGwoZ3ByKSwgZWRnZSwgU3BlY0ZpbmFsT2JqZWN0LCBtX2pp dC5icmFuY2g4KAorICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6Ok5vdEVxdWFsLAorICAgICAg ICAgICAgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Moc3RydWN0dXJlR1BSLCBTdHJ1Y3R1cmU6OnR5 cGVJbmZvVHlwZU9mZnNldCgpKSwKKyAgICAgICAgICAgIFRydXN0ZWRJbW0zMihGaW5hbE9iamVj dFR5cGUpKSk7Cit9CisKIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OnNwZWN1bGF0ZU9iamVjdE9yT3Ro ZXIoRWRnZSBlZGdlKQogewogICAgIGlmICghbmVlZHNUeXBlQ2hlY2soZWRnZSwgU3BlY09iamVj dCB8IFNwZWNPdGhlcikpCkBAIC00ODQ4LDYgKzQ4NjUsOSBAQCB2b2lkIFNwZWN1bGF0aXZlSklU OjpzcGVjdWxhdGUoTm9kZSosIEVkCiAgICAgY2FzZSBPYmplY3RVc2U6CiAgICAgICAgIHNwZWN1 bGF0ZU9iamVjdChlZGdlKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGaW5hbE9iamVjdFVz ZToKKyAgICAgICAgc3BlY3VsYXRlRmluYWxPYmplY3QoZWRnZSk7CisgICAgICAgIGJyZWFrOwog ICAgIGNhc2UgT2JqZWN0T3JPdGhlclVzZToKICAgICAgICAgc3BlY3VsYXRlT2JqZWN0T3JPdGhl cihlZGdlKTsKICAgICAgICAgYnJlYWs7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR1NwZWN1bGF0aXZlSklULmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCShyZXZpc2lvbiAxNTUxMjQpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmgJKHdvcmtpbmcgY29weSkKQEAgLTIx MTgsNiArMjExOCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNwZWN1bGF0ZUJvb2xlYW4oRWRnZSk7 CiAgICAgdm9pZCBzcGVjdWxhdGVDZWxsKEVkZ2UpOwogICAgIHZvaWQgc3BlY3VsYXRlT2JqZWN0 KEVkZ2UpOworICAgIHZvaWQgc3BlY3VsYXRlRmluYWxPYmplY3QoRWRnZSk7CiAgICAgdm9pZCBz cGVjdWxhdGVPYmplY3RPck90aGVyKEVkZ2UpOwogICAgIHZvaWQgc3BlY3VsYXRlU3RyaW5nKEVk Z2UgZWRnZSwgR1BSUmVnIGNlbGwpOwogICAgIHZvaWQgc3BlY3VsYXRlU3RyaW5nSWRlbnRBbmRM b2FkU3RvcmFnZShFZGdlIGVkZ2UsIEdQUlJlZyBzdHJpbmcsIEdQUlJlZyBzdG9yYWdlKTsKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHVXNlS2luZC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdVc2VLaW5kLmNwcAkocmV2aXNpb24gMTU1 MTI0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdVc2VLaW5kLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNjUsNiArNjUsOSBAQCB2b2lkIHByaW50SW50ZXJuYWwoUHJpbnRTdHJlYW0m IG91dCwgVXNlCiAgICAgY2FzZSBPYmplY3RVc2U6CiAgICAgICAgIG91dC5wcmludCgiT2JqZWN0 Iik7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgRmluYWxPYmplY3RVc2U6CisgICAgICAgIG91 dC5wcmludCgiRmluYWxPYmplY3QiKTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBPYmplY3RP ck90aGVyVXNlOgogICAgICAgICBvdXQucHJpbnQoIk9iamVjdE9yT3RoZXIiKTsKICAgICAgICAg YnJlYWs7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1VzZUtpbmQuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1VzZUtpbmQuaAkocmV2aXNp b24gMTU1MTI0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdVc2VLaW5kLmgJKHdv cmtpbmcgY29weSkKQEAgLTQ2LDYgKzQ2LDcgQEAgZW51bSBVc2VLaW5kIHsKICAgICBDZWxsVXNl LAogICAgIEtub3duQ2VsbFVzZSwKICAgICBPYmplY3RVc2UsCisgICAgRmluYWxPYmplY3RVc2Us CiAgICAgT2JqZWN0T3JPdGhlclVzZSwKICAgICBTdHJpbmdJZGVudFVzZSwKICAgICBTdHJpbmdV c2UsCkBAIC03Nyw2ICs3OCw4IEBAIEFMV0FZU19JTkxJTkUgU3BlY3VsYXRlZFR5cGUgdHlwZUZp bHRlckYKICAgICAgICAgcmV0dXJuIFNwZWNDZWxsOwogICAgIGNhc2UgT2JqZWN0VXNlOgogICAg ICAgICByZXR1cm4gU3BlY09iamVjdDsKKyAgICBjYXNlIEZpbmFsT2JqZWN0VXNlOgorICAgICAg ICByZXR1cm4gU3BlY0ZpbmFsT2JqZWN0OwogICAgIGNhc2UgT2JqZWN0T3JPdGhlclVzZToKICAg ICAgICAgcmV0dXJuIFNwZWNPYmplY3QgfCBTcGVjT3RoZXI7CiAgICAgY2FzZSBTdHJpbmdJZGVu dFVzZToKQEAgLTE1MCw2ICsxNTMsNyBAQCBBTFdBWVNfSU5MSU5FIGJvb2wgaXNDZWxsKFVzZUtp bmQga2luZCkKICAgICBjYXNlIENlbGxVc2U6CiAgICAgY2FzZSBLbm93bkNlbGxVc2U6CiAgICAg Y2FzZSBPYmplY3RVc2U6CisgICAgY2FzZSBGaW5hbE9iamVjdFVzZToKICAgICBjYXNlIFN0cmlu Z0lkZW50VXNlOgogICAgIGNhc2UgU3RyaW5nVXNlOgogICAgIGNhc2UgS25vd25TdHJpbmdVc2U6 Cg== 210640 2013-09-05 11:36:14 -0700 2013-09-05 13:24:21 -0700 the patch blah.patch text/plain 11365 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU1MTM2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBA CisyMDEzLTA5LTA1ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg UkVHUkVTU0lPTigxNDk2MzYsIG1lcmdlZCBpbiAxNTMxNDUpOiBUb1RoaXMgY29udmVyc2lvbiBk b2Vzbid0IHdvcmsgaW4gdGhlIERGRworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIwNzgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisgICAgICAgIAorICAgICAgICAtIFVzZSBzb21lIG1ldGhvZCB0YWJsZSBoYWNrcyB0byBk ZXRlY3QgaWYgdGhlIENoZWNrU3RydWN0dXJlIG9wdGltaXphdGlvbiBpcworICAgICAgICAgIHZh bGlkIGZvciB0b190aGlzLgorICAgICAgICAKKyAgICAgICAgLSBJbnRyb2R1Y2UgYSBGaW5hbE9i amVjdFVzZSBhbmQgdXNlIGl0IGZvciBUb1RoaXMtPklkZW50aXR5IGNvbnZlcnNpb24uCisgICAg ICAgIAorICAgICAgICBUaGlzIGxvb2tzIGxpa2UgaXQgbWlnaHQgYmUgcGVyZi1uZXV0cmFsIG9u IHRoZSBiZW5jaG1hcmtzIHdlIHRyYWNrIG5vdywgYnV0CisgICAgICAgIGl0IGludHJvZHVjZXMg c29tZSBob3JyaWJsZSBwZXJmb3JtYW5jZSBjbGlmZnMuIEZvciBleGFtcGxlIGlmIHlvdSBhZGQg bWV0aG9kcyB0bworICAgICAgICB0aGUgQXJyYXkgcHJvdG90eXBlLCB5b3UnbGwgZ2V0IGhvcnJp YmxlIHBlcmZvcm1hbmNlIGNsaWZmcy4gQXMgaW4gdmlydHVhbCBjYWxscworICAgICAgICB0byBD KysgZXZlcnkgdGltZSB5b3UgY2FsbCBhIEpTIGZ1bmN0aW9uIGV2ZW4gaWYgaXQncyBpbmxpbmVk LgorCisgICAgICAgICogZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmg6CisgICAg ICAgIChKU0M6OkRGRzo6OjpleGVjdXRlRWZmZWN0cyk6CisgICAgICAgICogZGZnL0RGR0J5dGVD b2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6cGFyc2VC bG9jayk6CisgICAgICAgICogZGZnL0RGR0ZpeHVwUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpE Rkc6OkZpeHVwUGhhc2U6OmZpeHVwTm9kZSk6CisgICAgICAgICogZGZnL0RGR1NhZmVUb0V4ZWN1 dGUuaDoKKyAgICAgICAgKEpTQzo6REZHOjpTYWZlVG9FeGVjdXRlRWRnZTo6b3BlcmF0b3IoKSk6 CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcDoKKyAgICAgICAgKEpTQzo6REZH OjpTcGVjdWxhdGl2ZUpJVDo6c3BlY3VsYXRlRmluYWxPYmplY3QpOgorICAgICAgICAoSlNDOjpE Rkc6OlNwZWN1bGF0aXZlSklUOjpzcGVjdWxhdGUpOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxh dGl2ZUpJVC5oOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcDoKKyAg ICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZSk6CisgICAgICAgICogZGZn L0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZl SklUOjpjb21waWxlKToKKyAgICAgICAgKiBkZmcvREZHVXNlS2luZC5jcHA6CisgICAgICAgIChX VEY6OnByaW50SW50ZXJuYWwpOgorICAgICAgICAqIGRmZy9ERkdVc2VLaW5kLmg6CisgICAgICAg IChKU0M6OkRGRzo6dHlwZUZpbHRlckZvcik6CisgICAgICAgIChKU0M6OkRGRzo6aXNDZWxsKToK KwogMjAxMy0wOS0wNSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAg ICAgICBbV2luZG93c10gVW5yZXZpZXdlZCBidWlsZCBmaXggZm9yIERlYnVnU3VmZml4IHRhcmdl dC4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RJbnRlcnByZXRl cklubGluZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fi c3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgJKHJldmlzaW9uIDE1NTEyNCkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RJbnRlcnByZXRlcklubGluZXMuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTA4Niw3ICsxMDg2LDcgQEAgYm9vbCBBYnN0cmFjdEludGVycHJldGVyPEFi c3RyYWN0U3RhdGVUeQogICAgICAgICBBYnN0cmFjdFZhbHVlJiBkZXN0aW5hdGlvbiA9IGZvck5v ZGUobm9kZSk7CiAgICAgICAgICAgICAKICAgICAgICAgZGVzdGluYXRpb24gPSBzb3VyY2U7Ci0g ICAgICAgIGRlc3RpbmF0aW9uLm1lcmdlKFNwZWNPYmplY3RPdGhlcik7CisgICAgICAgIGRlc3Rp bmF0aW9uLm1lcmdlKFNwZWNPYmplY3QpOwogICAgICAgICBicmVhazsKICAgICB9CiAKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCShy ZXZpc2lvbiAxNTUxMjQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2Rl UGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTkwMiw3ICsxOTAyLDggQEAgYm9vbCBCeXRl Q29kZVBhcnNlcjo6cGFyc2VCbG9jayh1bnNpZ25lZAogICAgICAgICAgICAgICAgIGlmIChwcm9m aWxlLT5tX3NpbmdsZXRvblZhbHVlSXNUb3AKICAgICAgICAgICAgICAgICAgICAgfHwgIXByb2Zp bGUtPm1fc2luZ2xldG9uVmFsdWUKICAgICAgICAgICAgICAgICAgICAgfHwgIXByb2ZpbGUtPm1f c2luZ2xldG9uVmFsdWUuaXNDZWxsKCkKLSAgICAgICAgICAgICAgICAgICAgfHwgcHJvZmlsZS0+ bV9zaW5nbGV0b25WYWx1ZS5hc0NlbGwoKS0+Y2xhc3NJbmZvKCkgIT0gU3RydWN0dXJlOjppbmZv KCkpCisgICAgICAgICAgICAgICAgICAgIHx8IHByb2ZpbGUtPm1fc2luZ2xldG9uVmFsdWUuYXND ZWxsKCktPmNsYXNzSW5mbygpICE9IFN0cnVjdHVyZTo6aW5mbygpCisgICAgICAgICAgICAgICAg ICAgIHx8IHN0YXRpY19jYXN0PFN0cnVjdHVyZSo+KHByb2ZpbGUtPm1fc2luZ2xldG9uVmFsdWUu YXNDZWxsKCkpLT5jbGFzc0luZm8oKS0+bWV0aG9kVGFibGUudG9UaGlzICE9IEpTT2JqZWN0Ojpp bmZvKCktPm1ldGhvZFRhYmxlLnRvVGhpcykKICAgICAgICAgICAgICAgICAgICAgc2V0VGhpcyhh ZGRUb0dyYXBoKFRvVGhpcywgb3AxKSk7CiAgICAgICAgICAgICAgICAgZWxzZSB7CiAgICAgICAg ICAgICAgICAgICAgIGFkZFRvR3JhcGgoCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR0ZpeHVwUGhhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHRml4dXBQaGFzZS5jcHAJKHJldmlzaW9uIDE1NTEyNCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcwNiw3ICs3 MDYsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgfQogICAgICAgICAgICAgCiAgICAgICAgICAg ICBpZiAoaXNGaW5hbE9iamVjdFNwZWN1bGF0aW9uKG5vZGUtPmNoaWxkMSgpLT5wcmVkaWN0aW9u KCkpKSB7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPE9i amVjdFVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRV bmJveElmUHJvZml0YWJsZTxGaW5hbE9iamVjdFVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAg ICAgICAgICAgIG5vZGUtPmNvbnZlcnRUb0lkZW50aXR5KCk7CiAgICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgICAgICB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1Nh ZmVUb0V4ZWN1dGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1NhZmVUb0V4ZWN1dGUuaAkocmV2aXNpb24gMTU1MTI0KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdTYWZlVG9FeGVjdXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTUzLDYgKzUzLDcg QEAgcHVibGljOgogICAgICAgICBjYXNlIEJvb2xlYW5Vc2U6CiAgICAgICAgIGNhc2UgQ2VsbFVz ZToKICAgICAgICAgY2FzZSBPYmplY3RVc2U6CisgICAgICAgIGNhc2UgRmluYWxPYmplY3RVc2U6 CiAgICAgICAgIGNhc2UgT2JqZWN0T3JPdGhlclVzZToKICAgICAgICAgY2FzZSBTdHJpbmdJZGVu dFVzZToKICAgICAgICAgY2FzZSBTdHJpbmdVc2U6CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAJKHJldmlzaW9uIDE1 NTEyNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82 NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2NDksMTggKzM2NDksMjYgQEAgdm9pZCBTcGVjdWxh dGl2ZUpJVDo6Y29tcGlsZShOb2RlKiBub2RlKQogICAgICAgICAKICAgICBjYXNlIFRvVGhpczog ewogICAgICAgICBBU1NFUlQobm9kZS0+Y2hpbGQxKCkudXNlS2luZCgpID09IFVudHlwZWRVc2Up OwotCiAgICAgICAgIEpTVmFsdWVPcGVyYW5kIHRoaXNWYWx1ZSh0aGlzLCBub2RlLT5jaGlsZDEo KSk7Ci0gICAgICAgIEdQUlJlZyB0aGlzVmFsdWVUYWdHUFIgPSB0aGlzVmFsdWUudGFnR1BSKCk7 CisgICAgICAgIEdQUlRlbXBvcmFyeSB0ZW1wKHRoaXMpOwogICAgICAgICBHUFJSZWcgdGhpc1Zh bHVlUGF5bG9hZEdQUiA9IHRoaXNWYWx1ZS5wYXlsb2FkR1BSKCk7CisgICAgICAgIEdQUlJlZyB0 aGlzVmFsdWVUYWdHUFIgPSB0aGlzVmFsdWUudGFnR1BSKCk7CisgICAgICAgIEdQUlJlZyB0ZW1w R1BSID0gdGVtcC5ncHIoKTsKICAgICAgICAgCi0gICAgICAgIGZsdXNoUmVnaXN0ZXJzKCk7Ci0g ICAgICAgIAotICAgICAgICBHUFJSZXN1bHQyIHJlc3VsdFRhZyh0aGlzKTsKLSAgICAgICAgR1BS UmVzdWx0IHJlc3VsdFBheWxvYWQodGhpcyk7Ci0gICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0 aW9uVG9UaGlzLCByZXN1bHRUYWcuZ3ByKCksIHJlc3VsdFBheWxvYWQuZ3ByKCksIHRoaXNWYWx1 ZVRhZ0dQUiwgdGhpc1ZhbHVlUGF5bG9hZEdQUik7Ci0gICAgICAgIAotICAgICAgICBjZWxsUmVz dWx0KHJlc3VsdFBheWxvYWQuZ3ByKCksIG5vZGUpOworICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6 SnVtcExpc3Qgc2xvd0Nhc2VzOworICAgICAgICBzbG93Q2FzZXMuYXBwZW5kKG1faml0LmJyYW5j aDMyKAorICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6Ok5vdEVxdWFsLCB0aGlzVmFsdWVUYWdH UFIsIFRydXN0ZWRJbW0zMihKU1ZhbHVlOjpDZWxsVGFnKSkpOworICAgICAgICBtX2ppdC5sb2Fk UHRyKAorICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3ModGhpc1ZhbHVlUGF5bG9h ZEdQUiwgSlNDZWxsOjpzdHJ1Y3R1cmVPZmZzZXQoKSksIHRlbXBHUFIpOworICAgICAgICBzbG93 Q2FzZXMuYXBwZW5kKG1faml0LmJyYW5jaDgoCisgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6 Tm90RXF1YWwsCisgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyh0ZW1wR1BSLCBT dHJ1Y3R1cmU6OnR5cGVJbmZvVHlwZU9mZnNldCgpKSwKKyAgICAgICAgICAgIFRydXN0ZWRJbW0z MihGaW5hbE9iamVjdFR5cGUpKSk7CisgICAgICAgIG1faml0Lm1vdmUodGhpc1ZhbHVlUGF5bG9h ZEdQUiwgdGVtcEdQUik7CisgICAgICAgIGFkZFNsb3dQYXRoR2VuZXJhdG9yKAorICAgICAgICAg ICAgc2xvd1BhdGhDYWxsKHNsb3dDYXNlcywgdGhpcywgb3BlcmF0aW9uVG9UaGlzLCB0ZW1wR1BS LCB0aGlzVmFsdWVUYWdHUFIsIHRoaXNWYWx1ZVBheWxvYWRHUFIpKTsKKworICAgICAgICBjZWxs UmVzdWx0KHRlbXBHUFIsIG5vZGUpOwogICAgICAgICBicmVhazsKICAgICB9CiAKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAko cmV2aXNpb24gMTU1MTI0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxh dGl2ZUpJVDY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzU3MCwxNCArMzU3MCwyNCBAQCB2b2lk IFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUqIG5vZGUpCiAgICAgY2FzZSBUb1RoaXM6IHsK ICAgICAgICAgQVNTRVJUKG5vZGUtPmNoaWxkMSgpLnVzZUtpbmQoKSA9PSBVbnR5cGVkVXNlKTsK ICAgICAgICAgSlNWYWx1ZU9wZXJhbmQgdGhpc1ZhbHVlKHRoaXMsIG5vZGUtPmNoaWxkMSgpKTsK KyAgICAgICAgR1BSVGVtcG9yYXJ5IHRlbXAodGhpcyk7CiAgICAgICAgIEdQUlJlZyB0aGlzVmFs dWVHUFIgPSB0aGlzVmFsdWUuZ3ByKCk7CisgICAgICAgIEdQUlJlZyB0ZW1wR1BSID0gdGVtcC5n cHIoKTsKICAgICAgICAgCi0gICAgICAgIGZsdXNoUmVnaXN0ZXJzKCk7Ci0gICAgICAgIAotICAg ICAgICBHUFJSZXN1bHQgcmVzdWx0KHRoaXMpOwotICAgICAgICBjYWxsT3BlcmF0aW9uKG9wZXJh dGlvblRvVGhpcywgcmVzdWx0LmdwcigpLCB0aGlzVmFsdWVHUFIpOworICAgICAgICBNYWNyb0Fz c2VtYmxlcjo6SnVtcExpc3Qgc2xvd0Nhc2VzOworICAgICAgICBzbG93Q2FzZXMuYXBwZW5kKG1f aml0LmJyYW5jaFRlc3Q2NCgKKyAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpOb25aZXJvLCB0 aGlzVmFsdWVHUFIsIEdQUkluZm86OnRhZ01hc2tSZWdpc3RlcikpOworICAgICAgICBtX2ppdC5s b2FkUHRyKAorICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3ModGhpc1ZhbHVlR1BS LCBKU0NlbGw6OnN0cnVjdHVyZU9mZnNldCgpKSwgdGVtcEdQUik7CisgICAgICAgIHNsb3dDYXNl cy5hcHBlbmQobV9qaXQuYnJhbmNoOCgKKyAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpOb3RF cXVhbCwKKyAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHRlbXBHUFIsIFN0cnVj dHVyZTo6dHlwZUluZm9UeXBlT2Zmc2V0KCkpLAorICAgICAgICAgICAgVHJ1c3RlZEltbTMyKEZp bmFsT2JqZWN0VHlwZSkpKTsKKyAgICAgICAgbV9qaXQubW92ZSh0aGlzVmFsdWVHUFIsIHRlbXBH UFIpOworICAgICAgICBhZGRTbG93UGF0aEdlbmVyYXRvcigKKyAgICAgICAgICAgIHNsb3dQYXRo Q2FsbChzbG93Q2FzZXMsIHRoaXMsIG9wZXJhdGlvblRvVGhpcywgdGVtcEdQUiwgdGhpc1ZhbHVl R1BSKSk7CiAKLSAgICAgICAgY2VsbFJlc3VsdChyZXN1bHQuZ3ByKCksIG5vZGUpOworICAgICAg ICBjZWxsUmVzdWx0KHRlbXBHUFIsIG5vZGUpOwogICAgICAgICBicmVhazsKICAgICB9CiAKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3Bw CShyZXZpc2lvbiAxNTUxMjQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1 bGF0aXZlSklULmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYxMiw2ICs0NjEyLDIzIEBAIHZvaWQg U3BlY3VsYXRpdmVKSVQ6OnNwZWN1bGF0ZU9iamVjdChFZGcKICAgICAgICAgICAgIE1hY3JvQXNz ZW1ibGVyOjpUcnVzdGVkSW1tUHRyKG1faml0LnZtKCktPnN0cmluZ1N0cnVjdHVyZS5nZXQoKSkp KTsKIH0KIAordm9pZCBTcGVjdWxhdGl2ZUpJVDo6c3BlY3VsYXRlRmluYWxPYmplY3QoRWRnZSBl ZGdlKQoreworICAgIGlmICghbmVlZHNUeXBlQ2hlY2soZWRnZSwgU3BlY0ZpbmFsT2JqZWN0KSkK KyAgICAgICAgcmV0dXJuOworICAgIAorICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIG9wZXJhbmQo dGhpcywgZWRnZSk7CisgICAgR1BSVGVtcG9yYXJ5IHN0cnVjdHVyZSh0aGlzKTsKKyAgICBHUFJS ZWcgZ3ByID0gb3BlcmFuZC5ncHIoKTsKKyAgICBHUFJSZWcgc3RydWN0dXJlR1BSID0gc3RydWN0 dXJlLmdwcigpOworICAgIG1faml0LmxvYWRQdHIoTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoZ3By LCBKU0NlbGw6OnN0cnVjdHVyZU9mZnNldCgpKSwgc3RydWN0dXJlR1BSKTsKKyAgICBERkdfVFlQ RV9DSEVDSygKKyAgICAgICAgSlNWYWx1ZVNvdXJjZTo6dW5ib3hlZENlbGwoZ3ByKSwgZWRnZSwg U3BlY0ZpbmFsT2JqZWN0LCBtX2ppdC5icmFuY2g4KAorICAgICAgICAgICAgTWFjcm9Bc3NlbWJs ZXI6Ok5vdEVxdWFsLAorICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Moc3RydWN0 dXJlR1BSLCBTdHJ1Y3R1cmU6OnR5cGVJbmZvVHlwZU9mZnNldCgpKSwKKyAgICAgICAgICAgIFRy dXN0ZWRJbW0zMihGaW5hbE9iamVjdFR5cGUpKSk7Cit9CisKIHZvaWQgU3BlY3VsYXRpdmVKSVQ6 OnNwZWN1bGF0ZU9iamVjdE9yT3RoZXIoRWRnZSBlZGdlKQogewogICAgIGlmICghbmVlZHNUeXBl Q2hlY2soZWRnZSwgU3BlY09iamVjdCB8IFNwZWNPdGhlcikpCkBAIC00ODQ4LDYgKzQ4NjUsOSBA QCB2b2lkIFNwZWN1bGF0aXZlSklUOjpzcGVjdWxhdGUoTm9kZSosIEVkCiAgICAgY2FzZSBPYmpl Y3RVc2U6CiAgICAgICAgIHNwZWN1bGF0ZU9iamVjdChlZGdlKTsKICAgICAgICAgYnJlYWs7Cisg ICAgY2FzZSBGaW5hbE9iamVjdFVzZToKKyAgICAgICAgc3BlY3VsYXRlRmluYWxPYmplY3QoZWRn ZSk7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgT2JqZWN0T3JPdGhlclVzZToKICAgICAgICAg c3BlY3VsYXRlT2JqZWN0T3JPdGhlcihlZGdlKTsKICAgICAgICAgYnJlYWs7CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCShyZXZpc2lvbiAx NTUxMjQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmgJ KHdvcmtpbmcgY29weSkKQEAgLTIxMTgsNiArMjExOCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNw ZWN1bGF0ZUJvb2xlYW4oRWRnZSk7CiAgICAgdm9pZCBzcGVjdWxhdGVDZWxsKEVkZ2UpOwogICAg IHZvaWQgc3BlY3VsYXRlT2JqZWN0KEVkZ2UpOworICAgIHZvaWQgc3BlY3VsYXRlRmluYWxPYmpl Y3QoRWRnZSk7CiAgICAgdm9pZCBzcGVjdWxhdGVPYmplY3RPck90aGVyKEVkZ2UpOwogICAgIHZv aWQgc3BlY3VsYXRlU3RyaW5nKEVkZ2UgZWRnZSwgR1BSUmVnIGNlbGwpOwogICAgIHZvaWQgc3Bl Y3VsYXRlU3RyaW5nSWRlbnRBbmRMb2FkU3RvcmFnZShFZGdlIGVkZ2UsIEdQUlJlZyBzdHJpbmcs IEdQUlJlZyBzdG9yYWdlKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHVXNl S2luZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdVc2VL aW5kLmNwcAkocmV2aXNpb24gMTU1MTI0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdVc2VLaW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjUsNiArNjUsOSBAQCB2b2lkIHByaW50 SW50ZXJuYWwoUHJpbnRTdHJlYW0mIG91dCwgVXNlCiAgICAgY2FzZSBPYmplY3RVc2U6CiAgICAg ICAgIG91dC5wcmludCgiT2JqZWN0Iik7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgRmluYWxP YmplY3RVc2U6CisgICAgICAgIG91dC5wcmludCgiRmluYWxPYmplY3QiKTsKKyAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBPYmplY3RPck90aGVyVXNlOgogICAgICAgICBvdXQucHJpbnQoIk9iamVj dE9yT3RoZXIiKTsKICAgICAgICAgYnJlYWs7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR1VzZUtpbmQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR1VzZUtpbmQuaAkocmV2aXNpb24gMTU1MTI0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdVc2VLaW5kLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDYgKzQ2LDcgQEAgZW51bSBV c2VLaW5kIHsKICAgICBDZWxsVXNlLAogICAgIEtub3duQ2VsbFVzZSwKICAgICBPYmplY3RVc2Us CisgICAgRmluYWxPYmplY3RVc2UsCiAgICAgT2JqZWN0T3JPdGhlclVzZSwKICAgICBTdHJpbmdJ ZGVudFVzZSwKICAgICBTdHJpbmdVc2UsCkBAIC03Nyw2ICs3OCw4IEBAIEFMV0FZU19JTkxJTkUg U3BlY3VsYXRlZFR5cGUgdHlwZUZpbHRlckYKICAgICAgICAgcmV0dXJuIFNwZWNDZWxsOwogICAg IGNhc2UgT2JqZWN0VXNlOgogICAgICAgICByZXR1cm4gU3BlY09iamVjdDsKKyAgICBjYXNlIEZp bmFsT2JqZWN0VXNlOgorICAgICAgICByZXR1cm4gU3BlY0ZpbmFsT2JqZWN0OwogICAgIGNhc2Ug T2JqZWN0T3JPdGhlclVzZToKICAgICAgICAgcmV0dXJuIFNwZWNPYmplY3QgfCBTcGVjT3RoZXI7 CiAgICAgY2FzZSBTdHJpbmdJZGVudFVzZToKQEAgLTE1MCw2ICsxNTMsNyBAQCBBTFdBWVNfSU5M SU5FIGJvb2wgaXNDZWxsKFVzZUtpbmQga2luZCkKICAgICBjYXNlIENlbGxVc2U6CiAgICAgY2Fz ZSBLbm93bkNlbGxVc2U6CiAgICAgY2FzZSBPYmplY3RVc2U6CisgICAgY2FzZSBGaW5hbE9iamVj dFVzZToKICAgICBjYXNlIFN0cmluZ0lkZW50VXNlOgogICAgIGNhc2UgU3RyaW5nVXNlOgogICAg IGNhc2UgS25vd25TdHJpbmdVc2U6Cg==