117048 2013-05-30 14:54:46 -0700 fourthTier: LLInt shouldn't store an offset call PC during op_call-like calls 2013-05-30 16:29:59 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 117047 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 895686 0 fpizlo 2013-05-30 14:54:46 -0700 It should be consistent: the PC that it stores into ArgumentCount + TagOffset should always be the *current* PC. This allows us to kill off a bunch of nasty code, and it should also make it easier to have dispatchAfterCall() do the job previously done by op_call_put_result. 895709 1 203390 fpizlo 2013-05-30 16:05:39 -0700 Created attachment 203390 the patch 895713 2 203390 mhahnenberg 2013-05-30 16:12:07 -0700 Comment on attachment 203390 the patch r=me 895726 3 fpizlo 2013-05-30 16:29:59 -0700 Landed in http://trac.webkit.org/changeset/150993 203390 2013-05-30 16:05:39 -0700 2013-05-30 16:12:07 -0700 the patch blah.patch text/plain 15408 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTUwOTkwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBA CisyMDEzLTA1LTMwICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg Zm91cnRoVGllcjogTExJbnQgc2hvdWxkbid0IHN0b3JlIGFuIG9mZnNldCBjYWxsIFBDIGR1cmlu ZyBvcF9jYWxsLWxpa2UgY2FsbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExNzA0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorICAgICAgICAKKyAgICAgICAgVGhpcyBqdXN0IG1ha2VzIGV2ZXJ5dGhpbmcgY29uc2lzdGVu dCBpbiB0aGUgTExJbnQ6IGFueXRpbWUgYW55IG9wIGNhbGxzIG91dCwKKyAgICAgICAgaXQgc3Rv cmVzIGl0cyBQQyBhbmQgbmV2ZXIgdGhlIG5leHQgb3AncyBQQy4KKyAgICAgICAgCisgICAgICAg ICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpkdW1w Qnl0ZWNvZGUpOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OmxpbmtJbmNvbWluZ0NhbGwpOgor ICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OmJ5dGVjb2RlT2Zmc2V0KToKKyAgICAgICAgKiBieXRl Y29kZS9Db2RlQmxvY2suaDoKKyAgICAgICAgKENvZGVCbG9jayk6CisgICAgICAgICogYnl0ZWNv ZGUvT3Bjb2RlLmg6CisgICAgICAgIChKU0MpOgorICAgICAgICAoSlNDOjpwYWRPcGNvZGVOYW1l KToKKyAgICAgICAgKiBieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwOgorICAgICAg ICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdENhbGxWYXJhcmdzKToKKyAgICAgICAgKiBs bGludC9MTEludEV4Y2VwdGlvbnMuY3BwOgorICAgICAgICAoTExJbnQpOgorICAgICAgICAoSlND OjpMTEludDo6aW50ZXJwcmV0ZXJUaHJvd0luQ2FsbGVyKToKKyAgICAgICAgKEpTQzo6TExJbnQ6 OnJldHVyblRvVGhyb3cpOgorICAgICAgICAoSlNDOjpMTEludDo6Y2FsbFRvVGhyb3cpOgorICAg ICAgICAqIGxsaW50L0xMSW50U2xvd1BhdGhzLmNwcDoKKyAgICAgICAgKEpTQzo6TExJbnQ6OkxM SU5UX1NMT1dfUEFUSF9ERUNMKToKKyAgICAgICAgKiBsbGludC9Mb3dMZXZlbEludGVycHJldGVy LmFzbToKKyAgICAgICAgKiBsbGludC9Mb3dMZXZlbEludGVycHJldGVyLmNwcDoKKyAgICAgICAg KEpTQzo6Q0xvb3A6OmV4ZWN1dGUpOgorICAgICAgICAqIGxsaW50L0xvd0xldmVsSW50ZXJwcmV0 ZXIzMl82NC5hc206CisgICAgICAgICogbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbToK KwogMjAxMy0wNS0yOCAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAg IGZvdXJ0aFRpZXI6IEZUTCBzaG91bGQgc3VwcG9ydCBBcml0aEFicwpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHJldmlzaW9uIDE1MDg1OSkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMjk0LDYgKzEyOTQsNyBAQCB2b2lkIENvZGVCbG9jazo6ZHVtcEJ5dGVjb2Rl KFByaW50U3RyZWFtCiAgICAgICAgICAgICBpbnQgdGhpc1ZhbHVlID0gKCsraXQpLT51Lm9wZXJh bmQ7CiAgICAgICAgICAgICBpbnQgYXJndW1lbnRzID0gKCsraXQpLT51Lm9wZXJhbmQ7CiAgICAg ICAgICAgICBpbnQgZmlyc3RGcmVlUmVnaXN0ZXIgPSAoKytpdCktPnUub3BlcmFuZDsKKyAgICAg ICAgICAgICsraXQ7CiAgICAgICAgICAgICBvdXQucHJpbnRmKCJbJTRkXSBjYWxsX3ZhcmFyZ3Nc dCAlcywgJXMsICVzLCAlZCIsIGxvY2F0aW9uLCByZWdpc3Rlck5hbWUoY2FsbGVlKS5kYXRhKCks IHJlZ2lzdGVyTmFtZSh0aGlzVmFsdWUpLmRhdGEoKSwgcmVnaXN0ZXJOYW1lKGFyZ3VtZW50cyku ZGF0YSgpLCBmaXJzdEZyZWVSZWdpc3Rlcik7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQpAQCAtMjYwMSw1OCArMjYwMiw2IEBAIHZvaWQgQ29kZUJsb2NrOjpsaW5rSW5jb21pbmdDYWxs KEV4ZWNTdGEKICAgICBub3RpY2VJbmNvbWluZ0NhbGwoY2FsbGVyRnJhbWUpOwogICAgIG1faW5j b21pbmdMTEludENhbGxzLnB1c2goaW5jb21pbmcpOwogfQotCi1JbnN0cnVjdGlvbiogQ29kZUJs b2NrOjphZGp1c3RQQ0lmQXRDYWxsU2l0ZShJbnN0cnVjdGlvbiogcG90ZW50aWFsUmV0dXJuUEMp Ci17Ci0gICAgQVNTRVJUKHBvdGVudGlhbFJldHVyblBDKTsKLQotICAgIHVuc2lnbmVkIHJldHVy blBDT2Zmc2V0ID0gcG90ZW50aWFsUmV0dXJuUEMgLSBpbnN0cnVjdGlvbnMoKS5iZWdpbigpOwot ICAgIEluc3RydWN0aW9uKiBhZGp1c3RlZFBDOwotICAgIHVuc2lnbmVkIG9wY29kZUxlbmd0aDsK LQotICAgIC8vIElmIHdlIGFyZSBhdCBhIGNhbGxzaXRlLCB0aGUgTExJbnQgc3RvcmVzIHRoZSBQ QyBhZnRlciB0aGUgY2FsbAotICAgIC8vIGluc3RydWN0aW9uIHJhdGhlciB0aGFuIHRoZSBQQyBv ZiB0aGUgY2FsbCBpbnN0cnVjdGlvbi4gVGhpcyByZXF1aXJlcwotICAgIC8vIHNvbWUgY29ycmVj dGluZy4gSWYgc28sIHdlIGNhbiByZWx5IG9uIHRoZSBmYWN0IHRoYXQgdGhlIHByZWNlZGluZwot ICAgIC8vIGluc3RydWN0aW9uIG11c3QgYmUgb25lIG9mIHRoZSBjYWxsIGluc3RydWN0aW9ucywg c28gZWl0aGVyIGl0J3MgYQotICAgIC8vIGNhbGxfdmFyYXJncyBvciBpdCdzIGEgY2FsbCwgY29u c3RydWN0LCBvciBldmFsLgotICAgIC8vCi0gICAgLy8gSWYgd2UgYXJlIG5vdCBhdCBhIGNhbGwg c2l0ZSwgdGhlbiB3ZSBuZWVkIHRvIGd1YXJkIGFnYWluc3QgdGhlCi0gICAgLy8gcG9zc2liaWxp dHkgb2YgcGVla2luZyBwYXN0IHRoZSBzdGFydCBvZiB0aGUgYnl0ZWNvZGUgcmFuZ2UgZm9yIHRo aXMKLSAgICAvLyBjb2RlQmxvY2suIEhlbmNlLCB3ZSBkbyBhIGJvdW5kcyBjaGVjayBiZWZvcmUg d2UgcGVlayBhdCB0aGUKLSAgICAvLyBwb3RlbnRpYWwgInByZWNlZGluZyIgaW5zdHJ1Y3Rpb24u Ci0gICAgLy8gICAgIFRoZSBib3VuZHMgY2hlY2sgaXMgZG9uZSBieSBjb21wYXJpbmcgdGhlIG9m ZnNldCBvZiB0aGUgcG90ZW50aWFsCi0gICAgLy8gcmV0dXJuUEMgd2l0aCB0aGUgbGVuZ3RoIG9m IHRoZSBvcGNvZGUuIElmIHRoZXJlIGlzIHJvb20gZm9yIGEgY2FsbAotICAgIC8vIGluc3RydWN0 aW9uIGJlZm9yZSB0aGUgcmV0dXJuUEMsIHRoZW4gdGhlIG9mZnNldCBvZiB0aGUgcmV0dXJuUEMg bXVzdAotICAgIC8vIGJlIGdyZWF0ZXIgdGhhbiB0aGUgc2l6ZSBvZiB0aGUgY2FsbCBvcGNvZGUg d2UncmUgbG9va2luZyBmb3IuCi0KLSAgICAvLyBUaGUgZGV0ZXJtaW5hdGlvbiBvZiB0aGUgY2Fs bCBpbnN0cnVjdGlvbiBwcmVzZW50IChpZiB3ZSBhcmUgYXQgYQotICAgIC8vIGNhbGxzaXRlKSBk ZXBlbmRzIG9uIHRoZSBmb2xsb3dpbmcgYXNzdW1wdGlvbnMuIFNvLCBhc3NlcnQgdGhhdAotICAg IC8vIHRoZXkgYXJlIHN0aWxsIHRydWU6Ci0gICAgQVNTRVJUKE9QQ09ERV9MRU5HVEgob3BfY2Fs bF92YXJhcmdzKSA8PSBPUENPREVfTEVOR1RIKG9wX2NhbGwpKTsKLSAgICBBU1NFUlQoT1BDT0RF X0xFTkdUSChvcF9jYWxsKSA9PSBPUENPREVfTEVOR1RIKG9wX2NvbnN0cnVjdCkpOwotICAgIEFT U0VSVChPUENPREVfTEVOR1RIKG9wX2NhbGwpID09IE9QQ09ERV9MRU5HVEgob3BfY2FsbF9ldmFs KSk7Ci0KLSAgICAvLyBDaGVjayBmb3IgdGhlIGNhc2Ugb2YgYSBwcmVjZWVkaW5nIG9wX2NhbGxf dmFyYXJnczoKLSAgICBvcGNvZGVMZW5ndGggPSBPUENPREVfTEVOR1RIKG9wX2NhbGxfdmFyYXJn cyk7Ci0gICAgYWRqdXN0ZWRQQyA9IHBvdGVudGlhbFJldHVyblBDIC0gb3Bjb2RlTGVuZ3RoOwot ICAgIGlmICgocmV0dXJuUENPZmZzZXQgPj0gb3Bjb2RlTGVuZ3RoKQotICAgICAgICAmJiAoYWRq dXN0ZWRQQy0+dS5wb2ludGVyID09IExMSW50OjpnZXRDb2RlUHRyKGxsaW50X29wX2NhbGxfdmFy YXJncykpKSB7Ci0gICAgICAgIHJldHVybiBhZGp1c3RlZFBDOwotICAgIH0KLQotICAgIC8vIENo ZWNrIGZvciB0aGUgY2FzZSBvZiB0aGUgb3RoZXIgMyBjYWxsIGluc3RydWN0aW9uczoKLSAgICBv cGNvZGVMZW5ndGggPSBPUENPREVfTEVOR1RIKG9wX2NhbGwpOwotICAgIGFkanVzdGVkUEMgPSBw b3RlbnRpYWxSZXR1cm5QQyAtIG9wY29kZUxlbmd0aDsKLSAgICBpZiAoKHJldHVyblBDT2Zmc2V0 ID49IG9wY29kZUxlbmd0aCkKLSAgICAgICAgJiYgKGFkanVzdGVkUEMtPnUucG9pbnRlciA9PSBM TEludDo6Z2V0Q29kZVB0cihsbGludF9vcF9jYWxsKQotICAgICAgICAgICAgfHwgYWRqdXN0ZWRQ Qy0+dS5wb2ludGVyID09IExMSW50OjpnZXRDb2RlUHRyKGxsaW50X29wX2NvbnN0cnVjdCkKLSAg ICAgICAgICAgIHx8IGFkanVzdGVkUEMtPnUucG9pbnRlciA9PSBMTEludDo6Z2V0Q29kZVB0cihs bGludF9vcF9jYWxsX2V2YWwpKSkgewotICAgICAgICByZXR1cm4gYWRqdXN0ZWRQQzsKLSAgICB9 Ci0KLSAgICAvLyBOb3QgYSBjYWxsIHNpdGUuIE5vIG5lZWQgdG8gYWRqdXN0IFBDLiBKdXN0IHJl dHVybiB0aGUgb3JpZ2luYWwuCi0gICAgcmV0dXJuIHBvdGVudGlhbFJldHVyblBDOwotfQogI2Vu ZGlmIC8vIEVOQUJMRShMTElOVCkKIAogI2lmIEVOQUJMRShKSVQpCkBAIC0yNzEwLDcgKzI2NTks NiBAQCB1bnNpZ25lZCBDb2RlQmxvY2s6OmJ5dGVjb2RlT2Zmc2V0KEV4ZWNTCiAgICAgICAgIElu c3RydWN0aW9uKiBpbnN0cnVjdGlvbiA9IGV4ZWMtPmN1cnJlbnRWUEMoKTsKICAgICAgICAgUkVM RUFTRV9BU1NFUlQoaW5zdHJ1Y3Rpb24pOwogCi0gICAgICAgIGluc3RydWN0aW9uID0gYWRqdXN0 UENJZkF0Q2FsbFNpdGUoaW5zdHJ1Y3Rpb24pOwogICAgICAgICByZXR1cm4gYnl0ZWNvZGVPZmZz ZXQoaW5zdHJ1Y3Rpb24pOwogICAgIH0KICNlbmRpZiAvLyAhRU5BQkxFKExMSU5UKQpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAkocmV2aXNpb24gMTUw ODU5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xOTUsOSArMTk1LDYgQEAgcHVibGljOgogICAgIH0KICNlbmRpZiAvLyBF TkFCTEUoSklUKQogCi0jaWYgRU5BQkxFKExMSU5UKQotICAgIEluc3RydWN0aW9uKiBhZGp1c3RQ Q0lmQXRDYWxsU2l0ZShJbnN0cnVjdGlvbiopOwotI2VuZGlmCiAgICAgdW5zaWduZWQgYnl0ZWNv ZGVPZmZzZXQoRXhlY1N0YXRlKiwgUmV0dXJuQWRkcmVzc1B0cik7CiAKICNpZiBFTkFCTEUoSklU KQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL09wY29kZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9PcGNvZGUuaAkocmV2aXNpb24g MTUwODU5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL09wY29kZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xODEsNyArMTgxLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgbWFjcm8o b3BfbmV3X2Z1bmNfZXhwLCAzKSBcCiAgICAgbWFjcm8ob3BfY2FsbCwgNikgXAogICAgIG1hY3Jv KG9wX2NhbGxfZXZhbCwgNikgXAotICAgIG1hY3JvKG9wX2NhbGxfdmFyYXJncywgNSkgXAorICAg IG1hY3JvKG9wX2NhbGxfdmFyYXJncywgNikgXAogICAgIG1hY3JvKG9wX3RlYXJfb2ZmX2FjdGl2 YXRpb24sIDIpIFwKICAgICBtYWNybyhvcF90ZWFyX29mZl9hcmd1bWVudHMsIDMpIFwKICAgICBt YWNybyhvcF9yZXQsIDIpIFwKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGls ZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCShyZXZpc2lvbiAxNTA4NTkp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9y LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTg4OSw2ICsxODg5LDcgQEAgUmVnaXN0ZXJJRCogQnl0 ZWNvZGVHZW5lcmF0b3I6OmVtaXRDYWxsVgogICAgIGluc3RydWN0aW9ucygpLmFwcGVuZCh0aGlz UmVnaXN0ZXItPmluZGV4KCkpOwogICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChhcmd1bWVudHMt PmluZGV4KCkpOwogICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChmaXJzdEZyZWVSZWdpc3Rlci0+ aW5kZXgoKSk7CisgICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKDApOyAvLyBQYWQgdG8gbWFrZSBp dCBhcyBiaWcgYXMgYW4gb3BfY2FsbC4KICAgICBpZiAoZHN0ICE9IGlnbm9yZWRSZXN1bHQoKSkg ewogICAgICAgICBVbmxpbmtlZFZhbHVlUHJvZmlsZSBwcm9maWxlID0gZW1pdFByb2ZpbGVkT3Bj b2RlKG9wX2NhbGxfcHV0X3Jlc3VsdCk7CiAgICAgICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChr aWxsKGRzdCkpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50RXhjZXB0 aW9ucy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50 RXhjZXB0aW9ucy5jcHAJKHJldmlzaW9uIDE1MDg1OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9sbGludC9MTEludEV4Y2VwdGlvbnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOCwxNCArMzgs NiBAQAogCiBuYW1lc3BhY2UgSlNDIHsgbmFtZXNwYWNlIExMSW50IHsKIAotc3RhdGljIHZvaWQg Zml4dXBQQ2ZvckV4Y2VwdGlvbklmTmVlZGVkKEV4ZWNTdGF0ZSogZXhlYykKLXsKLSAgICBDb2Rl QmxvY2sqIGNvZGVCbG9jayA9IGV4ZWMtPmNvZGVCbG9jaygpOwotICAgIEFTU0VSVCghIWNvZGVC bG9jayk7Ci0gICAgSW5zdHJ1Y3Rpb24qIHBjID0gZXhlYy0+Y3VycmVudFZQQygpOwotICAgIGV4 ZWMtPnNldEN1cnJlbnRWUEMoY29kZUJsb2NrLT5hZGp1c3RQQ0lmQXRDYWxsU2l0ZShwYykpOwot fQotCiB2b2lkIGludGVycHJldGVyVGhyb3dJbkNhbGxlcihFeGVjU3RhdGUqIGV4ZWMsIFJldHVy bkFkZHJlc3NQdHIgcGMpCiB7CiAgICAgVk0qIHZtID0gJmV4ZWMtPnZtKCk7CkBAIC01Myw3ICs0 NSw2IEBAIHZvaWQgaW50ZXJwcmV0ZXJUaHJvd0luQ2FsbGVyKEV4ZWNTdGF0ZSoKICNpZiBMTElO VF9TTE9XX1BBVEhfVFJBQ0lORwogICAgIGRhdGFMb2coIlRocm93aW5nIGV4Y2VwdGlvbiAiLCB2 bS0+ZXhjZXB0aW9uLCAiLlxuIik7CiAjZW5kaWYKLSAgICBmaXh1cFBDZm9yRXhjZXB0aW9uSWZO ZWVkZWQoZXhlYyk7CiAgICAgZ2VuZXJpY1Rocm93KAogICAgICAgICB2bSwgZXhlYywgdm0tPmV4 Y2VwdGlvbiwKICAgICAgICAgZXhlYy0+Y29kZUJsb2NrKCktPmJ5dGVjb2RlT2Zmc2V0KGV4ZWMs IHBjKSk7CkBAIC03Miw3ICs2Myw2IEBAIEluc3RydWN0aW9uKiByZXR1cm5Ub1Rocm93KEV4ZWNT dGF0ZSogZXgKICNpZiBMTElOVF9TTE9XX1BBVEhfVFJBQ0lORwogICAgIGRhdGFMb2coIlRocm93 aW5nIGV4Y2VwdGlvbiAiLCB2bS0+ZXhjZXB0aW9uLCAiIChyZXR1cm5Ub1Rocm93KS5cbiIpOwog I2VuZGlmCi0gICAgZml4dXBQQ2ZvckV4Y2VwdGlvbklmTmVlZGVkKGV4ZWMpOwogICAgIGdlbmVy aWNUaHJvdyh2bSwgZXhlYywgdm0tPmV4Y2VwdGlvbiwgcGMgLSBleGVjLT5jb2RlQmxvY2soKS0+ aW5zdHJ1Y3Rpb25zKCkuYmVnaW4oKSk7CiAgICAgCiAgICAgcmV0dXJuIExMSW50OjpleGNlcHRp b25JbnN0cnVjdGlvbnMoKTsKQEAgLTg1LDcgKzc1LDYgQEAgdm9pZCogY2FsbFRvVGhyb3coRXhl Y1N0YXRlKiBleGVjLCBJbnN0cgogI2lmIExMSU5UX1NMT1dfUEFUSF9UUkFDSU5HCiAgICAgZGF0 YUxvZygiVGhyb3dpbmcgZXhjZXB0aW9uICIsIHZtLT5leGNlcHRpb24sICIgKGNhbGxUb1Rocm93 KS5cbiIpOwogI2VuZGlmCi0gICAgZml4dXBQQ2ZvckV4Y2VwdGlvbklmTmVlZGVkKGV4ZWMpOwog ICAgIGdlbmVyaWNUaHJvdyh2bSwgZXhlYywgdm0tPmV4Y2VwdGlvbiwgcGMgLSBleGVjLT5jb2Rl QmxvY2soKS0+aW5zdHJ1Y3Rpb25zKCkuYmVnaW4oKSk7CiAKICAgICByZXR1cm4gTExJbnQ6Omdl dENvZGVQdHIobGxpbnRfdGhyb3dfZHVyaW5nX2NhbGxfdHJhbXBvbGluZSk7CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludFNsb3dQYXRocy5jcHAJKHJldmlzaW9u IDE1MDg1OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludFNsb3dQYXRocy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTE1MDIsNyArMTUwMiw3IEBAIExMSU5UX1NMT1dfUEFUSF9E RUNMKHNsb3dfcGF0aF9jYWxsX3ZhcmEKICAgICAKICAgICBleGVjQ2FsbGVlLT51bmNoZWNrZWRS KEpTU3RhY2s6OkNhbGxlZSkgPSBjYWxsZWVBc1ZhbHVlOwogICAgIGV4ZWNDYWxsZWUtPnNldENh bGxlckZyYW1lKGV4ZWMpOwotICAgIGV4ZWMtPnNldEN1cnJlbnRWUEMocGMgKyBPUENPREVfTEVO R1RIKG9wX2NhbGxfdmFyYXJncykpOworICAgIGV4ZWMtPnNldEN1cnJlbnRWUEMocGMpOwogICAg IAogICAgIHJldHVybiBzZXRVcENhbGwoZXhlY0NhbGxlZSwgcGMsIENvZGVGb3JDYWxsLCBjYWxs ZWVBc1ZhbHVlKTsKIH0KQEAgLTE1MjAsNyArMTUyMCw3IEBAIExMSU5UX1NMT1dfUEFUSF9ERUNM KHNsb3dfcGF0aF9jYWxsX2V2YWwKICAgICBleGVjQ2FsbGVlLT5zZXRTY29wZShleGVjLT5zY29w ZSgpKTsKICAgICBleGVjQ2FsbGVlLT5zZXRSZXR1cm5QQyhMTEludDo6Z2V0Q29kZVB0cihsbGlu dF9nZW5lcmljX3JldHVybl9wb2ludCkpOwogICAgIGV4ZWNDYWxsZWUtPnNldENvZGVCbG9jaygw KTsKLSAgICBleGVjLT5zZXRDdXJyZW50VlBDKHBjICsgT1BDT0RFX0xFTkdUSChvcF9jYWxsX2V2 YWwpKTsKKyAgICBleGVjLT5zZXRDdXJyZW50VlBDKHBjKTsKICAgICAKICAgICBpZiAoIWlzSG9z dEZ1bmN0aW9uKGNhbGxlZUFzVmFsdWUsIGdsb2JhbEZ1bmNFdmFsKSkKICAgICAgICAgcmV0dXJu IHNldFVwQ2FsbChleGVjQ2FsbGVlLCBwYywgQ29kZUZvckNhbGwsIGNhbGxlZUFzVmFsdWUpOwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIzMl82 NC5hc20KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVs SW50ZXJwcmV0ZXIzMl82NC5hc20JKHJldmlzaW9uIDE1MDg1OSkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyMzJfNjQuYXNtCSh3b3JraW5nIGNvcHkp CkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTIgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTIsIDIwMTMgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z CkBAIC0xMDEsNyArMTAxLDcgQEAgZW5kCiAKIG1hY3JvIGRpc3BhdGNoQWZ0ZXJDYWxsKCkKICAg ICBsb2FkaSBBcmd1bWVudENvdW50ICsgVGFnT2Zmc2V0W2Nmcl0sIFBDCi0gICAgam1wIFtQQ10K KyAgICBkaXNwYXRjaCg2KQogZW5kCiAKIG1hY3JvIGNDYWxsMihmdW5jdGlvbiwgYXJnMSwgYXJn MikKQEAgLTE3Nyw5ICsxNzcsOCBAQCBtYWNybyB0cmFjZVZhbHVlKGZyb21XaGVyZSwgb3BlcmFu ZCkKIGVuZAogCiAjIENhbGwgYSBzbG93UGF0aCBmb3IgY2FsbCBvcGNvZGVzLgotbWFjcm8gY2Fs bENhbGxTbG93UGF0aChhZHZhbmNlLCBzbG93UGF0aCwgYWN0aW9uKQotICAgIGFkZHAgYWR2YW5j ZSAqIDQsIFBDLCB0MAotICAgIHN0b3JlcCB0MCwgQXJndW1lbnRDb3VudCArIFRhZ09mZnNldFtj ZnJdCittYWNybyBjYWxsQ2FsbFNsb3dQYXRoKHNsb3dQYXRoLCBhY3Rpb24pCisgICAgc3RvcmVw IFBDLCBBcmd1bWVudENvdW50ICsgVGFnT2Zmc2V0W2Nmcl0KICAgICBjQ2FsbDIoc2xvd1BhdGgs IGNmciwgUEMpCiAgICAgbW92ZSB0MSwgY2ZyCiAgICAgYWN0aW9uKHQwKQpAQCAtMTU4NCwxMyAr MTU4MywxMiBAQCBtYWNybyBkb0NhbGwoc2xvd1BhdGgpCiAgICAgbG9hZENvbnN0YW50T3JWYXJp YWJsZVBheWxvYWQodDAsIENlbGxUYWcsIHQzLCAub3BDYWxsU2xvdykKICAgICBiaW5lcSB0Mywg dDIsIC5vcENhbGxTbG93CiAgICAgbG9hZGkgMTJbUENdLCB0MwotICAgIGFkZHAgMjQsIFBDCiAg ICAgbHNoaWZ0aSAzLCB0MwogICAgIGFkZHAgY2ZyLCB0MyAgIyB0MyBjb250YWlucyB0aGUgbmV3 IHZhbHVlIG9mIGNmcgogICAgIGxvYWRwIEpTRnVuY3Rpb246Om1fc2NvcGVbdDJdLCB0MAogICAg IHN0b3JlaSB0MiwgQ2FsbGVlICsgUGF5bG9hZE9mZnNldFt0M10KICAgICBzdG9yZWkgdDAsIFNj b3BlQ2hhaW4gKyBQYXlsb2FkT2Zmc2V0W3QzXQotICAgIGxvYWRpIDggLSAyNFtQQ10sIHQyCisg ICAgbG9hZGkgOFtQQ10sIHQyCiAgICAgc3RvcmVpIFBDLCBBcmd1bWVudENvdW50ICsgVGFnT2Zm c2V0W2Nmcl0KICAgICBzdG9yZXAgY2ZyLCBDYWxsZXJGcmFtZVt0M10KICAgICBzdG9yZWkgdDIs IEFyZ3VtZW50Q291bnQgKyBQYXlsb2FkT2Zmc2V0W3QzXQpAQCAtMTYwMCw3ICsxNTk4LDcgQEAg bWFjcm8gZG9DYWxsKHNsb3dQYXRoKQogICAgIGNhbGxUYXJnZXRGdW5jdGlvbih0MSkKIAogLm9w Q2FsbFNsb3c6Ci0gICAgc2xvd1BhdGhGb3JDYWxsKDYsIHNsb3dQYXRoKQorICAgIHNsb3dQYXRo Rm9yQ2FsbChzbG93UGF0aCkKIGVuZAogCiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9s bGludC9Mb3dMZXZlbEludGVycHJldGVyNjQuYXNtCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyNjQuYXNtCShyZXZpc2lvbiAxNTA4 NTkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0 LmFzbQkod29ya2luZyBjb3B5KQpAQCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDEx LCAyMDEyIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAy MDExLCAyMDEyLCAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNTUsNyArNTUsNyBAQCBtYWNybyBkaXNwYXRjaEFmdGVy Q2FsbCgpCiAgICAgbG9hZGkgQXJndW1lbnRDb3VudCArIFRhZ09mZnNldFtjZnJdLCBQQwogICAg IGxvYWRwIENvZGVCbG9ja1tjZnJdLCBQQgogICAgIGxvYWRwIENvZGVCbG9jazo6bV9pbnN0cnVj dGlvbnNbUEJdLCBQQgotICAgIGp1bXBUb0luc3RydWN0aW9uKCkKKyAgICBkaXNwYXRjaCg2KQog ZW5kCiAKIG1hY3JvIGNDYWxsMihmdW5jdGlvbiwgYXJnMSwgYXJnMikKQEAgLTExNyw5ICsxMTcs OCBAQCBtYWNybyB0cmFjZVZhbHVlKGZyb21XaGVyZSwgb3BlcmFuZCkKIGVuZAogCiAjIENhbGwg YSBzbG93IHBhdGggZm9yIGNhbGwgY2FsbCBvcGNvZGVzLgotbWFjcm8gY2FsbENhbGxTbG93UGF0 aChhZHZhbmNlLCBzbG93UGF0aCwgYWN0aW9uKQotICAgIGFkZGkgYWR2YW5jZSwgUEMsIHQwCi0g ICAgc3RvcmVpIHQwLCBBcmd1bWVudENvdW50ICsgVGFnT2Zmc2V0W2Nmcl0KK21hY3JvIGNhbGxD YWxsU2xvd1BhdGgoc2xvd1BhdGgsIGFjdGlvbikKKyAgICBzdG9yZWkgUEMsIEFyZ3VtZW50Q291 bnQgKyBUYWdPZmZzZXRbY2ZyXQogICAgIHByZXBhcmVTdGF0ZUZvckNDYWxsKCkKICAgICBjQ2Fs bDIoc2xvd1BhdGgsIGNmciwgUEMpCiAgICAgbW92ZSB0MSwgY2ZyCkBAIC0xNDE5LDEzICsxNDE4 LDEyIEBAIG1hY3JvIGRvQ2FsbChzbG93UGF0aCkKICAgICBsb2FkQ29uc3RhbnRPclZhcmlhYmxl KHQwLCB0MykKICAgICBicW5lcSB0MywgdDIsIC5vcENhbGxTbG93CiAgICAgbG9hZGlzRnJvbUlu c3RydWN0aW9uKDMsIHQzKQotICAgIGFkZGkgNiwgUEMKICAgICBsc2hpZnRpIDMsIHQzCiAgICAg YWRkcCBjZnIsIHQzCiAgICAgbG9hZHAgSlNGdW5jdGlvbjo6bV9zY29wZVt0Ml0sIHQwCiAgICAg c3RvcmVxIHQyLCBDYWxsZWVbdDNdCiAgICAgc3RvcmVxIHQwLCBTY29wZUNoYWluW3QzXQotICAg IGxvYWRpc0Zyb21JbnN0cnVjdGlvbigtNCwgdDIpCisgICAgbG9hZGlzRnJvbUluc3RydWN0aW9u KDIsIHQyKQogICAgIHN0b3JlaSBQQywgQXJndW1lbnRDb3VudCArIFRhZ09mZnNldFtjZnJdCiAg ICAgc3RvcmVxIGNmciwgQ2FsbGVyRnJhbWVbdDNdCiAgICAgc3RvcmVpIHQyLCBBcmd1bWVudENv dW50ICsgUGF5bG9hZE9mZnNldFt0M10KQEAgLTE0MzMsNyArMTQzMSw3IEBAIG1hY3JvIGRvQ2Fs bChzbG93UGF0aCkKICAgICBjYWxsVGFyZ2V0RnVuY3Rpb24odDEpCiAKIC5vcENhbGxTbG93Ogot ICAgIHNsb3dQYXRoRm9yQ2FsbCg2LCBzbG93UGF0aCkKKyAgICBzbG93UGF0aEZvckNhbGwoc2xv d1BhdGgpCiBlbmQKIAogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2 ZWxJbnRlcnByZXRlci5hc20KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2xs aW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuYXNtCShyZXZpc2lvbiAxNTA4NTkpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlci5hc20JKHdvcmtpbmcgY29w eSkKQEAgLTEsNCArMSw0IEBACi0jIENvcHlyaWdodCAoQykgMjAxMSwgMjAxMiBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAxMSwgMjAxMiwgMjAxMyBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKQEAgLTIxOSw5ICsyMTksOCBAQCBtYWNybyBjYWxsVGFyZ2V0RnVuY3Rpb24oY2FsbExpbmtJ bmZvKQogICAgIGVuZAogZW5kCiAKLW1hY3JvIHNsb3dQYXRoRm9yQ2FsbChhZHZhbmNlLCBzbG93 UGF0aCkKK21hY3JvIHNsb3dQYXRoRm9yQ2FsbChzbG93UGF0aCkKICAgICBjYWxsQ2FsbFNsb3dQ YXRoKAotICAgICAgICBhZHZhbmNlLAogICAgICAgICBzbG93UGF0aCwKICAgICAgICAgbWFjcm8g KGNhbGxlZSkKICAgICAgICAgICAgIGlmIENfTE9PUApAQCAtMTA4Myw3ICsxMDgyLDcgQEAgX2xs aW50X29wX2NvbnN0cnVjdDoKIAogX2xsaW50X29wX2NhbGxfdmFyYXJnczoKICAgICB0cmFjZUV4 ZWN1dGlvbigpCi0gICAgc2xvd1BhdGhGb3JDYWxsKDYsIF9sbGludF9zbG93X3BhdGhfY2FsbF92 YXJhcmdzKQorICAgIHNsb3dQYXRoRm9yQ2FsbChfbGxpbnRfc2xvd19wYXRoX2NhbGxfdmFyYXJn cykKIAogCiBfbGxpbnRfb3BfY2FsbF9ldmFsOgpAQCAtMTEyMiw3ICsxMTIxLDcgQEAgX2xsaW50 X29wX2NhbGxfZXZhbDoKICAgICAjIGFuZCBhIFBDIHRvIGNhbGwsIGFuZCB0aGF0IFBDIG1heSBi ZSBhIGR1bW15IHRodW5rIHRoYXQganVzdAogICAgICMgcmV0dXJucyB0aGUgSlMgdmFsdWUgdGhh dCB0aGUgZXZhbCByZXR1cm5lZC4KICAgICAKLSAgICBzbG93UGF0aEZvckNhbGwoNCwgX2xsaW50 X3Nsb3dfcGF0aF9jYWxsX2V2YWwpCisgICAgc2xvd1BhdGhGb3JDYWxsKF9sbGludF9zbG93X3Bh dGhfY2FsbF9ldmFsKQogCiAKIF9sbGludF9nZW5lcmljX3JldHVybl9wb2ludDoKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlci5j cHAJKHJldmlzaW9uIDE1MDg1OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dM ZXZlbEludGVycHJldGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDY3LDcgKzQ2Nyw3IEBAIEpT VmFsdWUgQ0xvb3A6OmV4ZWN1dGUoQ2FsbEZyYW1lKiBjYWxsRnIKICAgICAgICAgLy8gU28sIHdl IG5lZWQgdG8gaW1wbGVtZW50IHRoZSBlcXVpdmFsZW50IG9mIGRpc3BhdGNoQWZ0ZXJDYWxsKCkg aGVyZQogICAgICAgICAvLyBiZWZvcmUgZGlzcGF0Y2hpbmcgdG8gdGhlIFBDLgogCi0gICAgICAg IHZQQyA9IGNhbGxGcmFtZS0+Y3VycmVudFZQQygpOworICAgICAgICB2UEMgPSBjYWxsRnJhbWUt PmN1cnJlbnRWUEMoKSArIE9QQ09ERV9MRU5HVEgob3BfY2FsbCk7CiAKICNpZiBVU0UoSlNWQUxV RTY0KQogICAgICAgICAvLyBCYXNlZCBvbiBMb3dMZXZlbEludGVycHJldGVyNjQuYXNtJ3MgZGlz cGF0Y2hBZnRlckNhbGwoKToK