71864 2011-11-08 16:15:31 -0800 Fix OSR entry points to calculate offsets correctly WRT to branch compaction. 2011-11-08 16:43:27 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough webkit-unassigned oldest_to_newest 498500 0 barraclough 2011-11-08 16:15:31 -0800 We need to delay taking the offset until we have the link buffer. 498510 1 114172 barraclough 2011-11-08 16:23:43 -0800 Created attachment 114172 Fix 498515 2 barraclough 2011-11-08 16:43:27 -0800 Fixed in r99633 114172 2011-11-08 16:23:43 -0800 2011-11-08 16:27:45 -0800 Fix 71864.patch text/plain 11473 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTk2MjYpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzcgQEAK KzIwMTEtMTEtMDggIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgor CisgICAgICAgIEZpeCBPU1IgZW50cnkgcG9pbnRzIHRvIGNhbGN1bGF0ZSBvZmZzZXRzIGNvcnJl Y3RseSBXUlQgdG8gYnJhbmNoIGNvbXBhY3Rpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTg2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogYXNzZW1ibGVyL0xpbmtCdWZmZXIuaDoKKyAgICAgICAg KEpTQzo6TGlua0J1ZmZlcjo6b2Zmc2V0T2YpOgorICAgICAgICAgICAgLSBXZSB1c2UgdGhpcyB0 byByZXR1cm4gdGhlIG9mZnNldHMgaW50byB0aGUgY29kZSBvZiB0aGUgZW50cnkgcG9pbnRzLgor ICAgICAgICAqIGRmZy9ERkdKSVRDb21waWxlci5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6SklU Q29tcGlsZXI6OmNvbXBpbGVFbnRyeSk6CisgICAgICAgIChKU0M6OkRGRzo6SklUQ29tcGlsZXI6 OmNvbXBpbGVCb2R5KToKKyAgICAgICAgKEpTQzo6REZHOjpKSVRDb21waWxlcjo6Y29tcGlsZSk6 CisgICAgICAgIChKU0M6OkRGRzo6SklUQ29tcGlsZXI6OmNvbXBpbGVGdW5jdGlvbik6CisgICAg ICAgICAgICAtIE1vdmUgdGhlIGNvbnN0cnVjdGlvbiBvZiB0aGUgc3BlY3VsYXRpdmUgSklUIG91 dHNpZGUgb2YKKyAgICAgICAgICAgICAgY29tcGlsZUJvZHksIHN1Y2ggdGhhdCBpdCBpcyBzdGls bCBhdmFpbGFibGUgdG8gbGluayB0aGUKKyAgICAgICAgICAgICAgT1NSIGVudHJ5IHBvaW50cyBh dCB0aGUgcG9pbnQgd2UgYXJlIGxpbmtpbmcuCisgICAgICAgICogZGZnL0RGR0pJVENvbXBpbGVy Lmg6CisgICAgICAgIChKU0M6OkRGRzo6SklUQ29tcGlsZXI6Om5vdGljZU9TUkVudHJ5KToKKyAg ICAgICAgICAgIC0gUGFzcyB0aGUgbGFiZWwgb2YgdGhlIGJsb2NrICYgbGlua2J1ZmZlciBpbnRv IG5vdGljZU9TUkVudHJ5LgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6Cisg ICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUpOgorICAgICAgICAoSlND OjpERkc6OlNwZWN1bGF0aXZlSklUOjpsaW5rT1NSRW50cmllcyk6CisgICAgICAgICAgICAtIE1v dmVkIGNhbGwgdG8gbm90aWNlT1NSRW50cnkgdW50aWwgd2Ugd2UgbGlua2luZy4KKyAgICAgICAg KiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuaDoKKyAgICAgICAgKiBqaXQvSklULmNwcDoKKyAgICAg ICAgKEpTQzo6SklUOjpwcml2YXRlQ29tcGlsZU1haW5QYXNzKToKKyAgICAgICAgKEpTQzo6SklU Ojpwcml2YXRlQ29tcGlsZVNsb3dDYXNlcyk6CisgICAgICAgIChKU0M6OkpJVDo6cHJpdmF0ZUNv bXBpbGUpOgorICAgICAgICAgICAgLSBNb3ZlZCBjYWxjdWxhdGlvbiBvZiBlbnRyaWVzIHVudGls IHdlIHdlIGxpbmtpbmcuCisgICAgICAgICogaml0L0pJVC5oOgorICAgICAgICAgICAgLSBSZW1v dmVkIHNvbWUgbWVtYmVycy4KKwogMjAxMS0xMS0wOCAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2Zm QGFwcGxlLmNvbT4KIAogICAgICAgICBUb3dhcmRzIDggQml0IFN0cmluZ3M6IFRlbXBsYXRpemUg SlNDOjpQYXJzZXIgY2xhc3MgYnkgTGV4ZXIgdHlwZQpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2Fzc2VtYmxlci9MaW5rQnVmZmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9MaW5rQnVmZmVyLmgJKHJldmlzaW9uIDk5NjIyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9MaW5rQnVmZmVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTE2OCw2ICsxNjgsMTEgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gTWFjcm9Bc3NlbWJsZXI6 OmdldExpbmtlckNhbGxSZXR1cm5PZmZzZXQoY2FsbCk7CiAgICAgfQogCisgICAgdWludDMyX3Qg b2Zmc2V0T2YoTGFiZWwgbGFiZWwpCisgICAgeworICAgICAgICByZXR1cm4gYXBwbHlPZmZzZXQo bGFiZWwubV9sYWJlbCkubV9vZmZzZXQ7CisgICAgfQorCiAgICAgLy8gVXBvbiBjb21wbGV0aW9u IG9mIGFsbCBwYXRjaGluZyBlaXRoZXIgJ2ZpbmFsaXplQ29kZSgpJyBvciAnZmluYWxpemVDb2Rl QWRkZW5kdW0oKScgc2hvdWxkIGJlIGNhbGxlZAogICAgIC8vIG9uY2UgdG8gY29tcGxldGUgZ2Vu ZXJhdGlvbiBvZiB0aGUgY29kZS4gICdmaW5hbGl6ZUNvZGUoKScgaXMgc3VpdGVkIHRvIHNpdHVh dGlvbnMKICAgICAvLyB3aGVyZSB0aGUgZXhlY3V0YWJsZSBwb29sIG11c3QgYWxzbyBiZSByZXRh aW5lZCwgdGhlIGxpZ2h0ZXItd2VpZ2h0ICdmaW5hbGl6ZUNvZGVBZGRlbmR1bSgpJyBpcwpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb21waWxlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb21waWxlci5jcHAJKHJldmlz aW9uIDk5NjIyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb21waWxlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTUyLDggKzUyLDYgQEAgdm9pZCBKSVRDb21waWxlcjo6bGlu a09TUkV4aXRzKFNwZWN1bGF0aQogCiB2b2lkIEpJVENvbXBpbGVyOjpjb21waWxlRW50cnkoKQog ewotICAgIG1fc3RhcnRPZkNvZGUgPSBsYWJlbCgpOwotICAgIAogICAgIC8vIFRoaXMgY29kZSBj dXJyZW50bHkgbWF0Y2hlcyB0aGUgb2xkIEpJVC4gSW4gdGhlIGZ1bmN0aW9uIGhlYWRlciB3ZSBu ZWVkIHRvCiAgICAgLy8gcG9wIHRoZSByZXR1cm4gYWRkcmVzcyAoc2luY2Ugd2UgZG8gbm90IGFs bG93IGFueSByZWN1cnNpb24gb24gdGhlIG1hY2hpbmUKICAgICAvLyBzdGFjayksIGFuZCBwZXJm b3JtIGEgZmFzdCByZWdpc3RlciBmaWxlIGNoZWNrLgpAQCAtNjUsNyArNjMsNyBAQCB2b2lkIEpJ VENvbXBpbGVyOjpjb21waWxlRW50cnkoKQogICAgIGVtaXRQdXRUb0NhbGxGcmFtZUhlYWRlcihH UFJJbmZvOjpyZWdUMiwgUmVnaXN0ZXJGaWxlOjpSZXR1cm5QQyk7CiB9CiAKLXZvaWQgSklUQ29t cGlsZXI6OmNvbXBpbGVCb2R5KCkKK3ZvaWQgSklUQ29tcGlsZXI6OmNvbXBpbGVCb2R5KFNwZWN1 bGF0aXZlSklUJiBzcGVjdWxhdGl2ZSkKIHsKICAgICAvLyBXZSBnZW5lcmF0ZSB0aGUgc3BlY3Vs YXRpdmUgY29kZSBwYXRoLCBmb2xsb3dlZCBieSBPU1IgZXhpdCBjb2RlIHRvIHJldHVybgogICAg IC8vIHRvIHRoZSBvbGQgSklUIGNvZGUgaWYgc3BlY3VsYXRpb25zIGZhaWwuCkBAIC03Nyw4ICs3 NSw2IEBAIHZvaWQgSklUQ29tcGlsZXI6OmNvbXBpbGVCb2R5KCkKICAgICAKICAgICBhZGRQdHIo SW1tMzIoMSksIEFic29sdXRlQWRkcmVzcyhjb2RlQmxvY2soKS0+YWRkcmVzc09mU3BlY3VsYXRp dmVTdWNjZXNzQ291bnRlcigpKSk7CiAKLSAgICBMYWJlbCBzcGVjdWxhdGl2ZVBhdGhCZWdpbiA9 IGxhYmVsKCk7Ci0gICAgU3BlY3VsYXRpdmVKSVQgc3BlY3VsYXRpdmUoKnRoaXMpOwogICAgIGJv b2wgY29tcGlsZWRTcGVjdWxhdGl2ZSA9IHNwZWN1bGF0aXZlLmNvbXBpbGUoKTsKICAgICBBU1NF UlRfVU5VU0VEKGNvbXBpbGVkU3BlY3VsYXRpdmUsIGNvbXBpbGVkU3BlY3VsYXRpdmUpOwogCkBA IC0yMDUsMTAgKzIwMSwxMiBAQCB2b2lkIEpJVENvbXBpbGVyOjpjb21waWxlKEpJVENvZGUmIGVu dHJ5CiAgICAgLy8gUHJlc2VydmUgdGhlIHJldHVybiBhZGRyZXNzIHRvIHRoZSBjYWxsZnJhbWUu CiAgICAgY29tcGlsZUVudHJ5KCk7CiAgICAgLy8gR2VuZXJhdGUgdGhlIGJvZHkgb2YgdGhlIHBy b2dyYW0uCi0gICAgY29tcGlsZUJvZHkoKTsKKyAgICBTcGVjdWxhdGl2ZUpJVCBzcGVjdWxhdGl2 ZSgqdGhpcyk7CisgICAgY29tcGlsZUJvZHkoc3BlY3VsYXRpdmUpOwogICAgIC8vIExpbmsKICAg ICBMaW5rQnVmZmVyIGxpbmtCdWZmZXIoKm1fZ2xvYmFsRGF0YSwgdGhpcyk7CiAgICAgbGluayhs aW5rQnVmZmVyKTsKKyAgICBzcGVjdWxhdGl2ZS5saW5rT1NSRW50cmllcyhsaW5rQnVmZmVyKTsK ICAgICBlbnRyeSA9IEpJVENvZGUobGlua0J1ZmZlci5maW5hbGl6ZUNvZGUoKSwgSklUQ29kZTo6 REZHSklUKTsKIH0KIApAQCAtMjMyLDcgKzIzMCw4IEBAIHZvaWQgSklUQ29tcGlsZXI6OmNvbXBp bGVGdW5jdGlvbihKSVRDb2QKIAogCiAgICAgLy8gPT09IEZ1bmN0aW9uIGJvZHkgY29kZSBnZW5l cmF0aW9uID09PQotICAgIGNvbXBpbGVCb2R5KCk7CisgICAgU3BlY3VsYXRpdmVKSVQgc3BlY3Vs YXRpdmUoKnRoaXMpOworICAgIGNvbXBpbGVCb2R5KHNwZWN1bGF0aXZlKTsKIAogICAgIC8vID09 PSBGdW5jdGlvbiBmb290ZXIgY29kZSBnZW5lcmF0aW9uID09PQogICAgIC8vCkBAIC0yNjcsNiAr MjY2LDcgQEAgdm9pZCBKSVRDb21waWxlcjo6Y29tcGlsZUZ1bmN0aW9uKEpJVENvZAogICAgIC8v ID09PSBMaW5rID09PQogICAgIExpbmtCdWZmZXIgbGlua0J1ZmZlcigqbV9nbG9iYWxEYXRhLCB0 aGlzKTsKICAgICBsaW5rKGxpbmtCdWZmZXIpOworICAgIHNwZWN1bGF0aXZlLmxpbmtPU1JFbnRy aWVzKGxpbmtCdWZmZXIpOwogICAgIAogICAgIC8vIEZJWE1FOiBzd2l0Y2ggdGhlIHJlZ2lzdGVy IGZpbGUgY2hlY2sgJiBhcml0eSBjaGVjayBvdmVyIHRvIERGR09wZXJ0YWlvbiBzdHlsZSBjYWxs cywgbm90IEpJVCBzdHVicy4KICAgICBsaW5rQnVmZmVyLmxpbmsoY2FsbFJlZ2lzdGVyRmlsZUNo ZWNrLCBjdGlfcmVnaXN0ZXJfZmlsZV9jaGVjayk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR0pJVENvbXBpbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdKSVRDb21waWxlci5oCShyZXZpc2lvbiA5OTYyMikKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHSklUQ29tcGlsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjgsNiAr MjgsNyBAQAogCiAjaWYgRU5BQkxFKERGR19KSVQpCiAKKyNpbmNsdWRlIDxhc3NlbWJsZXIvTGlu a0J1ZmZlci5oPgogI2luY2x1ZGUgPGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlci5oPgogI2luY2x1 ZGUgPGJ5dGVjb2RlL0NvZGVCbG9jay5oPgogI2luY2x1ZGUgPGRmZy9ERkdBc3NlbWJseUhlbHBl cnMuaD4KQEAgLTI2MiwxMCArMjYzLDEwIEBAIHB1YmxpYzoKICAgICAgICAgbV9qc0NhbGxzLmFw cGVuZChKU0NhbGxSZWNvcmQoZmFzdENhbGwsIHNsb3dDYWxsLCB0YXJnZXRUb0NoZWNrLCBpc0Nh bGwsIGNvZGVPcmlnaW4pKTsKICAgICB9CiAgICAgCi0gICAgdm9pZCBub3RpY2VPU1JFbnRyeShC YXNpY0Jsb2NrJiBiYXNpY0Jsb2NrKQorICAgIHZvaWQgbm90aWNlT1NSRW50cnkoQmFzaWNCbG9j ayYgYmFzaWNCbG9jaywgSklUQ29tcGlsZXI6OkxhYmVsIGJsb2NrSGVhZCwgTGlua0J1ZmZlciYg bGlua0J1ZmZlcikKICAgICB7CiAjaWYgREZHX0VOQUJMRShPU1JfRU5UUlkpCi0gICAgICAgIE9T UkVudHJ5RGF0YSogZW50cnkgPSBjb2RlQmxvY2soKS0+YXBwZW5kREZHT1NSRW50cnlEYXRhKGJh c2ljQmxvY2suYnl0ZWNvZGVCZWdpbiwgZGlmZmVyZW5jZUJldHdlZW4obV9zdGFydE9mQ29kZSwg bGFiZWwoKSkpOworICAgICAgICBPU1JFbnRyeURhdGEqIGVudHJ5ID0gY29kZUJsb2NrKCktPmFw cGVuZERGR09TUkVudHJ5RGF0YShiYXNpY0Jsb2NrLmJ5dGVjb2RlQmVnaW4sIGxpbmtCdWZmZXIu b2Zmc2V0T2YoYmxvY2tIZWFkKSk7CiAgICAgICAgIAogICAgICAgICBlbnRyeS0+bV9leHBlY3Rl ZFZhbHVlcyA9IGJhc2ljQmxvY2sudmFsdWVzQXRIZWFkOwogICAgICAgICAKQEAgLTI4Miw2ICsy ODMsOCBAQCBwdWJsaWM6CiAgICAgICAgIH0KICNlbHNlCiAgICAgICAgIFVOVVNFRF9QQVJBTShi YXNpY0Jsb2NrKTsKKyAgICAgICAgVU5VU0VEX1BBUkFNKGJsb2NrSGVhZCk7CisgICAgICAgIFVO VVNFRF9QQVJBTShsaW5rQnVmZmVyKTsKICNlbmRpZgogICAgIH0KIApAQCAtMjk2LDcgKzI5OSw3 IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgLy8gSW50ZXJuYWwgaW1wbGVtZW50YXRpb24gdG8g Y29tcGlsZS4KICAgICB2b2lkIGNvbXBpbGVFbnRyeSgpOwotICAgIHZvaWQgY29tcGlsZUJvZHko KTsKKyAgICB2b2lkIGNvbXBpbGVCb2R5KFNwZWN1bGF0aXZlSklUJik7CiAgICAgdm9pZCBsaW5r KExpbmtCdWZmZXImKTsKIAogICAgIHZvaWQgZXhpdFNwZWN1bGF0aXZlV2l0aE9TUihjb25zdCBP U1JFeGl0JiwgU3BlY3VsYXRpb25SZWNvdmVyeSopOwpAQCAtMzEwLDkgKzMxMyw2IEBAIHByaXZh dGU6CiAgICAgVmVjdG9yPENhbGxMaW5rUmVjb3JkPiBtX2NhbGxzOwogICAgIFZlY3RvcjxDYWxs RXhjZXB0aW9uUmVjb3JkPiBtX2V4Y2VwdGlvbkNoZWNrczsKICAgICAKLSAgICAvLyBKSVQgY29k ZSBtYXAgZm9yIE9TUiBlbnRyeXBvaW50cy4KLSAgICBMYWJlbCBtX3N0YXJ0T2ZDb2RlOwotCiAg ICAgc3RydWN0IE1ldGhvZEdldFJlY29yZCB7CiAgICAgICAgIE1ldGhvZEdldFJlY29yZChDYWxs IHNsb3dDYWxsLCBEYXRhTGFiZWxQdHIgc3RydWN0VG9Db21wYXJlLCBEYXRhTGFiZWxQdHIgcHJv dG9PYmosIERhdGFMYWJlbFB0ciBwcm90b1N0cnVjdFRvQ29tcGFyZSwgRGF0YUxhYmVsUHRyIHB1 dEZ1bmN0aW9uKQogICAgICAgICAgICAgOiBtX3Nsb3dDYWxsKHNsb3dDYWxsKQpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHJldmlz aW9uIDk5NjIwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJ VC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyNCw5ICsyMjQsNiBAQCB2b2lkIFNwZWN1bGF0aXZl SklUOjpjb21waWxlKEJhc2ljQmxvY2smCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBp ZiAoYmxvY2suaXNPU1JUYXJnZXQpCi0gICAgICAgIG1faml0Lm5vdGljZU9TUkVudHJ5KGJsb2Nr KTsKLQogICAgIG1fYmxvY2tIZWFkc1ttX2Jsb2NrXSA9IG1faml0LmxhYmVsKCk7CiAjaWYgREZH X0VOQUJMRShKSVRfQlJFQUtfT05fRVZFUllfQkxPQ0spCiAgICAgbV9qaXQuYnJlYWtwb2ludCgp OwpAQCAtNDEwLDYgKzQwNywxNSBAQCBib29sIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKCkKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIAordm9pZCBTcGVjdWxhdGl2ZUpJVDo6bGlua09TUkVudHJpZXMo TGlua0J1ZmZlciYgbGlua0J1ZmZlcikKK3sKKyAgICBmb3IgKEJsb2NrSW5kZXggYmxvY2tJbmRl eCA9IDA7IGJsb2NrSW5kZXggPCBtX2ppdC5ncmFwaCgpLm1fYmxvY2tzLnNpemUoKTsgKytibG9j a0luZGV4KSB7CisgICAgICAgIEJhc2ljQmxvY2smIGJsb2NrID0gKm1faml0LmdyYXBoKCkubV9i bG9ja3NbYmxvY2tJbmRleF07CisgICAgICAgIGlmIChibG9jay5pc09TUlRhcmdldCkKKyAgICAg ICAgICAgIG1faml0Lm5vdGljZU9TUkVudHJ5KGJsb2NrLCBtX2Jsb2NrSGVhZHNbYmxvY2tJbmRl eF0sIGxpbmtCdWZmZXIpOworICAgIH0KK30KKwogVmFsdWVSZWNvdmVyeSBTcGVjdWxhdGl2ZUpJ VDo6Y29tcHV0ZVZhbHVlUmVjb3ZlcnlGb3IoY29uc3QgVmFsdWVTb3VyY2UmIHZhbHVlU291cmNl KQogewogICAgIHN3aXRjaCAodmFsdWVTb3VyY2Uua2luZCgpKSB7CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCShyZXZpc2lvbiA5OTYyMCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTMxLDYgKzEzMSw3IEBAIHB1YmxpYzoKICAgICBTcGVjdWxhdGl2ZUpJVChK SVRDb21waWxlciYpOwogCiAgICAgYm9vbCBjb21waWxlKCk7CisgICAgdm9pZCBsaW5rT1NSRW50 cmllcyhMaW5rQnVmZmVyJik7CiAKICAgICAvLyBSZXRyaWV2ZSB0aGUgbGlzdCBvZiBiYWlsLW91 dHMgZnJvbSB0aGUgc3BlY3VsYXRpdmUgcGF0aCwKICAgICAvLyBhbmQgYWRkaXRpb25hbCByZWNv dmVyeSBpbmZvcm1hdGlvbi4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAJKHJldmlz aW9uIDk5NjIwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMTgsMTMgKzIxOCw4IEBAIHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZU1haW5Q YXNzKCkKIAogICAgICAgICBtX2xhYmVsc1ttX2J5dGVjb2RlT2Zmc2V0XSA9IGxhYmVsKCk7CiAK LSNpZiBFTkFCTEUoREZHX0pJVCkKLSAgICAgICAgaWYgKG1fY2FuQmVPcHRpbWl6ZWQpCi0gICAg ICAgICAgICBtX2ppdENvZGVNYXBFbmNvZGVyLmFwcGVuZChtX2J5dGVjb2RlT2Zmc2V0LCBkaWZm ZXJlbmNlQmV0d2VlbihtX3N0YXJ0T2ZDb2RlLCBsYWJlbCgpKSk7Ci0jZW5kaWYKLSAgICAgICAg CiAjaWYgRU5BQkxFKEpJVF9WRVJCT1NFKQotICAgICAgICBwcmludGYoIk9sZCBKSVQgZW1pdHRp bmcgY29kZSBmb3IgYmMjJXUgYXQgb2Zmc2V0IDB4JWx4LlxuIiwgbV9ieXRlY29kZU9mZnNldCwg ZGlmZmVyZW5jZUJldHdlZW4obV9zdGFydE9mQ29kZSwgbGFiZWwoKSkpOworICAgICAgICBwcmlu dGYoIk9sZCBKSVQgZW1pdHRpbmcgY29kZSBmb3IgYmMjJXUgYXQgb2Zmc2V0IDB4JWx4LlxuIiwg bV9ieXRlY29kZU9mZnNldCwgKGxvbmcpZGVidWdPZmZzZXQoKSk7CiAjZW5kaWYKIAogICAgICAg ICBzd2l0Y2ggKG1faW50ZXJwcmV0ZXItPmdldE9wY29kZUlEKGN1cnJlbnRJbnN0cnVjdGlvbi0+ dS5vcGNvZGUpKSB7CkBAIC00MzYsNyArNDMxLDcgQEAgdm9pZCBKSVQ6OnByaXZhdGVDb21waWxl U2xvd0Nhc2VzKCkKICNlbmRpZgogCiAjaWYgRU5BQkxFKEpJVF9WRVJCT1NFKQotICAgICAgICBw cmludGYoIk9sZCBKSVQgZW1pdHRpbmcgc2xvdyBjb2RlIGZvciBiYyMldSBhdCBvZmZzZXQgMHgl bHguXG4iLCBtX2J5dGVjb2RlT2Zmc2V0LCBkaWZmZXJlbmNlQmV0d2VlbihtX3N0YXJ0T2ZDb2Rl LCBsYWJlbCgpKSk7CisgICAgICAgIHByaW50ZigiT2xkIEpJVCBlbWl0dGluZyBzbG93IGNvZGUg Zm9yIGJjIyV1IGF0IG9mZnNldCAweCVseC5cbiIsIG1fYnl0ZWNvZGVPZmZzZXQsIChsb25nKWRl YnVnT2Zmc2V0KCkpOwogI2VuZGlmCiAKICAgICAgICAgc3dpdGNoIChtX2ludGVycHJldGVyLT5n ZXRPcGNvZGVJRChjdXJyZW50SW5zdHJ1Y3Rpb24tPnUub3Bjb2RlKSkgewpAQCAtNTM2LDkgKzUz MSw2IEBAIEpJVENvZGUgSklUOjpwcml2YXRlQ29tcGlsZShDb2RlUHRyKiBmdW4KICNpZiBFTkFC TEUoVkFMVUVfUFJPRklMRVIpCiAgICAgbV9jYW5CZU9wdGltaXplZCA9IG1fY29kZUJsb2NrLT5j YW5Db21waWxlV2l0aERGRygpOwogI2VuZGlmCi0jaWYgRU5BQkxFKERGR19KSVQpIHx8IEVOQUJM RShKSVRfVkVSQk9TRSkKLSAgICBtX3N0YXJ0T2ZDb2RlID0gbGFiZWwoKTsKLSNlbmRpZgogICAg IAogICAgIC8vIEp1c3QgYWRkIGEgbGl0dGxlIGJpdCBvZiByYW5kb21uZXNzIHRvIHRoZSBjb2Rl Z2VuCiAgICAgaWYgKG1fcmFuZG9tR2VuZXJhdG9yLmdldFVpbnQzMigpICYgMSkKQEAgLTY5OSw4 ICs2OTEsMTQgQEAgSklUQ29kZSBKSVQ6OnByaXZhdGVDb21waWxlKENvZGVQdHIqIGZ1bgogICAg IH0KIAogI2lmIEVOQUJMRShERkdfSklUKQotICAgIGlmIChtX2NhbkJlT3B0aW1pemVkKQotICAg ICAgICBtX2NvZGVCbG9jay0+c2V0SklUQ29kZU1hcChtX2ppdENvZGVNYXBFbmNvZGVyLmZpbmlz aCgpKTsKKyAgICBpZiAobV9jYW5CZU9wdGltaXplZCkgeworICAgICAgICBDb21wYWN0SklUQ29k ZU1hcDo6RW5jb2RlciBqaXRDb2RlTWFwRW5jb2RlcjsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBi eXRlY29kZU9mZnNldCA9IDA7IGJ5dGVjb2RlT2Zmc2V0IDwgbV9sYWJlbHMuc2l6ZSgpOyArK2J5 dGVjb2RlT2Zmc2V0KSB7CisgICAgICAgICAgICBpZiAobV9sYWJlbHNbYnl0ZWNvZGVPZmZzZXRd LmlzU2V0KCkpCisgICAgICAgICAgICAgICAgaml0Q29kZU1hcEVuY29kZXIuYXBwZW5kKGJ5dGVj b2RlT2Zmc2V0LCBwYXRjaEJ1ZmZlci5vZmZzZXRPZihtX2xhYmVsc1tieXRlY29kZU9mZnNldF0p KTsKKyAgICAgICAgfQorICAgICAgICBtX2NvZGVCbG9jay0+c2V0SklUQ29kZU1hcChqaXRDb2Rl TWFwRW5jb2Rlci5maW5pc2goKSk7CisgICAgfQogI2VuZGlmCiAKICAgICBpZiAobV9jb2RlQmxv Y2stPmNvZGVUeXBlKCkgPT0gRnVuY3Rpb25Db2RlICYmIGZ1bmN0aW9uRW50cnlBcml0eUNoZWNr KQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCShyZXZpc2lvbiA5OTYyMCkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmgJKHdvcmtpbmcgY29weSkKQEAgLTEwODcsMTIgKzEw ODcsNiBAQCBuYW1lc3BhY2UgSlNDIHsKICNpZiBFTkFCTEUoVkFMVUVfUFJPRklMRVIpCiAgICAg ICAgIGJvb2wgbV9jYW5CZU9wdGltaXplZDsKICNlbmRpZgotI2lmIEVOQUJMRShERkdfSklUKSB8 fCBFTkFCTEUoSklUX1ZFUkJPU0UpCi0gICAgICAgIExhYmVsIG1fc3RhcnRPZkNvZGU7Ci0jZW5k aWYKLSNpZiBFTkFCTEUoREZHX0pJVCkKLSAgICAgICAgQ29tcGFjdEpJVENvZGVNYXA6OkVuY29k ZXIgbV9qaXRDb2RlTWFwRW5jb2RlcjsKLSNlbmRpZgogICAgIH0gSklUX0NMQVNTX0FMSUdOTUVO VDsKIAogICAgIGlubGluZSB2b2lkIEpJVDo6ZW1pdF9vcF9sb29wKEluc3RydWN0aW9uKiBjdXJy ZW50SW5zdHJ1Y3Rpb24pCg==