151371 2015-11-17 16:41:25 -0800 B3::generate should separate out the final Air codegen, so that it can be done outside the Graph safepoint 2015-11-17 17:27:52 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 151370 1 fpizlo fpizlo barraclough benjamin commit-queue ggaren keith_miller mark.lam mhahnenb msaboff nrotem oliver saam sam oldest_to_newest 1142714 0 fpizlo 2015-11-17 16:41:25 -0800 Patch forthcoming. 1142724 1 265719 fpizlo 2015-11-17 17:20:44 -0800 Created attachment 265719 the patch 1142727 2 265719 benjamin 2015-11-17 17:24:58 -0800 Comment on attachment 265719 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=265719&action=review > Source/JavaScriptCore/ChangeLog:17 > + happens to be the part where we call stackmap generation callbacks. In other words, preperation Typo: preperation 1142728 3 fpizlo 2015-11-17 17:27:52 -0800 Landed in http://trac.webkit.org/changeset/192558 265719 2015-11-17 17:20:44 -0800 2015-11-17 17:24:58 -0800 the patch blah.patch text/plain 12101 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkyNTU3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUwIEBA CisyMDE1LTExLTE3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg QjM6OmdlbmVyYXRlIHNob3VsZCBzZXBhcmF0ZSBvdXQgdGhlIGZpbmFsIEFpciBjb2RlZ2VuLCBz byB0aGF0IGl0IGNhbiBiZSBkb25lIG91dHNpZGUgdGhlIEdyYXBoIHNhZmVwb2ludAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMzcxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT25lIG9mIHRoZSBGVEwg b3B0aW1pemF0aW9ucyBpcyB0aGF0IHdoaWxlIHRoZSBleHBlbnNpdmUgYmFja2VuZCBpcyBydW5u aW5nLCB3ZSBhcmUgYXQgYSAiZ3JhcGgKKyAgICAgICAgc2FmZXBvaW50IiB0aGF0IGFsbG93cyB0 aGUgVk0gdG8gZG8gR0NzIGFuZCBvdGhlciBkYW5nZXJvdXMgYW5kIHRpbWUtc2Vuc2l0aXZlIHRo aW5ncyB3aXRob3V0CisgICAgICAgIHdhaXRpbmcgZm9yIHRoZSBjb21waWxhdGlvbiB0aHJlYWQu IFdoaWxlIGluIHRoZSBzYWZlcG9pbnQsIHdlIGNhbm5vdCBkbyBhbnl0aGluZyB0aGF0IHRvdWNo ZXMKKyAgICAgICAgYW55dGhpbmcgb3RoZXIgdGhhbiB0aGUgYmFja2VuZCdzIHN0YXRlLiBUaGF0 IG1lYW5zLCBmb3IgZXhhbXBsZSwgdGhhdCB3ZSB3b3VsZG4ndCBiZSBhYmxlIHRvIHJ1bgorICAg ICAgICBhbnkgb2YgdGhlIHN0YWNrbWFwIGdlbmVyYXRpb24gY2FsbGJhY2tzLCBzaW5jZSB0aG9z ZSBuZWVkIHRvIG1lc3Mgd2l0aCBERkcgc3RhdGUuCisKKyAgICAgICAgVGhhdCBtZWFucyB0aGF0 IHdlIG5lZWQgdG8gc2VwYXJhdGUgdGhlIEIzIHBpcGVsaW5lIGludG8gInByZXBlcmF0aW9uIiBh bmQgImdlbmVyYXRpb24iLgorICAgICAgICBQcmVwYXJhdGlvbiBpcyBhbGwgb2YgdGhlIGV4cGVu c2l2ZSBzdHVmZjogYWxsIEIzIHBoYXNlcywgbG93ZXJpbmcgdG8gQWlyLCBhbGwgQWlyIHBoYXNl cy4KKyAgICAgICAgR2VuZXJhdGlvbiBpcyBqdXN0IHRoZSBwYXJ0IHdoZXJlIHdlIHR1cm4gZnVs bHkgbG93ZXJlZCBBaXIgaW50byBtYWNoaW5lIGNvZGUuIEdlbmVyYXRpb24gYWxzbworICAgICAg ICBoYXBwZW5zIHRvIGJlIHRoZSBwYXJ0IHdoZXJlIHdlIGNhbGwgc3RhY2ttYXAgZ2VuZXJhdGlv biBjYWxsYmFja3MuIEluIG90aGVyIHdvcmRzLCBwcmVwZXJhdGlvbgorICAgICAgICBpcyBleGFj dGx5IHRoZSBzdHVmZiB0aGF0IHNob3VsZCBnbyBpbnRvIHRoZSBncmFwaCBzYWZlcG9pbnQsIHdo aWxlIGdlbmVyYXRpb24gaXMgdGhlIHN0dWZmIHRoYXQKKyAgICAgICAgd2Ugd2FudCB0byBkbyBh ZnRlciB3ZSBlbWVyZ2UgZnJvbSB0aGUgc2FmZXBvaW50LgorCisgICAgICAgIEJlY2F1c2UgdGhl IHRlc3RzIHdlcmUgdXNpbmcgdGhlIGhpZ2hlci1sZXZlbCBDb21waWxhdGlvbiBBUEksIEkgZGlk bid0IGhhdmUgdG8gY2hhbmdlIGFueSB0ZXN0CisgICAgICAgIGNvZGUuIFRoZSBGVEwgd2lsbCBu b3QgdXNlIHRoYXQgaGlnaC1sZXZlbCBBUEkuCisKKyAgICAgICAgKiBiMy9CM0NvbXBpbGF0aW9u LmNwcDoKKyAgICAgICAgKEpTQzo6QjM6OkNvbXBpbGF0aW9uOjpDb21waWxhdGlvbik6CisgICAg ICAgICogYjMvQjNHZW5lcmF0ZS5jcHA6CisgICAgICAgIChKU0M6OkIzOjpwcmVwYXJlRm9yR2Vu ZXJhdGlvbik6CisgICAgICAgIChKU0M6OkIzOjpnZW5lcmF0ZSk6CisgICAgICAgIChKU0M6OkIz OjpnZW5lcmF0ZVRvQWlyKToKKyAgICAgICAgKiBiMy9CM0dlbmVyYXRlLmg6CisgICAgICAgICog YjMvQjNMb3dlclRvQWlyLmNwcDoKKyAgICAgICAgKEpTQzo6QjM6OkFpcjo6TG93ZXJUb0Fpcjo6 TG93ZXJUb0Fpcik6CisgICAgICAgIChKU0M6OkIzOjpsb3dlclRvQWlyKToKKyAgICAgICAgKiBi My9CM0xvd2VyVG9BaXIuaDoKKyAgICAgICAgKiBiMy9CM1Byb2NlZHVyZS5jcHA6CisgICAgICAg IChKU0M6OkIzOjpQcm9jZWR1cmU6OlByb2NlZHVyZSk6CisgICAgICAgICogYjMvQjNQcm9jZWR1 cmUuaDoKKyAgICAgICAgKEpTQzo6QjM6OlByb2NlZHVyZTo6dGFrZUJ5cHJvZHVjdHMpOgorICAg ICAgICAoSlNDOjpCMzo6UHJvY2VkdXJlOjpjb2RlKToKKyAgICAgICAgKiBiMy9haXIvQWlyQ29k ZS5oOgorICAgICAgICAoSlNDOjpCMzo6QWlyOjpDb2RlOjpwcm9jKToKKyAgICAgICAgKEpTQzo6 QjM6OkFpcjo6Q29kZTo6bGFzdFBoYXNlTmFtZSk6CisgICAgICAgICogYjMvYWlyL0FpckdlbmVy YXRlLmNwcDoKKyAgICAgICAgKEpTQzo6QjM6OkFpcjo6cHJlcGFyZUZvckdlbmVyYXRpb24pOgor ICAgICAgICAoSlNDOjpCMzo6QWlyOjpnZW5lcmF0ZSk6CisgICAgICAgICogYjMvYWlyL0Fpckdl bmVyYXRlLmg6CisKIDIwMTUtMTEtMTcgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4K IAogICAgICAgICBGVEw6OlN0YXRlIHNob3VsZCBiZSBhYmxlIHRvIHJlZmVyIHRvIEIzOjpQcm9j ZWR1cmUKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM0NvbXBpbGF0aW9uLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNDb21waWxhdGlvbi5jcHAJ KHJldmlzaW9uIDE5MjU1NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM0NvbXBpbGF0 aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkIzR2Vu ZXJhdGUuaCIKICNpbmNsdWRlICJCM09wYXF1ZUJ5cHJvZHVjdHMuaCIKICNpbmNsdWRlICJCM1By b2NlZHVyZS5oIgorI2luY2x1ZGUgIkIzVGltaW5nU2NvcGUuaCIKICNpbmNsdWRlICJDQ2FsbEhl bHBlcnMuaCIKICNpbmNsdWRlICJKU0NJbmxpbmVzLmgiCiAjaW5jbHVkZSAiTGlua0J1ZmZlci5o IgpAQCAtMzksOCArNDAsMTEgQEAgbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBCMyB7CiAKIENv bXBpbGF0aW9uOjpDb21waWxhdGlvbihWTSYgdm0sIFByb2NlZHVyZSYgcHJvYywgdW5zaWduZWQg b3B0TGV2ZWwpCiB7CisgICAgVGltaW5nU2NvcGUgdGltaW5nU2NvcGUoIkNvbXBpbGF0aW9uIik7 CisgICAgCiAgICAgQ0NhbGxIZWxwZXJzIGppdCgmdm0pOwotICAgIGdlbmVyYXRlKHByb2MsIGpp dCwgb3B0TGV2ZWwpOworICAgIHByZXBhcmVGb3JHZW5lcmF0aW9uKHByb2MsIG9wdExldmVsKTsK KyAgICBnZW5lcmF0ZShwcm9jLCBqaXQpOwogICAgIExpbmtCdWZmZXIgbGlua0J1ZmZlcih2bSwg aml0LCBudWxscHRyKTsKIAogICAgIG1fY29kZVJlZiA9IEZJTkFMSVpFX0NPREUobGlua0J1ZmZl ciwgKCJCMzo6Q29tcGlsYXRpb24iKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMv QjNHZW5lcmF0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL0Iz R2VuZXJhdGUuY3BwCShyZXZpc2lvbiAxOTI1NTcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv YjMvQjNHZW5lcmF0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyLDE2ICs0MiwyMCBAQAogCiBu YW1lc3BhY2UgSlNDIHsgbmFtZXNwYWNlIEIzIHsKIAotdm9pZCBnZW5lcmF0ZShQcm9jZWR1cmUm IHByb2NlZHVyZSwgQ0NhbGxIZWxwZXJzJiBqaXQsIHVuc2lnbmVkIG9wdExldmVsKQordm9pZCBw cmVwYXJlRm9yR2VuZXJhdGlvbihQcm9jZWR1cmUmIHByb2NlZHVyZSwgdW5zaWduZWQgb3B0TGV2 ZWwpCiB7Ci0gICAgVGltaW5nU2NvcGUgdGltaW5nU2NvcGUoImdlbmVyYXRlIik7CisgICAgVGlt aW5nU2NvcGUgdGltaW5nU2NvcGUoInByZXBhcmVGb3JHZW5lcmF0aW9uIik7CiAKLSAgICBBaXI6 OkNvZGUgY29kZShwcm9jZWR1cmUpOwotICAgIGdlbmVyYXRlVG9BaXIocHJvY2VkdXJlLCBjb2Rl LCBvcHRMZXZlbCk7Ci0gICAgQWlyOjpnZW5lcmF0ZShjb2RlLCBqaXQpOworICAgIGdlbmVyYXRl VG9BaXIocHJvY2VkdXJlLCBvcHRMZXZlbCk7CisgICAgQWlyOjpwcmVwYXJlRm9yR2VuZXJhdGlv bihwcm9jZWR1cmUuY29kZSgpKTsKIH0KIAotdm9pZCBnZW5lcmF0ZVRvQWlyKFByb2NlZHVyZSYg cHJvY2VkdXJlLCBBaXI6OkNvZGUmIGNvZGUsIHVuc2lnbmVkIG9wdExldmVsKQordm9pZCBnZW5l cmF0ZShQcm9jZWR1cmUmIHByb2NlZHVyZSwgQ0NhbGxIZWxwZXJzJiBqaXQpCit7CisgICAgQWly OjpnZW5lcmF0ZShwcm9jZWR1cmUuY29kZSgpLCBqaXQpOworfQorCit2b2lkIGdlbmVyYXRlVG9B aXIoUHJvY2VkdXJlJiBwcm9jZWR1cmUsIHVuc2lnbmVkIG9wdExldmVsKQogewogICAgIFRpbWlu Z1Njb3BlIHRpbWluZ1Njb3BlKCJnZW5lcmF0ZVRvQWlyIik7CiAgICAgCkBAIC04Nyw3ICs5MSw3 IEBAIHZvaWQgZ2VuZXJhdGVUb0FpcihQcm9jZWR1cmUmIHByb2NlZHVyZSwKICAgICAgICAgZGF0 YUxvZyhwcm9jZWR1cmUpOwogICAgIH0KIAotICAgIGxvd2VyVG9BaXIocHJvY2VkdXJlLCBjb2Rl KTsKKyAgICBsb3dlclRvQWlyKHByb2NlZHVyZSk7CiB9CiAKIH0gfSAvLyBuYW1lc3BhY2UgSlND OjpCMwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL0IzR2VuZXJhdGUuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNHZW5lcmF0ZS5oCShyZXZpc2lvbiAx OTI1NTcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNHZW5lcmF0ZS5oCSh3b3JraW5n IGNvcHkpCkBAIC0zNywxNCArMzcsMTkgQEAgbmFtZXNwYWNlIEIzIHsKIGNsYXNzIFByb2NlZHVy ZTsKIG5hbWVzcGFjZSBBaXIgeyBjbGFzcyBDb2RlOyB9CiAKLS8vIFRoaXMgdGFrZXMgYSBCMzo6 UHJvY2VkdXJlLCBvcHRpbWl6ZXMgaXQgaW4tcGxhY2UsIGFuZCBnZW5lcmF0ZXMgaXQgdG8gbWFj aGluZSBjb2RlIGJ5IGZpcnN0Ci0vLyBpbnRlcm5hbGx5IGNvbnZlcnRpbmcgdG8gYW4gQWlyOjpD b2RlIGFuZCB0aGVuIGdlbmVyYXRpbmcgdGhhdC4KLUpTX0VYUE9SVF9QUklWQVRFIHZvaWQgZ2Vu ZXJhdGUoUHJvY2VkdXJlJiwgQ0NhbGxIZWxwZXJzJiwgdW5zaWduZWQgb3B0TGV2ZWwgPSAxKTsK Ky8vIFRoaXMgdGFrZXMgYSBCMzo6UHJvY2VkdXJlLCBvcHRpbWl6ZXMgaXQgaW4tcGxhY2UsIGxv d2VycyBpdCB0byBBaXIsIGFuZCBwcmVwYXJlcyB0aGUgQWlyIGZvcgorLy8gZ2VuZXJhdGlvbi4K K3ZvaWQgcHJlcGFyZUZvckdlbmVyYXRpb24oUHJvY2VkdXJlJiwgdW5zaWduZWQgb3B0TGV2ZWwg PSAxKTsKKworLy8gVGhpcyB0YWtlcyBhIEIzOjpQcm9jZWR1cmUgdGhhdCBoYXMgYmVlbiBwcmVw YXJlZCBmb3IgZ2VuZXJhdGlvbiAoaS5lLiBpdCBoYXMgYmVlbiBsb3dlcmVkIHRvIEFpciBhbmQK Ky8vIHRoZSBBaXIgaGFzIGJlZW4gcHJlcGFyZWQgZm9yIGdlbmVyYXRpb24pIGFuZCBnZW5lcmF0 ZXMgaXQuIFRoaXMgaXMgdGhlIGVxdWl2YWxlbnQgb2YgY2FsbGluZworLy8gQWlyOjpnZW5lcmF0 ZSgpIG9uIHRoZSBQcm9jZWR1cmU6OmNvZGUoKS4KK3ZvaWQgZ2VuZXJhdGUoUHJvY2VkdXJlJiwg Q0NhbGxIZWxwZXJzJik7CiAKIC8vIFRoaXMgdGFrZXMgYSBCMzo6UHJvY2VkdXJlLCBvcHRpbWl6 ZXMgaXQgaW4tcGxhY2UsIGFuZCBsb3dlcnMgaXQgdG8gQWlyLiBZb3UgY2FuIHRoZW4gZ2VuZXJh dGUKLS8vIHRoZSBBaXIgdG8gbWFjaGluZSBjb2RlIHVzaW5nIEFpcjo6Z2VuZXJhdGUoKS4gTm90 ZSB0aGF0IGFuIEFpcjo6Q29kZSB3aWxsIGhhdmUgcG9pbnRlcnMgaW50byB0aGUKLS8vIEIzOjpQ cm9jZWR1cmUsIHNvIHlvdSBuZWVkIHRvIGVuc3VyZSB0aGF0IHRoZSBCMzo6UHJvY2VkdXJlIG91 dGxpdmVzIHRoZSBBaXI6OkNvZGUuCi12b2lkIGdlbmVyYXRlVG9BaXIoUHJvY2VkdXJlJiwgQWly OjpDb2RlJiwgdW5zaWduZWQgb3B0TGV2ZWwgPSAxKTsKKy8vIHRoZSBBaXIgdG8gbWFjaGluZSBj b2RlIHVzaW5nIEFpcjo6cHJlcGFyZUZvckdlbmVyYXRpb24oKSBhbmQgQWlyOjpnZW5lcmF0ZSgp IG9uIHRoZSBQcm9jZWR1cmUncworLy8gY29kZSgpLgordm9pZCBnZW5lcmF0ZVRvQWlyKFByb2Nl ZHVyZSYsIHVuc2lnbmVkIG9wdExldmVsID0gMSk7CiAKIH0gfSAvLyBuYW1lc3BhY2UgSlNDOjpC MwogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNMb3dlclRvQWlyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNMb3dlclRvQWlyLmNwcAkocmV2 aXNpb24gMTkyNTU3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL0IzTG93ZXJUb0Fpci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTYxLDEyICs2MSwxMiBAQCBjb25zdCBib29sIHZlcmJvc2Ug PSBmYWxzZTsKIAogY2xhc3MgTG93ZXJUb0FpciB7CiBwdWJsaWM6Ci0gICAgTG93ZXJUb0FpcihQ cm9jZWR1cmUmIHByb2NlZHVyZSwgQ29kZSYgY29kZSkKKyAgICBMb3dlclRvQWlyKFByb2NlZHVy ZSYgcHJvY2VkdXJlKQogICAgICAgICA6IG1fdmFsdWVUb1RtcChwcm9jZWR1cmUudmFsdWVzKCku c2l6ZSgpKQogICAgICAgICAsIG1fYmxvY2tUb0Jsb2NrKHByb2NlZHVyZS5zaXplKCkpCiAgICAg ICAgICwgbV91c2VDb3VudHMocHJvY2VkdXJlKQogICAgICAgICAsIG1fcHJvY2VkdXJlKHByb2Nl ZHVyZSkKLSAgICAgICAgLCBtX2NvZGUoY29kZSkKKyAgICAgICAgLCBtX2NvZGUocHJvY2VkdXJl LmNvZGUoKSkKICAgICB7CiAgICAgfQogCkBAIC0xNzQ1LDEwICsxNzQ1LDEwIEBAIHByaXZhdGU6 CiAKIH0gLy8gYW5vbnltb3VzIG5hbWVzcGFjZQogCi12b2lkIGxvd2VyVG9BaXIoUHJvY2VkdXJl JiBwcm9jZWR1cmUsIENvZGUmIGNvZGUpCit2b2lkIGxvd2VyVG9BaXIoUHJvY2VkdXJlJiBwcm9j ZWR1cmUpCiB7CiAgICAgUGhhc2VTY29wZSBwaGFzZVNjb3BlKHByb2NlZHVyZSwgImxvd2VyVG9B aXIiKTsKLSAgICBMb3dlclRvQWlyIGxvd2VyVG9BaXIocHJvY2VkdXJlLCBjb2RlKTsKKyAgICBM b3dlclRvQWlyIGxvd2VyVG9BaXIocHJvY2VkdXJlKTsKICAgICBsb3dlclRvQWlyLnJ1bigpOwog fQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNMb3dlclRvQWlyLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL0IzTG93ZXJUb0Fpci5oCShyZXZpc2lv biAxOTI1NTcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNMb3dlclRvQWlyLmgJKHdv cmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDcgQEAgbmFtZXNwYWNlIEFpciB7IGNsYXNzIENvZGU7 IH0KIAogLy8gVGhpcyBsb3dlcnMgdGhlIGN1cnJlbnQgQjMgcHJvY2VkdXJlIHRvIGFuIEFpciBj b2RlLgogCi12b2lkIGxvd2VyVG9BaXIoUHJvY2VkdXJlJiwgQWlyOjpDb2RlJik7Cit2b2lkIGxv d2VyVG9BaXIoUHJvY2VkdXJlJik7CiAKIH0gfSAvLyBuYW1lc3BhY2UgSlNDOjpCMwogCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNQcm9jZWR1cmUuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM1Byb2NlZHVyZS5jcHAJKHJldmlzaW9uIDE5MjU1 NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM1Byb2NlZHVyZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2lmIEVOQUJMRShCM19KSVQpCiAKKyNpbmNsdWRl ICJBaXJDb2RlLmgiCiAjaW5jbHVkZSAiQjNCYXNpY0Jsb2NrSW5saW5lcy5oIgogI2luY2x1ZGUg IkIzQmFzaWNCbG9ja1V0aWxzLmgiCiAjaW5jbHVkZSAiQjNCbG9ja1dvcmtsaXN0LmgiCkBAIC00 MCw2ICs0MSw3IEBAIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgQjMgewogUHJvY2VkdXJlOjpQ cm9jZWR1cmUoKQogICAgIDogbV9sYXN0UGhhc2VOYW1lKCJpbml0aWFsIikKICAgICAsIG1fYnlw cm9kdWN0cyhzdGQ6Om1ha2VfdW5pcXVlPE9wYXF1ZUJ5cHJvZHVjdHM+KCkpCisgICAgLCBtX2Nv ZGUobmV3IEFpcjo6Q29kZSgqdGhpcykpCiB7CiB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9iMy9CM1Byb2NlZHVyZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9iMy9CM1Byb2NlZHVyZS5oCShyZXZpc2lvbiAxOTI1NTcpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvYjMvQjNQcm9jZWR1cmUuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsOCBAQCBj bGFzcyBCbG9ja0luc2VydGlvblNldDsKIGNsYXNzIE9wYXF1ZUJ5cHJvZHVjdHM7CiBjbGFzcyBW YWx1ZTsKIAorbmFtZXNwYWNlIEFpciB7IGNsYXNzIENvZGU7IH0KKwogY2xhc3MgUHJvY2VkdXJl IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShQcm9jZWR1cmUpOwogICAgIFdURl9NQUtFX0ZB U1RfQUxMT0NBVEVEOwpAQCAtMjE4LDYgKzIyMCw4IEBAIHB1YmxpYzoKICAgICAvLyB0aGF0IEFQ SSwgdGhlbiB5b3UgZG9uJ3QgaGF2ZSB0byB3b3JyeSBhYm91dCB0aGlzLgogICAgIHN0ZDo6dW5p cXVlX3B0cjxPcGFxdWVCeXByb2R1Y3RzPiB0YWtlQnlwcm9kdWN0cygpIHsgcmV0dXJuIFdURjo6 bW92ZShtX2J5cHJvZHVjdHMpOyB9CiAKKyAgICBBaXI6OkNvZGUmIGNvZGUoKSB7IHJldHVybiAq bV9jb2RlOyB9CisKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIEJsb2NrSW5zZXJ0aW9uU2V0 OwogICAgIApAQCAtMjI4LDYgKzIzMiw3IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPHNpemVfdD4g bV92YWx1ZUluZGV4RnJlZUxpc3Q7CiAgICAgY29uc3QgY2hhciogbV9sYXN0UGhhc2VOYW1lOwog ICAgIHN0ZDo6dW5pcXVlX3B0cjxPcGFxdWVCeXByb2R1Y3RzPiBtX2J5cHJvZHVjdHM7CisgICAg c3RkOjp1bmlxdWVfcHRyPEFpcjo6Q29kZT4gbV9jb2RlOwogfTsKIAogfSB9IC8vIG5hbWVzcGFj ZSBKU0M6OkIzCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0FpckNvZGUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0FpckNvZGUuaAkocmV2 aXNpb24gMTkyNTU3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fpci9BaXJDb2RlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTUwLDcgKzUwLDYgQEAgY2xhc3MgQ29kZSB7CiAgICAgV1RGX01B S0VfTk9OQ09QWUFCTEUoQ29kZSk7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJs aWM6Ci0gICAgQ29kZShQcm9jZWR1cmUmKTsKICAgICB+Q29kZSgpOwogCiAgICAgUHJvY2VkdXJl JiBwcm9jKCkgeyByZXR1cm4gbV9wcm9jOyB9CkBAIC0yOTksNiArMjk4LDEwIEBAIHB1YmxpYzoK ICAgICBjb25zdCBjaGFyKiBsYXN0UGhhc2VOYW1lKCkgY29uc3QgeyByZXR1cm4gbV9sYXN0UGhh c2VOYW1lOyB9CiAKIHByaXZhdGU6CisgICAgZnJpZW5kIGNsYXNzIDo6SlNDOjpCMzo6UHJvY2Vk dXJlOworICAgIAorICAgIENvZGUoUHJvY2VkdXJlJik7CisKICAgICBQcm9jZWR1cmUmIG1fcHJv YzsgLy8gU29tZSBtZXRhLWRhdGEsIGxpa2UgYnlwcm9kdWN0cywgaXMgc3RvcmVkIGluIHRoZSBQ cm9jZWR1cmUuCiAgICAgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxTdGFja1Nsb3Q+PiBtX3N0YWNr U2xvdHM7CiAgICAgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxCYXNpY0Jsb2NrPj4gbV9ibG9ja3M7 CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0FpckdlbmVyYXRlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0FpckdlbmVyYXRlLmNwcAko cmV2aXNpb24gMTkyNTU3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fpci9BaXJHZW5l cmF0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDkgKzQ2LDkgQEAKIAogbmFtZXNwYWNlIEpT QyB7IG5hbWVzcGFjZSBCMyB7IG5hbWVzcGFjZSBBaXIgewogCi12b2lkIGdlbmVyYXRlKENvZGUm IGNvZGUsIENDYWxsSGVscGVycyYgaml0KQordm9pZCBwcmVwYXJlRm9yR2VuZXJhdGlvbihDb2Rl JiBjb2RlKQogewotICAgIFRpbWluZ1Njb3BlIHRpbWluZ1Njb3BlKCJBaXI6OmdlbmVyYXRlIik7 CisgICAgVGltaW5nU2NvcGUgdGltaW5nU2NvcGUoIkFpcjo6cHJlcGFyZUZvckdlbmVyYXRpb24i KTsKICAgICAKICAgICAvLyBXZSBkb24ndCBleHBlY3QgdGhlIGluY29taW5nIGNvZGUgdG8gaGF2 ZSBwcmVkZWNlc3NvcnMgY29tcHV0ZWQuCiAgICAgY29kZS5yZXNldFJlYWNoYWJpbGl0eSgpOwpA QCAtMTA2LDggKzEwNiwxMSBAQCB2b2lkIGdlbmVyYXRlKENvZGUmIGNvZGUsIENDYWxsSGVscGVy cyYgCiAgICAgICAgIGRhdGFMb2coIkFpciBhZnRlciAiLCBjb2RlLmxhc3RQaGFzZU5hbWUoKSwg IiwgYmVmb3JlIGdlbmVyYXRpb246XG4iKTsKICAgICAgICAgZGF0YUxvZyhjb2RlKTsKICAgICB9 Cit9CiAKLSAgICBUaW1pbmdTY29wZSBjb2RlR2VuVGltaW5nU2NvcGUoIkFpcjo6Z2VuZXJhdGUg YmFja2VuZCIpOwordm9pZCBnZW5lcmF0ZShDb2RlJiBjb2RlLCBDQ2FsbEhlbHBlcnMmIGppdCkK K3sKKyAgICBUaW1pbmdTY29wZSB0aW1pbmdTY29wZSgiQWlyOjpnZW5lcmF0ZSIpOwogCiAgICAg Ly8gQW5kIG5vdywgd2UgZ2VuZXJhdGUgY29kZS4KICAgICBqaXQuZW1pdEZ1bmN0aW9uUHJvbG9n dWUoKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9haXIvQWlyR2VuZXJhdGUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0FpckdlbmVyYXRlLmgJ KHJldmlzaW9uIDE5MjU1NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9haXIvQWlyR2Vu ZXJhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMzcsOSArMzcsMTEgQEAgbmFtZXNwYWNlIEIzIHsg bmFtZXNwYWNlIEFpciB7CiBjbGFzcyBDb2RlOwogCiAvLyBUaGlzIHRha2VzIGFuIEFpcjo6Q29k ZSB0aGF0IGhhc24ndCBoYWQgYW55IHN0YWNrIGFsbG9jYXRpb24gYW5kIG9wdGlvbmFsbHkgaGFz bid0IGhhZCBhbnkKLS8vIHJlZ2lzdGVyIGFsbG9jYXRpb24gYW5kIGRvZXMgYm90aCBvZiB0aG9z ZSB0aGluZ3MsIGFuZCB0aGVuIGdlbmVyYXRlcyB0aGUgY29kZSB1c2luZyB0aGUgZ2l2ZW4KLS8v IENDYWxsSGVscGVycyBpbnN0YW5jZS4gTm90ZSB0aGF0IHRoaXMgbWF5IGNhbGwgY2FsbGJhY2tz IGluIHRoZSBzdXBwbGllZCBjb2RlIGFzIGl0IGlzCi0vLyBnZW5lcmF0aW5nLgorLy8gcmVnaXN0 ZXIgYWxsb2NhdGlvbiBhbmQgZG9lcyBib3RoIG9mIHRob3NlIHRoaW5ncy4KK3ZvaWQgcHJlcGFy ZUZvckdlbmVyYXRpb24oQ29kZSYpOworCisvLyBUaGlzIGdlbmVyYXRlcyB0aGUgY29kZSB1c2lu ZyB0aGUgZ2l2ZW4gQ0NhbGxIZWxwZXJzIGluc3RhbmNlLiBOb3RlIHRoYXQgdGhpcyBtYXkgY2Fs bCBjYWxsYmFja3MKKy8vIGluIHRoZSBzdXBwbGllZCBjb2RlIGFzIGl0IGlzIGdlbmVyYXRpbmcu CiB2b2lkIGdlbmVyYXRlKENvZGUmLCBDQ2FsbEhlbHBlcnMmKTsKIAogfSB9IH0gLy8gbmFtZXNw YWNlIEpTQzo6QjM6OkFpcgo=