78763 2012-02-15 17:21:28 -0800 Ensure that the DFG JIT always plants a CodeOrigin when making calls 2012-02-15 17:29:36 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver oldest_to_newest 557760 0 oliver 2012-02-15 17:21:28 -0800 Ensure that the DFG JIT always plants a CodeOrigin when making calls 557762 1 127280 oliver 2012-02-15 17:22:59 -0800 Created attachment 127280 Patch 557767 2 oliver 2012-02-15 17:29:36 -0800 Committed r107860: <http://trac.webkit.org/changeset/107860> 127280 2012-02-15 17:22:59 -0800 2012-02-15 17:26:58 -0800 Patch bug-78763-20120215172258.patch text/plain 14876 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3ODU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx ZDc4MDMwODFiNmQ4ZGE2NmYzMTljNjQwZjMxNDZhYjkyNDYwZDE1Li5iZGZlYjkyNDhiOGYyMDg2 NWMxODc0NjJjZWE1OWI3YWNhOTA4MTlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOSBAQAorMjAxMi0wMi0xNSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgor CisgICAgICAgIEVuc3VyZSB0aGF0IHRoZSBERkcgSklUIGFsd2F5cyBwbGFudHMgYSBDb2RlT3Jp Z2luIHdoZW4gbWFraW5nIGNhbGxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03ODc2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1ha2UgYWxsIGNhbGxzIHBsYW50IGEgQ29kZU9yaWdpbiBwcmlvciB0byB0 aGUgYWN0dWFsCisgICAgICAgIGNhbGwuICBBbHNvIGNsb2JiZXJzIHRoZSBJbnRlcnByZXRlciB3 aXRoIGxvZ2ljIHRvIGVuc3VyZQorICAgICAgICB0aGF0IHRoZSBpbnRlcnByZXRlciBhbHdheXMg cGxhbnRzIGEgYnl0ZWNvZGUgb2Zmc2V0LgorCisgICAgICAgICogZGZnL0RGR0pJVENvbXBpbGVy LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpKSVRDb21waWxlcjo6bGluayk6CisgICAgICAgIChK U0M6OkRGRzo6SklUQ29tcGlsZXI6OmNvbXBpbGVGdW5jdGlvbik6CisgICAgICAgICogZGZnL0RG R0pJVENvbXBpbGVyLmg6CisgICAgICAgIChDYWxsQmVnaW5Ub2tlbik6CisgICAgICAgIChKU0M6 OkRGRzo6SklUQ29tcGlsZXI6OmJlZ2luSlNDYWxsKToKKyAgICAgICAgKEpTQzo6REZHOjpKSVRD b21waWxlcjo6YmVnaW5DYWxsKToKKyAgICAgICAgKiBkZmcvREZHUmVwYXRjaC5jcHA6CisgICAg ICAgIChKU0M6OkRGRzo6dHJ5QnVpbGRHZXRCeUlETGlzdCk6CisgICAgICAgICogZGZnL0RGR1Nw ZWN1bGF0aXZlSklULmg6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmFwcGVu ZENhbGxXaXRoRXhjZXB0aW9uQ2hlY2spOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJ VDMyXzY0LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6ZW1pdENhbGwp OgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcDoKKyAgICAgICAgKEpTQzo6 REZHOjpTcGVjdWxhdGl2ZUpJVDo6ZW1pdENhbGwpOgorICAgICAgICAqIGludGVycHJldGVyL0Fi c3RyYWN0UEMuY3BwOgorICAgICAgICAoSlNDOjpBYnN0cmFjdFBDOjpBYnN0cmFjdFBDKToKKyAg ICAgICAgKiBpbnRlcnByZXRlci9DYWxsRnJhbWUuY3BwOgorICAgICAgICAoSlNDOjpDYWxsRnJh bWU6OnRydWVDYWxsRnJhbWUpOgorICAgICAgICAqIGludGVycHJldGVyL0NhbGxGcmFtZS5oOgor ICAgICAgICAoSlNDOjpFeGVjU3RhdGU6OmJ5dGVjb2RlT2Zmc2V0Rm9yTm9uREZHQ29kZSk6Cisg ICAgICAgIChFeGVjU3RhdGUpOgorICAgICAgICAoSlNDOjpFeGVjU3RhdGU6OnNldEJ5dGVjb2Rl T2Zmc2V0Rm9yTm9uREZHQ29kZSk6CisgICAgICAgIChKU0M6OkV4ZWNTdGF0ZTo6Y29kZU9yaWdp bkluZGV4Rm9yREZHKToKKwogMjAxMi0wMi0xNCAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIEZpeCBJbnRlcnByZXRlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHSklUQ29tcGlsZXIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdKSVRDb21waWxlci5jcHAKaW5kZXggNDJmYzM0Y2FmZmI5NWFlZTRiOWVhYzM1YjZk YmVhNGMyMGRhNzE2MS4uN2IyYmJjNzg4ZWUwMWNjOWEyN2RhZjJiNTUwNjczMjRjNTU3N2RiNyAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb21waWxlci5jcHAK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb21waWxlci5jcHAKQEAgLTEz NCwyNyArMTM0LDE2IEBAIHZvaWQgSklUQ29tcGlsZXI6OmxpbmsoTGlua0J1ZmZlciYgbGlua0J1 ZmZlcikKICAgICAgICAgICAgIG1fY29kZUJsb2NrLT5jYWxsUmV0dXJuSW5kZXhWZWN0b3IoKS5h cHBlbmQoQ2FsbFJldHVybk9mZnNldFRvQnl0ZWNvZGVPZmZzZXQocmV0dXJuQWRkcmVzc09mZnNl dCwgZXhjZXB0aW9uSW5mbykpOwogICAgICAgICB9CiAgICAgfQorCisgICAgVmVjdG9yPENvZGVP cmlnaW5BdENhbGxSZXR1cm5PZmZzZXQ+JiBjb2RlT3JpZ2lucyA9IG1fY29kZUJsb2NrLT5jb2Rl T3JpZ2lucygpOworICAgIGNvZGVPcmlnaW5zLnJlc2l6ZShtX2V4Y2VwdGlvbkNoZWNrcy5zaXpl KCkpOwogICAgIAotICAgIHVuc2lnbmVkIG51bUNhbGxzRnJvbUlubGluZUNvZGUgPSAwOwogICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX2V4Y2VwdGlvbkNoZWNrcy5zaXplKCk7ICsraSkg ewotICAgICAgICBpZiAobV9leGNlcHRpb25DaGVja3NbaV0ubV9jb2RlT3JpZ2luLmlubGluZUNh bGxGcmFtZSkKLSAgICAgICAgICAgIG51bUNhbGxzRnJvbUlubGluZUNvZGUrKzsKLSAgICB9Ci0K LSAgICBpZiAobnVtQ2FsbHNGcm9tSW5saW5lQ29kZSkgewotICAgICAgICBWZWN0b3I8Q29kZU9y aWdpbkF0Q2FsbFJldHVybk9mZnNldD4mIGNvZGVPcmlnaW5zID0gbV9jb2RlQmxvY2stPmNvZGVP cmlnaW5zKCk7Ci0gICAgICAgIGNvZGVPcmlnaW5zLnJlc2l6ZShudW1DYWxsc0Zyb21JbmxpbmVD b2RlKTsKLSAgICAgICAgCi0gICAgICAgIGZvciAodW5zaWduZWQgaSA9IDAsIGogPSAwOyBpIDwg bV9leGNlcHRpb25DaGVja3Muc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgICAgIENhbGxFeGNlcHRp b25SZWNvcmQmIHJlY29yZCA9IG1fZXhjZXB0aW9uQ2hlY2tzW2ldOwotICAgICAgICAgICAgaWYg KHJlY29yZC5tX2NvZGVPcmlnaW4uaW5saW5lQ2FsbEZyYW1lKSB7Ci0gICAgICAgICAgICAgICAg dW5zaWduZWQgcmV0dXJuQWRkcmVzc09mZnNldCA9IGxpbmtCdWZmZXIucmV0dXJuQWRkcmVzc09m ZnNldChtX2V4Y2VwdGlvbkNoZWNrc1tpXS5tX2NhbGwpOwotICAgICAgICAgICAgICAgIGNvZGVP cmlnaW5zW2pdLmNvZGVPcmlnaW4gPSByZWNvcmQubV9jb2RlT3JpZ2luOwotICAgICAgICAgICAg ICAgIGNvZGVPcmlnaW5zW2pdLmNhbGxSZXR1cm5PZmZzZXQgPSByZXR1cm5BZGRyZXNzT2Zmc2V0 OwotICAgICAgICAgICAgICAgIHJlY29yZC5tX3Rva2VuLmFzc2VydENvZGVPcmlnaW5JbmRleChq KTsKLSAgICAgICAgICAgICAgICBqKys7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KKyAgICAg ICAgQ2FsbEV4Y2VwdGlvblJlY29yZCYgcmVjb3JkID0gbV9leGNlcHRpb25DaGVja3NbaV07Cisg ICAgICAgIHVuc2lnbmVkIHJldHVybkFkZHJlc3NPZmZzZXQgPSBsaW5rQnVmZmVyLnJldHVybkFk ZHJlc3NPZmZzZXQobV9leGNlcHRpb25DaGVja3NbaV0ubV9jYWxsKTsKKyAgICAgICAgY29kZU9y aWdpbnNbaV0uY29kZU9yaWdpbiA9IHJlY29yZC5tX2NvZGVPcmlnaW47CisgICAgICAgIGNvZGVP cmlnaW5zW2ldLmNhbGxSZXR1cm5PZmZzZXQgPSByZXR1cm5BZGRyZXNzT2Zmc2V0OworICAgICAg ICByZWNvcmQubV90b2tlbi5hc3NlcnRDb2RlT3JpZ2luSW5kZXgoaSk7CiAgICAgfQogICAgIAog ICAgIG1fY29kZUJsb2NrLT5zZXROdW1iZXJPZlN0cnVjdHVyZVN0dWJJbmZvcyhtX3Byb3BlcnR5 QWNjZXNzZXMuc2l6ZSgpKTsKQEAgLTI1NCw3ICsyNDMsMTAgQEAgdm9pZCBKSVRDb21waWxlcjo6 Y29tcGlsZUZ1bmN0aW9uKEpJVENvZGUmIGVudHJ5LCBNYWNyb0Fzc2VtYmxlckNvZGVQdHImIGVu dHJ5V2kKICAgICByZWdpc3RlckZpbGVDaGVjay5saW5rKHRoaXMpOwogICAgIG1vdmUoc3RhY2tQ b2ludGVyUmVnaXN0ZXIsIEdQUkluZm86OmFyZ3VtZW50R1BSMCk7CiAgICAgcG9rZShHUFJJbmZv OjpjYWxsRnJhbWVSZWdpc3RlciwgT0JKRUNUX09GRlNFVE9GKHN0cnVjdCBKSVRTdGFja0ZyYW1l LCBjYWxsRnJhbWUpIC8gc2l6ZW9mKHZvaWQqKSk7CisKKyAgICBDYWxsQmVnaW5Ub2tlbiB0b2tl biA9IGJlZ2luQ2FsbCgpOwogICAgIENhbGwgY2FsbFJlZ2lzdGVyRmlsZUNoZWNrID0gY2FsbCgp OworICAgIG5vdGlmeUNhbGwoY2FsbFJlZ2lzdGVyRmlsZUNoZWNrLCBDb2RlT3JpZ2luKDApLCB0 b2tlbik7CiAgICAganVtcChmcm9tUmVnaXN0ZXJGaWxlQ2hlY2spOwogICAgIAogICAgIC8vIFRo ZSBmYXN0IGVudHJ5IHBvaW50IGludG8gYSBmdW5jdGlvbiBkb2VzIG5vdCBjaGVjayB0aGUgY29y cmVjdCBudW1iZXIgb2YgYXJndW1lbnRzCkBAIC0yNjksNyArMjYxLDkgQEAgdm9pZCBKSVRDb21w aWxlcjo6Y29tcGlsZUZ1bmN0aW9uKEpJVENvZGUmIGVudHJ5LCBNYWNyb0Fzc2VtYmxlckNvZGVQ dHImIGVudHJ5V2kKICAgICBicmFuY2gzMihBYm92ZU9yRXF1YWwsIEdQUkluZm86OnJlZ1QxLCBJ bW0zMihtX2NvZGVCbG9jay0+bnVtUGFyYW1ldGVycygpKSkubGlua1RvKGZyb21Bcml0eUNoZWNr LCB0aGlzKTsKICAgICBtb3ZlKHN0YWNrUG9pbnRlclJlZ2lzdGVyLCBHUFJJbmZvOjphcmd1bWVu dEdQUjApOwogICAgIHBva2UoR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIE9CSkVDVF9PRkZT RVRPRihzdHJ1Y3QgSklUU3RhY2tGcmFtZSwgY2FsbEZyYW1lKSAvIHNpemVvZih2b2lkKikpOwor ICAgIHRva2VuID0gYmVnaW5DYWxsKCk7CiAgICAgQ2FsbCBjYWxsQXJpdHlDaGVjayA9IGNhbGwo KTsKKyAgICBub3RpZnlDYWxsKGNhbGxBcml0eUNoZWNrLCBDb2RlT3JpZ2luKDApLCB0b2tlbik7 CiAgICAgbW92ZShHUFJJbmZvOjpyZWdUMCwgR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIpOwog ICAgIGp1bXAoZnJvbUFyaXR5Q2hlY2spOwogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdKSVRDb21waWxlci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdKSVRDb21waWxlci5oCmluZGV4IDU1OTY4NzZmYzA2M2JkYjhhMGE1MmUwNzYyYjUzNzVj MDVjZTY4MTQuLjYyYWVhZjNjMDc1NzJiMzBiYWM1N2VhMTIxYTViM2Y2ZTUzODY0ZjkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSklUQ29tcGlsZXIuaAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJVENvbXBpbGVyLmgKQEAgLTkyLDExICs5Miw3 IEBAIHB1YmxpYzoKICAgICAgICAgQVNTRVJUX1VOVVNFRChjb2RlT3JpZ2luSW5kZXgsIGNvZGVP cmlnaW5JbmRleCA8IFVJTlRfTUFYKTsKICAgICAgICAgQVNTRVJUX1VOVVNFRChjb2RlT3JpZ2lu SW5kZXgsIGNvZGVPcmlnaW5JbmRleCA9PSBtX2NvZGVPcmlnaW5JbmRleCk7CiAgICAgfQotICAg IAotICAgIHZvaWQgYXNzZXJ0Tm9Db2RlT3JpZ2luSW5kZXgoKSBjb25zdAotICAgIHsKLSAgICAg ICAgQVNTRVJUKG1fY29kZU9yaWdpbkluZGV4ID09IFVJTlRfTUFYKTsKLSAgICB9CisKIHByaXZh dGU6CiAjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIHVuc2lnbmVkIG1fY29kZU9yaWdpbkluZGV4 OwpAQCAtMjA1LDIyICsyMDEsMTYgQEAgcHVibGljOgogICAgIEdyYXBoJiBncmFwaCgpIHsgcmV0 dXJuIG1fZ3JhcGg7IH0KICAgICAKICAgICAvLyBKdXN0IGdldCBhIHRva2VuIGZvciBiZWdpbm5p bmcgYSBjYWxsLgotICAgIENhbGxCZWdpblRva2VuIG5leHRDYWxsQmVnaW5Ub2tlbihDb2RlT3Jp Z2luIGNvZGVPcmlnaW4pCisgICAgQ2FsbEJlZ2luVG9rZW4gYmVnaW5KU0NhbGwoKQogICAgIHsK LSAgICAgICAgaWYgKCFjb2RlT3JpZ2luLmlubGluZUNhbGxGcmFtZSkKLSAgICAgICAgICAgIHJl dHVybiBDYWxsQmVnaW5Ub2tlbigpOwogICAgICAgICByZXR1cm4gQ2FsbEJlZ2luVG9rZW4obV9j dXJyZW50Q29kZU9yaWdpbkluZGV4KyspOwogICAgIH0KICAgICAKICAgICAvLyBHZXQgYSB0b2tl biBmb3IgYmVnaW5uaW5nIGEgY2FsbCwgYW5kIHNldCB0aGUgY3VycmVudCBjb2RlIG9yaWdpbiBp bmRleCBpbgogICAgIC8vIHRoZSBjYWxsIGZyYW1lLgotICAgIENhbGxCZWdpblRva2VuIGJlZ2lu Q2FsbChDb2RlT3JpZ2luIGNvZGVPcmlnaW4pCisgICAgQ2FsbEJlZ2luVG9rZW4gYmVnaW5DYWxs KCkKICAgICB7Ci0gICAgICAgIHVuc2lnbmVkIGNvZGVPcmlnaW5JbmRleDsKLSAgICAgICAgaWYg KCFjb2RlT3JpZ2luLmlubGluZUNhbGxGcmFtZSkKLSAgICAgICAgICAgIGNvZGVPcmlnaW5JbmRl eCA9IFVJTlRfTUFYOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBjb2RlT3JpZ2luSW5kZXgg PSBtX2N1cnJlbnRDb2RlT3JpZ2luSW5kZXgrKzsKKyAgICAgICAgdW5zaWduZWQgY29kZU9yaWdp bkluZGV4ID0gbV9jdXJyZW50Q29kZU9yaWdpbkluZGV4Kys7CiAgICAgICAgIHN0b3JlMzIoVHJ1 c3RlZEltbTMyKGNvZGVPcmlnaW5JbmRleCksIHRhZ0ZvcihzdGF0aWNfY2FzdDxWaXJ0dWFsUmVn aXN0ZXI+KFJlZ2lzdGVyRmlsZTo6QXJndW1lbnRDb3VudCkpKTsKICAgICAgICAgcmV0dXJuIENh bGxCZWdpblRva2VuKGNvZGVPcmlnaW5JbmRleCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdSZXBhdGNoLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHUmVwYXRjaC5jcHAKaW5kZXggZWUzYzIyZmIzOWE3NTkwOGUzM2MwMDZmZGYxNmVi NmVmZjk1Y2E3OS4uZWRmM2M5NTA1YTY2MTA2ZWJhNjE2NDExMjY2MWRiZTc3Y2VlMzJkZSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdSZXBhdGNoLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1JlcGF0Y2guY3BwCkBAIC0zNjIsNyArMzYyLDcg QEAgc3RhdGljIGJvb2wgdHJ5QnVpbGRHZXRCeUlETGlzdChFeGVjU3RhdGUqIGV4ZWMsIEpTVmFs dWUgYmFzZVZhbHVlLCBjb25zdCBJZGVudGkKICAgICAgICAgICAgIC8vIHBsYWNlIHRoYXQgd2Ug bWFkZSBpdCBmcm9tLiBJdCBqdXN0IHNvIGhhcHBlbnMgdG8gYmUgdGhlIHBsYWNlIHRoYXQgd2Ug YXJlIGF0CiAgICAgICAgICAgICAvLyByaWdodCBub3chCiAgICAgICAgICAgICBzdHViSml0LnN0 b3JlMzIoCi0gICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW0zMihleGVj LT5jb2RlT3JpZ2luSW5kZXhGb3JERkdXaXRoSW5saW5pbmcoKSksCisgICAgICAgICAgICAgICAg TWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW0zMihleGVjLT5jb2RlT3JpZ2luSW5kZXhGb3JERkco KSksCiAgICAgICAgICAgICAgICAgQ0NhbGxIZWxwZXJzOjp0YWdGb3Ioc3RhdGljX2Nhc3Q8Vmly dHVhbFJlZ2lzdGVyPihSZWdpc3RlckZpbGU6OkFyZ3VtZW50Q291bnQpKSk7CiAgICAgICAgICAg ICAKICAgICAgICAgICAgIG9wZXJhdGlvbkNhbGwgPSBzdHViSml0LmNhbGwoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAppbmRleCBjNGRhNDdlN2Fm ZmZiMWJjZTYxNDRhMWViNzdjMjgxOGMyNzQ1N2M4Li40ZDBjNjRlNWJiZjUwMGQ0YTFhNzYxYjU0 MGJlOTE4OWE2ZGE5NWY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1NwZWN1bGF0aXZlSklULmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVj dWxhdGl2ZUpJVC5oCkBAIC0xNDA4LDcgKzE0MDgsNyBAQCBwcml2YXRlOgogICAgIEpJVENvbXBp bGVyOjpDYWxsIGFwcGVuZENhbGxXaXRoRXhjZXB0aW9uQ2hlY2soY29uc3QgRnVuY3Rpb25QdHIm IGZ1bmN0aW9uKQogICAgIHsKICAgICAgICAgQ29kZU9yaWdpbiBjb2RlT3JpZ2luID0gYXQobV9j b21waWxlSW5kZXgpLmNvZGVPcmlnaW47Ci0gICAgICAgIENhbGxCZWdpblRva2VuIHRva2VuID0g bV9qaXQuYmVnaW5DYWxsKGNvZGVPcmlnaW4pOworICAgICAgICBDYWxsQmVnaW5Ub2tlbiB0b2tl biA9IG1faml0LmJlZ2luQ2FsbCgpOwogICAgICAgICBKSVRDb21waWxlcjo6Q2FsbCBjYWxsID0g bV9qaXQuYXBwZW5kQ2FsbChmdW5jdGlvbik7CiAgICAgICAgIG1faml0LmFkZEV4Y2VwdGlvbkNo ZWNrKGNhbGwsIGNvZGVPcmlnaW4sIHRva2VuKTsKICAgICAgICAgcmV0dXJuIGNhbGw7CmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNw cAppbmRleCBkOWQzZmFkMTcwYWRiYmI3ZGM4YmQzOWVmMzE3NDFhN2M3OTUyYmZiLi44YzRkOGMw MzA3NWQyM2M3NTg5ZmEzZjEwMWNkNTBjZmJkODFiNGFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAKQEAgLTk1MCw3ICs5 NTAsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjplbWl0Q2FsbChOb2RlJiBub2RlKQogICAgIG1f aml0LmFkZFB0cihJbW0zMihtX2ppdC5jb2RlQmxvY2soKS0+bV9udW1DYWxsZWVSZWdpc3RlcnMg KiBzaXplb2YoUmVnaXN0ZXIpKSwgR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIpOwogCiAgICAg Q29kZU9yaWdpbiBjb2RlT3JpZ2luID0gYXQobV9jb21waWxlSW5kZXgpLmNvZGVPcmlnaW47Ci0g ICAgQ2FsbEJlZ2luVG9rZW4gdG9rZW4gPSBtX2ppdC5uZXh0Q2FsbEJlZ2luVG9rZW4oY29kZU9y aWdpbik7CisgICAgQ2FsbEJlZ2luVG9rZW4gdG9rZW4gPSBtX2ppdC5iZWdpbkpTQ2FsbCgpOwog ICAgIEpJVENvbXBpbGVyOjpDYWxsIGZhc3RDYWxsID0gbV9qaXQubmVhckNhbGwoKTsKICAgICBt X2ppdC5ub3RpZnlDYWxsKGZhc3RDYWxsLCBjb2RlT3JpZ2luLCB0b2tlbik7CiAKQEAgLTk2MCwx MSArOTYwLDExIEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmVtaXRDYWxsKE5vZGUmIG5vZGUpCiAK ICAgICBtX2ppdC5hZGRQdHIoSW1tMzIobV9qaXQuY29kZUJsb2NrKCktPm1fbnVtQ2FsbGVlUmVn aXN0ZXJzICogc2l6ZW9mKFJlZ2lzdGVyKSksIEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBH UFJJbmZvOjphcmd1bWVudEdQUjApOwogICAgIG1faml0LnBva2UoR1BSSW5mbzo6YXJndW1lbnRH UFIwKTsKLSAgICB0b2tlbiA9IG1faml0LmJlZ2luQ2FsbChjb2RlT3JpZ2luKTsKKyAgICB0b2tl biA9IG1faml0LmJlZ2luQ2FsbCgpOwogICAgIEpJVENvbXBpbGVyOjpDYWxsIHNsb3dDYWxsID0g bV9qaXQuYXBwZW5kQ2FsbChzbG93Q2FsbEZ1bmN0aW9uKTsKICAgICBtX2ppdC5hZGRGYXN0RXhj ZXB0aW9uQ2hlY2soc2xvd0NhbGwsIGNvZGVPcmlnaW4sIHRva2VuKTsKICAgICBtX2ppdC5hZGRQ dHIoSW1tMzIobV9qaXQuY29kZUJsb2NrKCktPm1fbnVtQ2FsbGVlUmVnaXN0ZXJzICogc2l6ZW9m KFJlZ2lzdGVyKSksIEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyKTsKLSAgICB0b2tlbiA9IG1f aml0Lm5leHRDYWxsQmVnaW5Ub2tlbihjb2RlT3JpZ2luKTsKKyAgICB0b2tlbiA9IG1faml0LmJl Z2luSlNDYWxsKCk7CiAgICAgSklUQ29tcGlsZXI6OkNhbGwgdGhlQ2FsbCA9IG1faml0LmNhbGwo R1BSSW5mbzo6cmV0dXJuVmFsdWVHUFIpOwogICAgIG1faml0Lm5vdGlmeUNhbGwodGhlQ2FsbCwg Y29kZU9yaWdpbiwgdG9rZW4pOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAppbmRleCA5MDc1MmQ0MWY4M2VhYjY2Njc2MGU1ZDI2NzI0 YTVjOGU1YWEzZGIxLi42ZDM3NWY4MWYyNGI4NTI1NTAyMzk3ZWMyY2FkN2Q3ZmZmZTNhZDhmIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQu Y3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5j cHAKQEAgLTk1MSw3ICs5NTEsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjplbWl0Q2FsbChOb2Rl JiBub2RlKQogICAgIG1faml0LmFkZFB0cihJbW0zMihtX2ppdC5jb2RlQmxvY2soKS0+bV9udW1D YWxsZWVSZWdpc3RlcnMgKiBzaXplb2YoUmVnaXN0ZXIpKSwgR1BSSW5mbzo6Y2FsbEZyYW1lUmVn aXN0ZXIpOwogICAgIAogICAgIENvZGVPcmlnaW4gY29kZU9yaWdpbiA9IGF0KG1fY29tcGlsZUlu ZGV4KS5jb2RlT3JpZ2luOwotICAgIENhbGxCZWdpblRva2VuIHRva2VuID0gbV9qaXQubmV4dENh bGxCZWdpblRva2VuKGNvZGVPcmlnaW4pOworICAgIENhbGxCZWdpblRva2VuIHRva2VuID0gbV9q aXQuYmVnaW5KU0NhbGwoKTsKICAgICBKSVRDb21waWxlcjo6Q2FsbCBmYXN0Q2FsbCA9IG1faml0 Lm5lYXJDYWxsKCk7CiAgICAgbV9qaXQubm90aWZ5Q2FsbChmYXN0Q2FsbCwgY29kZU9yaWdpbiwg dG9rZW4pOwogICAgIApAQCAtOTYwLDExICs5NjAsMTEgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6 ZW1pdENhbGwoTm9kZSYgbm9kZSkKICAgICBzbG93UGF0aC5saW5rKCZtX2ppdCk7CiAgICAgCiAg ICAgbV9qaXQuYWRkUHRyKEltbTMyKG1faml0LmNvZGVCbG9jaygpLT5tX251bUNhbGxlZVJlZ2lz dGVycyAqIHNpemVvZihSZWdpc3RlcikpLCBHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgR1BS SW5mbzo6YXJndW1lbnRHUFIwKTsKLSAgICB0b2tlbiA9IG1faml0LmJlZ2luQ2FsbChjb2RlT3Jp Z2luKTsKKyAgICB0b2tlbiA9IG1faml0LmJlZ2luQ2FsbCgpOwogICAgIEpJVENvbXBpbGVyOjpD YWxsIHNsb3dDYWxsID0gbV9qaXQuYXBwZW5kQ2FsbChzbG93Q2FsbEZ1bmN0aW9uKTsKICAgICBt X2ppdC5hZGRGYXN0RXhjZXB0aW9uQ2hlY2soc2xvd0NhbGwsIGNvZGVPcmlnaW4sIHRva2VuKTsK ICAgICBtX2ppdC5hZGRQdHIoSW1tMzIobV9qaXQuY29kZUJsb2NrKCktPm1fbnVtQ2FsbGVlUmVn aXN0ZXJzICogc2l6ZW9mKFJlZ2lzdGVyKSksIEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyKTsK LSAgICB0b2tlbiA9IG1faml0Lm5leHRDYWxsQmVnaW5Ub2tlbihjb2RlT3JpZ2luKTsKKyAgICB0 b2tlbiA9IG1faml0LmJlZ2luSlNDYWxsKCk7CiAgICAgSklUQ29tcGlsZXI6OkNhbGwgdGhlQ2Fs bCA9IG1faml0LmNhbGwoR1BSSW5mbzo6cmV0dXJuVmFsdWVHUFIpOwogICAgIG1faml0Lm5vdGlm eUNhbGwodGhlQ2FsbCwgY29kZU9yaWdpbiwgdG9rZW4pOwogICAgIApkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0Fic3RyYWN0UEMuY3BwIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0Fic3RyYWN0UEMuY3BwCmluZGV4IDg2MzkxNWJkYWI4 NjQzYTk2MDhmYThjN2RhMGUxMzdjYWExZTM4ZDEuLjg5ZTg2YWI4NGIxNTI0MjY0MWIxYTZlMmMx NTNlYWViZWUzMTY4M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnBy ZXRlci9BYnN0cmFjdFBDLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0 ZXIvQWJzdHJhY3RQQy5jcHAKQEAgLTQ2LDYgKzQ2LDcgQEAgQWJzdHJhY3RQQzo6QWJzdHJhY3RQ QyhKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEsIEV4ZWNTdGF0ZSogZXhlYykKICNlbmRpZgogICAg IAogI2lmIEVOQUJMRShJTlRFUlBSRVRFUikKKyAgICBVTlVTRURfUEFSQU0oZ2xvYmFsRGF0YSk7 CiAgICAgbV9wb2ludGVyID0gZXhlYy0+cmV0dXJuVlBDKCk7CiAgICAgbV9tb2RlID0gSW50ZXJw cmV0ZXI7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnBy ZXRlci9DYWxsRnJhbWUuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0Nh bGxGcmFtZS5jcHAKaW5kZXggMmFhNGZiYzE1ODc2MWI3YTQxMDExNGU1OGZlYzQ4NDg0MmEyOTg2 YS4uNzRkMmUwNGM0YjFkNTY4ZjRlMDcyNWMyOWFlNDkzYTZlZGM3OTMzYiAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0NhbGxGcmFtZS5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0NhbGxGcmFtZS5jcHAKQEAgLTk2LDE1ICs5 NiwxNSBAQCBDYWxsRnJhbWUqIENhbGxGcmFtZTo6dHJ1ZUNhbGxGcmFtZShBYnN0cmFjdFBDIHBj KQogICAgIGlmIChwYy5pc1NldCgpKSB7CiAgICAgICAgIFJldHVybkFkZHJlc3NQdHIgY3VycmVu dFJldHVyblBDID0gcGMuaml0UmV0dXJuQWRkcmVzcygpOwogICAgICAgICAKLSAgICAgICAgaWYg KCFtYWNoaW5lQ29kZUJsb2NrLT5jb2RlT3JpZ2luRm9yUmV0dXJuKGN1cnJlbnRSZXR1cm5QQywg Y29kZU9yaWdpbikpCi0gICAgICAgICAgICByZXR1cm4gdGhpczsgLy8gTm90IGN1cnJlbnRseSBp biBpbmxpbmVkIGNvZGUuCisgICAgICAgIGJvb2wgaGFzQ29kZU9yaWdpbiA9IG1hY2hpbmVDb2Rl QmxvY2stPmNvZGVPcmlnaW5Gb3JSZXR1cm4oY3VycmVudFJldHVyblBDLCBjb2RlT3JpZ2luKTsK KyAgICAgICAgQVNTRVJUX1VOVVNFRChoYXNDb2RlT3JpZ2luLCBoYXNDb2RlT3JpZ2luKTsKICAg ICB9IGVsc2UgewotICAgICAgICB1bnNpZ25lZCBpbmRleCA9IGNvZGVPcmlnaW5JbmRleEZvckRG R1dpdGhJbmxpbmluZygpOwotICAgICAgICBpZiAoaW5kZXggPT0gVUlOVF9NQVgpCi0gICAgICAg ICAgICByZXR1cm4gdGhpczsgLy8gTm90IGN1cnJlbnRseSBpbiBpbmxpbmVkIGNvZGUuCi0gICAg ICAgIAorICAgICAgICB1bnNpZ25lZCBpbmRleCA9IGNvZGVPcmlnaW5JbmRleEZvckRGRygpOwog ICAgICAgICBjb2RlT3JpZ2luID0gbWFjaGluZUNvZGVCbG9jay0+Y29kZU9yaWdpbihpbmRleCk7 CiAgICAgfQorCisgICAgaWYgKCFjb2RlT3JpZ2luLmlubGluZUNhbGxGcmFtZSkKKyAgICAgICAg cmV0dXJuIHRoaXM7IC8vIE5vdCBjdXJyZW50bHkgaW4gaW5saW5lZCBjb2RlLgogICAgIAogICAg IGZvciAoSW5saW5lQ2FsbEZyYW1lKiBpbmxpbmVDYWxsRnJhbWUgPSBjb2RlT3JpZ2luLmlubGlu ZUNhbGxGcmFtZTsgaW5saW5lQ2FsbEZyYW1lOykgewogICAgICAgICBJbmxpbmVDYWxsRnJhbWUq IG5leHRJbmxpbmVDYWxsRnJhbWUgPSBpbmxpbmVDYWxsRnJhbWUtPmNhbGxlci5pbmxpbmVDYWxs RnJhbWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvQ2Fs bEZyYW1lLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmgK aW5kZXggNGZhZGZhYjI4ZTA2ODM2YmZhZGEwMWQ3YmI1OGRhMmUxMmI0MWVmYi4uNjE0ZjVkNjAx M2NmOWM4YTk0ZmI3NWFiZGMwNGE1MWRiZmNkZjkyOCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2ludGVycHJldGVyL0NhbGxGcmFtZS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnRlcnByZXRlci9DYWxsRnJhbWUuaApAQCAtMTA2LDExICsxMDYsMjEgQEAgbmFtZXNw YWNlIEpTQyAgewogICAgICAgICBSZXR1cm5BZGRyZXNzUHRyIHJldHVyblBDKCkgY29uc3QgeyBy ZXR1cm4gUmV0dXJuQWRkcmVzc1B0cih0aGlzW1JlZ2lzdGVyRmlsZTo6UmV0dXJuUENdLnZQQygp KTsgfQogI2VuZGlmCiAgICAgICAgIEFic3RyYWN0UEMgYWJzdHJhY3RSZXR1cm5QQyhKU0dsb2Jh bERhdGEmIGdsb2JhbERhdGEpIHsgcmV0dXJuIEFic3RyYWN0UEMoZ2xvYmFsRGF0YSwgdGhpcyk7 IH0KLSAgICAgICAgdW5zaWduZWQgYnl0ZWNvZGVPZmZzZXRGb3JCYXNlbGluZUpJVCgpIHsgcmV0 dXJuIHRoaXNbUmVnaXN0ZXJGaWxlOjpBcmd1bWVudENvdW50XS50YWcoKTsgfQorICAgICAgICB1 bnNpZ25lZCBieXRlY29kZU9mZnNldEZvck5vbkRGR0NvZGUoKQorICAgICAgICB7CisgICAgICAg ICAgICBBU1NFUlQoY29kZUJsb2NrKCkpOworICAgICAgICAgICAgcmV0dXJuIHRoaXNbUmVnaXN0 ZXJGaWxlOjpBcmd1bWVudENvdW50XS50YWcoKTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAg ICAgdm9pZCBzZXRCeXRlY29kZU9mZnNldEZvck5vbkRGR0NvZGUodW5zaWduZWQgb2Zmc2V0KQor ICAgICAgICB7CisgICAgICAgICAgICBBU1NFUlQoY29kZUJsb2NrKCkpOworICAgICAgICAgICAg dGhpc1tSZWdpc3RlckZpbGU6OkFyZ3VtZW50Q291bnRdLnRhZygpID0gc3RhdGljX2Nhc3Q8aW50 MzJfdD4ob2Zmc2V0KTsKKyAgICAgICAgfQogCiAjaWYgRU5BQkxFKERGR19KSVQpCiAgICAgICAg IElubGluZUNhbGxGcmFtZSogaW5saW5lQ2FsbEZyYW1lKCkgY29uc3QgeyByZXR1cm4gdGhpc1tS ZWdpc3RlckZpbGU6OlJldHVyblBDXS5hc0lubGluZUNhbGxGcmFtZSgpOyB9Ci0gICAgICAgIHVu c2lnbmVkIGNvZGVPcmlnaW5JbmRleEZvckRGR1dpdGhJbmxpbmluZygpIGNvbnN0IHsgcmV0dXJu IHRoaXNbUmVnaXN0ZXJGaWxlOjpBcmd1bWVudENvdW50XS50YWcoKTsgfQorICAgICAgICB1bnNp Z25lZCBjb2RlT3JpZ2luSW5kZXhGb3JERkcoKSBjb25zdCB7IHJldHVybiB0aGlzW1JlZ2lzdGVy RmlsZTo6QXJndW1lbnRDb3VudF0udGFnKCk7IH0KICNlbHNlCiAgICAgICAgIC8vIFRoaXMgd2ls bCBuZXZlciBiZSBjYWxsZWQgaWYgIUVOQUJMRShERkdfSklUKSBzaW5jZSBhbGwgY2FsbHMgc2hv dWxkIGJlIGd1YXJkZWQgYnkKICAgICAgICAgLy8gaXNJbmxpbmVDYWxsRnJhbWUoKS4gQnV0IHRv IG1ha2UgaXQgZWFzaWVyIHRvIHdyaXRlIGNvZGUgd2l0aG91dCBoYXZpbmcgYSBidW5jaCBvZgo=