68319 2011-09-17 19:02:35 -0700 Remove special case handling of inline storage from the JIT 2011-09-18 11:44:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver oldest_to_newest 469130 0 oliver 2011-09-17 19:02:35 -0700 Remove special case handling of inline storage from the JIT 469131 1 107781 oliver 2011-09-17 19:04:22 -0700 Created attachment 107781 Patch 469172 2 oliver 2011-09-18 11:44:19 -0700 Committed r95397: <http://trac.webkit.org/changeset/95397> 107781 2011-09-17 19:04:22 -0700 2011-09-18 09:00:56 -0700 Patch bug-68319-20110917190421.patch text/plain 12841 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogOTUzODgKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGE0 ZjQ1NzVjYjFjMThhYmI4MTBkNWYwMjMzZGRiMGFhMjAwN2M1MGMuLjk2MzMxNWZkNjZhNmNhNjE5 ZmI5ODFmYTIwYmY5YzdiMDdmMTFlNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDI5IEBACisyMDExLTA5LTE3ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CisK KyAgICAgICAgUmVtb3ZlIHNwZWNpYWwgY2FzZSBoYW5kbGluZyBvZiBpbmxpbmUgc3RvcmFnZSBm cm9tIHRoZSBKSVQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY4MzE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgU2ltcGxpZnkgbG9naWMgdXNlZCBmb3IgcmVhZGluZyBhbmQgd3JpdGluZyB0byBwcm9wZXJ0 eSBzdG9yYWdlCisgICAgICAgIGJ5IHJlbW92aW5nIHRoZSBzcGVjaWFsIGNhc2VzIGZvciBpbmxp bmUgc3RvcmFnZS4gIFRoaXMgaGFzIG5vCisgICAgICAgIHBlcmYgaW1wYWN0LgorCisgICAgICAg ICogZGZnL0RGR1JlcGF0Y2guY3BwOgorICAgICAgICAoSlNDOjpERkc6OmdlbmVyYXRlUHJvdG9D aGFpbkFjY2Vzc1N0dWIpOgorICAgICAgICAoSlNDOjpERkc6OnRyeUJ1aWxkR2V0QnlJRExpc3Qp OgorICAgICAgICAqIGppdC9KSVQuaDoKKyAgICAgICAgKiBqaXQvSklUUHJvcGVydHlBY2Nlc3Mu Y3BwOgorICAgICAgICAoSlNDOjpKSVQ6OmNvbXBpbGVQdXREaXJlY3RPZmZzZXQpOgorICAgICAg ICAoSlNDOjpKSVQ6OmNvbXBpbGVHZXREaXJlY3RPZmZzZXQpOgorICAgICAgICAoSlNDOjpKSVQ6 OnByaXZhdGVDb21waWxlUHV0QnlJZFRyYW5zaXRpb24pOgorICAgICAgICAoSlNDOjpKSVQ6OnBy aXZhdGVDb21waWxlR2V0QnlJZFNlbGZMaXN0KToKKyAgICAgICAgKiBqaXQvSklUUHJvcGVydHlB Y2Nlc3MzMl82NC5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6Y29tcGlsZVB1dERpcmVjdE9mZnNl dCk6CisgICAgICAgIChKU0M6OkpJVDo6Y29tcGlsZUdldERpcmVjdE9mZnNldCk6CisgICAgICAg IChKU0M6OkpJVDo6cHJpdmF0ZUNvbXBpbGVQdXRCeUlkVHJhbnNpdGlvbik6CisgICAgICAgIChK U0M6OkpJVDo6cHJpdmF0ZUNvbXBpbGVHZXRCeUlkU2VsZkxpc3QpOgorCiAyMDExLTA5LTE2ICBG aWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgbWV0aG9kX2NoZWNrIHNo b3VsZCByZXBhdGNoIGl0c2VsZiBpZiBpdCBmaW5kcyB0aGF0IHRoZSBuZXcgc3RydWN0dXJlKHMp CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1JlcGF0Y2guY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdSZXBhdGNoLmNwcAppbmRleCBkMDgyYjRjNjI0 MWVlODcxYmJmMmIzOTNlYmViNmQ4ZjRjZWFkNmVkLi41MGE4Y2EyYzY1ZDY4ZDA1YTBmMzJmZjll Y2IzOWQ3ZDU5NjM0NDNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1JlcGF0Y2guY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUmVwYXRjaC5j cHAKQEAgLTEyNCwxMCArMTI0LDcgQEAgc3RhdGljIHZvaWQgZ2VuZXJhdGVQcm90b0NoYWluQWNj ZXNzU3R1YihFeGVjU3RhdGUqIGV4ZWMsIFN0cnVjdHVyZVN0dWJJbmZvJiBzdHUKICAgICAgICAg Y3VyclN0cnVjdHVyZSA9IGl0LT5nZXQoKTsKICAgICB9CiAgICAgCi0gICAgaWYgKHByb3RvT2Jq ZWN0LT5zdHJ1Y3R1cmUoKS0+aXNVc2luZ0lubGluZVN0b3JhZ2UoKSkKLSAgICAgICAgc3R1Ykpp dC5sb2FkUHRyKE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHNjcmF0Y2hHUFIsIEpTT2JqZWN0Ojpv ZmZzZXRPZklubGluZVN0b3JhZ2UoKSArIG9mZnNldCAqIHNpemVvZihKU1ZhbHVlKSksIHJlc3Vs dEdQUik7Ci0gICAgZWxzZQotICAgICAgICBzdHViSml0LmxvYWRQdHIocHJvdG9PYmplY3QtPmFk ZHJlc3NPZlByb3BlcnR5QXRPZmZzZXQob2Zmc2V0KSwgcmVzdWx0R1BSKTsKKyAgICBzdHViSml0 LmxvYWRQdHIocHJvdG9PYmplY3QtPmFkZHJlc3NPZlByb3BlcnR5QXRPZmZzZXQob2Zmc2V0KSwg cmVzdWx0R1BSKTsKICAgICAgICAgCiAgICAgTWFjcm9Bc3NlbWJsZXI6Okp1bXAgc3VjY2Vzcywg ZmFpbDsKICAgICAKQEAgLTMzOSwxNCArMzM2LDEwIEBAIHN0YXRpYyBib29sIHRyeUJ1aWxkR2V0 QnlJRExpc3QoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGJhc2VWYWx1ZSwgY29uc3QgSWRlbnRp CiAgICAgICAgIE1hY3JvQXNzZW1ibGVyIHN0dWJKaXQ7CiAgICAgICAgIAogICAgICAgICBNYWNy b0Fzc2VtYmxlcjo6SnVtcCB3cm9uZ1N0cnVjdCA9IHN0dWJKaXQuYnJhbmNoUHRyKE1hY3JvQXNz ZW1ibGVyOjpOb3RFcXVhbCwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoYmFzZUdQUiwgSlNDZWxs OjpzdHJ1Y3R1cmVPZmZzZXQoKSksIE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKHN0cnVj dHVyZSkpOwotICAgICAgICAKLSAgICAgICAgaWYgKHN0cnVjdHVyZS0+aXNVc2luZ0lubGluZVN0 b3JhZ2UoKSkKLSAgICAgICAgICAgIHN0dWJKaXQubG9hZFB0cihNYWNyb0Fzc2VtYmxlcjo6QWRk cmVzcyhiYXNlR1BSLCBKU09iamVjdDo6b2Zmc2V0T2ZJbmxpbmVTdG9yYWdlKCkgKyBzbG90LmNh Y2hlZE9mZnNldCgpICogc2l6ZW9mKEpTVmFsdWUpKSwgcmVzdWx0R1BSKTsKLSAgICAgICAgZWxz ZSB7Ci0gICAgICAgICAgICBzdHViSml0LmxvYWRQdHIoTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Mo YmFzZUdQUiwgSlNPYmplY3Q6Om9mZnNldE9mUHJvcGVydHlTdG9yYWdlKCkpLCByZXN1bHRHUFIp OwotICAgICAgICAgICAgc3R1YkppdC5sb2FkUHRyKE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHJl c3VsdEdQUiwgc2xvdC5jYWNoZWRPZmZzZXQoKSAqIHNpemVvZihKU1ZhbHVlKSksIHJlc3VsdEdQ Uik7Ci0gICAgICAgIH0KLSAgICAgICAgCisKKyAgICAgICAgc3R1YkppdC5sb2FkUHRyKE1hY3Jv QXNzZW1ibGVyOjpBZGRyZXNzKGJhc2VHUFIsIEpTT2JqZWN0OjpvZmZzZXRPZlByb3BlcnR5U3Rv cmFnZSgpKSwgcmVzdWx0R1BSKTsKKyAgICAgICAgc3R1YkppdC5sb2FkUHRyKE1hY3JvQXNzZW1i bGVyOjpBZGRyZXNzKHJlc3VsdEdQUiwgc2xvdC5jYWNoZWRPZmZzZXQoKSAqIHNpemVvZihKU1Zh bHVlKSksIHJlc3VsdEdQUik7CisKICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6Okp1bXAgc3VjY2Vz cyA9IHN0dWJKaXQuanVtcCgpOwogICAgICAgICAKICAgICAgICAgTGlua0J1ZmZlciBwYXRjaEJ1 ZmZlcigqZ2xvYmFsRGF0YSwgJnN0dWJKaXQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2ppdC9KSVQuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmgKaW5kZXgg Y2IzYTk2ZGE5ZjI2NDc4ZTc2ZWFkNTdkOTU1ZTlhNWE4ZWNhMzA5Yi4uMDJmZjU5MGE4NTNlN2U0 MjRmODA4MDE0NDZmM2E0Njc1YjU1MzdmMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9KSVQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCkBAIC0z NjIsMTAgKzM2MiwxMCBAQCBuYW1lc3BhY2UgSlNDIHsKIAogICAgICAgICB2b2lkIGNvbXBpbGVH ZXRCeUlkSG90UGF0aCgpOwogICAgICAgICB2b2lkIGNvbXBpbGVHZXRCeUlkU2xvd0Nhc2UoaW50 IHJlc3VsdFZSZWcsIGludCBiYXNlVlJlZywgSWRlbnRpZmllciogaWRlbnQsIFZlY3RvcjxTbG93 Q2FzZUVudHJ5Pjo6aXRlcmF0b3ImIGl0ZXIsIGJvb2wgaXNNZXRob2RDaGVjayA9IGZhbHNlKTsK LSAgICAgICAgdm9pZCBjb21waWxlR2V0RGlyZWN0T2Zmc2V0KFJlZ2lzdGVySUQgYmFzZSwgUmVn aXN0ZXJJRCByZXN1bHRUYWcsIFJlZ2lzdGVySUQgcmVzdWx0UGF5bG9hZCwgU3RydWN0dXJlKiBz dHJ1Y3R1cmUsIHNpemVfdCBjYWNoZWRPZmZzZXQpOworICAgICAgICB2b2lkIGNvbXBpbGVHZXRE aXJlY3RPZmZzZXQoUmVnaXN0ZXJJRCBiYXNlLCBSZWdpc3RlcklEIHJlc3VsdFRhZywgUmVnaXN0 ZXJJRCByZXN1bHRQYXlsb2FkLCBzaXplX3QgY2FjaGVkT2Zmc2V0KTsKICAgICAgICAgdm9pZCBj b21waWxlR2V0RGlyZWN0T2Zmc2V0KEpTT2JqZWN0KiBiYXNlLCBSZWdpc3RlcklEIHJlc3VsdFRh ZywgUmVnaXN0ZXJJRCByZXN1bHRQYXlsb2FkLCBzaXplX3QgY2FjaGVkT2Zmc2V0KTsKICAgICAg ICAgdm9pZCBjb21waWxlR2V0RGlyZWN0T2Zmc2V0KFJlZ2lzdGVySUQgYmFzZSwgUmVnaXN0ZXJJ RCByZXN1bHRUYWcsIFJlZ2lzdGVySUQgcmVzdWx0UGF5bG9hZCwgUmVnaXN0ZXJJRCBvZmZzZXQp OwotICAgICAgICB2b2lkIGNvbXBpbGVQdXREaXJlY3RPZmZzZXQoUmVnaXN0ZXJJRCBiYXNlLCBS ZWdpc3RlcklEIHZhbHVlVGFnLCBSZWdpc3RlcklEIHZhbHVlUGF5bG9hZCwgU3RydWN0dXJlKiBz dHJ1Y3R1cmUsIHNpemVfdCBjYWNoZWRPZmZzZXQpOworICAgICAgICB2b2lkIGNvbXBpbGVQdXRE aXJlY3RPZmZzZXQoUmVnaXN0ZXJJRCBiYXNlLCBSZWdpc3RlcklEIHZhbHVlVGFnLCBSZWdpc3Rl cklEIHZhbHVlUGF5bG9hZCwgc2l6ZV90IGNhY2hlZE9mZnNldCk7CiAKICAgICAgICAgLy8gQXJp dGhtZXRpYyBvcGNvZGUgaGVscGVycwogICAgICAgICB2b2lkIGVtaXRBZGQzMkNvbnN0YW50KHVu c2lnbmVkIGRzdCwgdW5zaWduZWQgb3AsIGludDMyX3QgY29uc3RhbnQsIFJlc3VsdFR5cGUgb3BU eXBlKTsKQEAgLTYwNSwxMCArNjA1LDEwIEBAIG5hbWVzcGFjZSBKU0MgewogCiAgICAgICAgIHZv aWQgY29tcGlsZUdldEJ5SWRIb3RQYXRoKGludCBiYXNlVlJlZywgSWRlbnRpZmllciopOwogICAg ICAgICB2b2lkIGNvbXBpbGVHZXRCeUlkU2xvd0Nhc2UoaW50IHJlc3VsdFZSZWcsIGludCBiYXNl VlJlZywgSWRlbnRpZmllciogaWRlbnQsIFZlY3RvcjxTbG93Q2FzZUVudHJ5Pjo6aXRlcmF0b3Im IGl0ZXIsIGJvb2wgaXNNZXRob2RDaGVjayA9IGZhbHNlKTsKLSAgICAgICAgdm9pZCBjb21waWxl R2V0RGlyZWN0T2Zmc2V0KFJlZ2lzdGVySUQgYmFzZSwgUmVnaXN0ZXJJRCByZXN1bHQsIFN0cnVj dHVyZSogc3RydWN0dXJlLCBzaXplX3QgY2FjaGVkT2Zmc2V0KTsKKyAgICAgICAgdm9pZCBjb21w aWxlR2V0RGlyZWN0T2Zmc2V0KFJlZ2lzdGVySUQgYmFzZSwgUmVnaXN0ZXJJRCByZXN1bHQsIHNp emVfdCBjYWNoZWRPZmZzZXQpOwogICAgICAgICB2b2lkIGNvbXBpbGVHZXREaXJlY3RPZmZzZXQo SlNPYmplY3QqIGJhc2UsIFJlZ2lzdGVySUQgcmVzdWx0LCBzaXplX3QgY2FjaGVkT2Zmc2V0KTsK ICAgICAgICAgdm9pZCBjb21waWxlR2V0RGlyZWN0T2Zmc2V0KFJlZ2lzdGVySUQgYmFzZSwgUmVn aXN0ZXJJRCByZXN1bHQsIFJlZ2lzdGVySUQgb2Zmc2V0LCBSZWdpc3RlcklEIHNjcmF0Y2gpOwot ICAgICAgICB2b2lkIGNvbXBpbGVQdXREaXJlY3RPZmZzZXQoUmVnaXN0ZXJJRCBiYXNlLCBSZWdp c3RlcklEIHZhbHVlLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgc2l6ZV90IGNhY2hlZE9mZnNldCk7 CisgICAgICAgIHZvaWQgY29tcGlsZVB1dERpcmVjdE9mZnNldChSZWdpc3RlcklEIGJhc2UsIFJl Z2lzdGVySUQgdmFsdWUsIHNpemVfdCBjYWNoZWRPZmZzZXQpOwogCiAjaWYgQ1BVKFg4Nl82NCkK ICAgICAgICAgLy8gVGhlc2UgYXJjaGl0ZWN0dXJlIHNwZWNpZmljIHZhbHVlIGFyZSB1c2VkIHRv IGVuYWJsZSBwYXRjaGluZyAtIHNlZSBjb21tZW50IG9uIG9wX3B1dF9ieV9pZC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nlc3MuY3BwIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHAKaW5kZXggM2ViMjI2 NWY2NjI5YWUxMjNmZGM2NDg2ZjhhY2Y4MzQ3NjY1NDllNi4uNmVhNzI4Y2QwNTMzYzg1M2VmYzJj NDFhMjk0ZjkxMTNhZGRmOWNiZSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2pp dC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9K SVRQcm9wZXJ0eUFjY2Vzcy5jcHAKQEAgLTQ4MiwyNyArNDgyLDE5IEBAIHZvaWQgSklUOjplbWl0 U2xvd19vcF9wdXRfYnlfaWQoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbiwgVmVjdG9y PFNsb3dDYXNlCiAKIC8vIENvbXBpbGUgYSBzdG9yZSBpbnRvIGFuIG9iamVjdCdzIHByb3BlcnR5 IHN0b3JhZ2UuICBNYXkgb3ZlcndyaXRlIHRoZQogLy8gdmFsdWUgaW4gb2JqZWN0UmVnLgotdm9p ZCBKSVQ6OmNvbXBpbGVQdXREaXJlY3RPZmZzZXQoUmVnaXN0ZXJJRCBiYXNlLCBSZWdpc3RlcklE IHZhbHVlLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgc2l6ZV90IGNhY2hlZE9mZnNldCkKK3ZvaWQg SklUOjpjb21waWxlUHV0RGlyZWN0T2Zmc2V0KFJlZ2lzdGVySUQgYmFzZSwgUmVnaXN0ZXJJRCB2 YWx1ZSwgc2l6ZV90IGNhY2hlZE9mZnNldCkKIHsKICAgICBpbnQgb2Zmc2V0ID0gY2FjaGVkT2Zm c2V0ICogc2l6ZW9mKEpTVmFsdWUpOwotICAgIGlmIChzdHJ1Y3R1cmUtPmlzVXNpbmdJbmxpbmVT dG9yYWdlKCkpCi0gICAgICAgIG9mZnNldCArPSBKU09iamVjdDo6b2Zmc2V0T2ZJbmxpbmVTdG9y YWdlKCk7Ci0gICAgZWxzZQotICAgICAgICBsb2FkUHRyKEFkZHJlc3MoYmFzZSwgSlNPYmplY3Q6 Om9mZnNldE9mUHJvcGVydHlTdG9yYWdlKCkpLCBiYXNlKTsKKyAgICBsb2FkUHRyKEFkZHJlc3Mo YmFzZSwgSlNPYmplY3Q6Om9mZnNldE9mUHJvcGVydHlTdG9yYWdlKCkpLCBiYXNlKTsKICAgICBz dG9yZVB0cih2YWx1ZSwgQWRkcmVzcyhiYXNlLCBvZmZzZXQpKTsKIH0KIAogLy8gQ29tcGlsZSBh IGxvYWQgZnJvbSBhbiBvYmplY3QncyBwcm9wZXJ0eSBzdG9yYWdlLiAgTWF5IG92ZXJ3cml0ZSBi YXNlLgotdm9pZCBKSVQ6OmNvbXBpbGVHZXREaXJlY3RPZmZzZXQoUmVnaXN0ZXJJRCBiYXNlLCBS ZWdpc3RlcklEIHJlc3VsdCwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIHNpemVfdCBjYWNoZWRPZmZz ZXQpCit2b2lkIEpJVDo6Y29tcGlsZUdldERpcmVjdE9mZnNldChSZWdpc3RlcklEIGJhc2UsIFJl Z2lzdGVySUQgcmVzdWx0LCBzaXplX3QgY2FjaGVkT2Zmc2V0KQogewogICAgIGludCBvZmZzZXQg PSBjYWNoZWRPZmZzZXQgKiBzaXplb2YoSlNWYWx1ZSk7Ci0gICAgaWYgKHN0cnVjdHVyZS0+aXNV c2luZ0lubGluZVN0b3JhZ2UoKSkgewotICAgICAgICBvZmZzZXQgKz0gSlNPYmplY3Q6Om9mZnNl dE9mSW5saW5lU3RvcmFnZSgpOwotICAgICAgICBsb2FkUHRyKEFkZHJlc3MoYmFzZSwgb2Zmc2V0 KSwgcmVzdWx0KTsKLSAgICB9IGVsc2UgewotICAgICAgICBsb2FkUHRyKEFkZHJlc3MoYmFzZSwg SlNPYmplY3Q6Om9mZnNldE9mUHJvcGVydHlTdG9yYWdlKCkpLCByZXN1bHQpOwotICAgICAgICBs b2FkUHRyKEFkZHJlc3MocmVzdWx0LCBvZmZzZXQpLCByZXN1bHQpOwotICAgIH0KKyAgICBsb2Fk UHRyKEFkZHJlc3MoYmFzZSwgSlNPYmplY3Q6Om9mZnNldE9mUHJvcGVydHlTdG9yYWdlKCkpLCBy ZXN1bHQpOworICAgIGxvYWRQdHIoQWRkcmVzcyhyZXN1bHQsIG9mZnNldCksIHJlc3VsdCk7CiB9 CiAKIHZvaWQgSklUOjpjb21waWxlR2V0RGlyZWN0T2Zmc2V0KEpTT2JqZWN0KiBiYXNlLCBSZWdp c3RlcklEIHJlc3VsdCwgc2l6ZV90IGNhY2hlZE9mZnNldCkKQEAgLTU0OCw3ICs1NDAsNyBAQCB2 b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVQdXRCeUlkVHJhbnNpdGlvbihTdHJ1Y3R1cmVTdHViSW5m byogc3R1YkluZm8sIFN0cnVjdHVyZQogICAgIGVtaXRXcml0ZUJhcnJpZXIocmVnVDAsIHJlZ1Qy LCBXcml0ZUJhcnJpZXJGb3JQcm9wZXJ0eUFjY2Vzcyk7CiAKICAgICBzdG9yZVB0cihUcnVzdGVk SW1tUHRyKG5ld1N0cnVjdHVyZSksIEFkZHJlc3MocmVnVDAsIEpTQ2VsbDo6c3RydWN0dXJlT2Zm c2V0KCkpKTsKLSAgICBjb21waWxlUHV0RGlyZWN0T2Zmc2V0KHJlZ1QwLCByZWdUMSwgbmV3U3Ry dWN0dXJlLCBjYWNoZWRPZmZzZXQpOworICAgIGNvbXBpbGVQdXREaXJlY3RPZmZzZXQocmVnVDAs IHJlZ1QxLCBjYWNoZWRPZmZzZXQpOwogCiAgICAgcmV0KCk7CiAgICAgCkBAIC03MDcsNyArNjk5 LDcgQEAgdm9pZCBKSVQ6OnByaXZhdGVDb21waWxlR2V0QnlJZFNlbGZMaXN0KFN0cnVjdHVyZVN0 dWJJbmZvKiBzdHViSW5mbywgUG9seW1vcnBoaWMKICAgICBib29sIG5lZWRzU3R1YkxpbmsgPSBm YWxzZTsKICAgICBpZiAoc2xvdC5jYWNoZWRQcm9wZXJ0eVR5cGUoKSA9PSBQcm9wZXJ0eVNsb3Q6 OkdldHRlcikgewogICAgICAgICBuZWVkc1N0dWJMaW5rID0gdHJ1ZTsKLSAgICAgICAgY29tcGls ZUdldERpcmVjdE9mZnNldChyZWdUMCwgcmVnVDEsIHN0cnVjdHVyZSwgY2FjaGVkT2Zmc2V0KTsK KyAgICAgICAgY29tcGlsZUdldERpcmVjdE9mZnNldChyZWdUMCwgcmVnVDEsIGNhY2hlZE9mZnNl dCk7CiAgICAgICAgIEpJVFN0dWJDYWxsIHN0dWJDYWxsKHRoaXMsIGN0aV9vcF9nZXRfYnlfaWRf Z2V0dGVyX3N0dWIpOwogICAgICAgICBzdHViQ2FsbC5hZGRBcmd1bWVudChyZWdUMSk7CiAgICAg ICAgIHN0dWJDYWxsLmFkZEFyZ3VtZW50KHJlZ1QwKTsKQEAgLTcyMiw3ICs3MTQsNyBAQCB2b2lk IEpJVDo6cHJpdmF0ZUNvbXBpbGVHZXRCeUlkU2VsZkxpc3QoU3RydWN0dXJlU3R1YkluZm8qIHN0 dWJJbmZvLCBQb2x5bW9ycGhpYwogICAgICAgICBzdHViQ2FsbC5hZGRBcmd1bWVudChUcnVzdGVk SW1tUHRyKHN0dWJJbmZvLT5jYWxsUmV0dXJuTG9jYXRpb24uZXhlY3V0YWJsZUFkZHJlc3MoKSkp OwogICAgICAgICBzdHViQ2FsbC5jYWxsKCk7CiAgICAgfSBlbHNlCi0gICAgICAgIGNvbXBpbGVH ZXREaXJlY3RPZmZzZXQocmVnVDAsIHJlZ1QwLCBzdHJ1Y3R1cmUsIGNhY2hlZE9mZnNldCk7Cisg ICAgICAgIGNvbXBpbGVHZXREaXJlY3RPZmZzZXQocmVnVDAsIHJlZ1QwLCBjYWNoZWRPZmZzZXQp OwogICAgIEp1bXAgc3VjY2VzcyA9IGp1bXAoKTsKIAogICAgIExpbmtCdWZmZXIgcGF0Y2hCdWZm ZXIoKm1fZ2xvYmFsRGF0YSwgdGhpcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaml0L0pJVFByb3BlcnR5QWNjZXNzMzJfNjQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9KSVRQcm9wZXJ0eUFjY2VzczMyXzY0LmNwcAppbmRleCA3MmIxOWU2YzUxNzk2YjczNWZm ZjRiYTM1NmU0NWVkZTEwYWMwOTE3Li41Y2VjMmI2OTE1ZTBlYzFhYjg1ZDY5ZGNjOWJjYWNkYjFm NmRjMjg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFByb3BlcnR5 QWNjZXNzMzJfNjQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVy dHlBY2Nlc3MzMl82NC5jcHAKQEAgLTQ0MCwyOCArNDQwLDIwIEBAIHZvaWQgSklUOjplbWl0U2xv d19vcF9wdXRfYnlfaWQoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbiwgVmVjdG9yPFNs b3dDYXNlCiB9CiAKIC8vIENvbXBpbGUgYSBzdG9yZSBpbnRvIGFuIG9iamVjdCdzIHByb3BlcnR5 IHN0b3JhZ2UuICBNYXkgb3ZlcndyaXRlIGJhc2UuCi12b2lkIEpJVDo6Y29tcGlsZVB1dERpcmVj dE9mZnNldChSZWdpc3RlcklEIGJhc2UsIFJlZ2lzdGVySUQgdmFsdWVUYWcsIFJlZ2lzdGVySUQg dmFsdWVQYXlsb2FkLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgc2l6ZV90IGNhY2hlZE9mZnNldCkK K3ZvaWQgSklUOjpjb21waWxlUHV0RGlyZWN0T2Zmc2V0KFJlZ2lzdGVySUQgYmFzZSwgUmVnaXN0 ZXJJRCB2YWx1ZVRhZywgUmVnaXN0ZXJJRCB2YWx1ZVBheWxvYWQsIHNpemVfdCBjYWNoZWRPZmZz ZXQpCiB7CiAgICAgaW50IG9mZnNldCA9IGNhY2hlZE9mZnNldDsKLSAgICBpZiAoc3RydWN0dXJl LT5pc1VzaW5nSW5saW5lU3RvcmFnZSgpKQotICAgICAgICBvZmZzZXQgKz0gSlNPYmplY3Q6Om9m ZnNldE9mSW5saW5lU3RvcmFnZSgpIC8gIHNpemVvZihSZWdpc3Rlcik7Ci0gICAgZWxzZQotICAg ICAgICBsb2FkUHRyKEFkZHJlc3MoYmFzZSwgSlNPYmplY3Q6Om9mZnNldE9mUHJvcGVydHlTdG9y YWdlKCkpLCBiYXNlKTsKKyAgICBsb2FkUHRyKEFkZHJlc3MoYmFzZSwgSlNPYmplY3Q6Om9mZnNl dE9mUHJvcGVydHlTdG9yYWdlKCkpLCBiYXNlKTsKICAgICBlbWl0U3RvcmUob2Zmc2V0LCB2YWx1 ZVRhZywgdmFsdWVQYXlsb2FkLCBiYXNlKTsKIH0KIAogLy8gQ29tcGlsZSBhIGxvYWQgZnJvbSBh biBvYmplY3QncyBwcm9wZXJ0eSBzdG9yYWdlLiAgTWF5IG92ZXJ3cml0ZSBiYXNlLgotdm9pZCBK SVQ6OmNvbXBpbGVHZXREaXJlY3RPZmZzZXQoUmVnaXN0ZXJJRCBiYXNlLCBSZWdpc3RlcklEIHJl c3VsdFRhZywgUmVnaXN0ZXJJRCByZXN1bHRQYXlsb2FkLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwg c2l6ZV90IGNhY2hlZE9mZnNldCkKK3ZvaWQgSklUOjpjb21waWxlR2V0RGlyZWN0T2Zmc2V0KFJl Z2lzdGVySUQgYmFzZSwgUmVnaXN0ZXJJRCByZXN1bHRUYWcsIFJlZ2lzdGVySUQgcmVzdWx0UGF5 bG9hZCwgc2l6ZV90IGNhY2hlZE9mZnNldCkKIHsKICAgICBpbnQgb2Zmc2V0ID0gY2FjaGVkT2Zm c2V0OwotICAgIGlmIChzdHJ1Y3R1cmUtPmlzVXNpbmdJbmxpbmVTdG9yYWdlKCkpIHsKLSAgICAg ICAgb2Zmc2V0ICs9IEpTT2JqZWN0OjpvZmZzZXRPZklubGluZVN0b3JhZ2UoKSAvIHNpemVvZihS ZWdpc3Rlcik7Ci0gICAgICAgIGVtaXRMb2FkKG9mZnNldCwgcmVzdWx0VGFnLCByZXN1bHRQYXls b2FkLCBiYXNlKTsKLSAgICB9IGVsc2UgewotICAgICAgICBSZWdpc3RlcklEIHRlbXAgPSByZXN1 bHRQYXlsb2FkOwotICAgICAgICBsb2FkUHRyKEFkZHJlc3MoYmFzZSwgSlNPYmplY3Q6Om9mZnNl dE9mUHJvcGVydHlTdG9yYWdlKCkpLCB0ZW1wKTsKLSAgICAgICAgZW1pdExvYWQob2Zmc2V0LCBy ZXN1bHRUYWcsIHJlc3VsdFBheWxvYWQsIHRlbXApOwotICAgIH0KKyAgICBSZWdpc3RlcklEIHRl bXAgPSByZXN1bHRQYXlsb2FkOworICAgIGxvYWRQdHIoQWRkcmVzcyhiYXNlLCBKU09iamVjdDo6 b2Zmc2V0T2ZQcm9wZXJ0eVN0b3JhZ2UoKSksIHRlbXApOworICAgIGVtaXRMb2FkKG9mZnNldCwg cmVzdWx0VGFnLCByZXN1bHRQYXlsb2FkLCB0ZW1wKTsKIH0KIAogdm9pZCBKSVQ6OmNvbXBpbGVH ZXREaXJlY3RPZmZzZXQoSlNPYmplY3QqIGJhc2UsIFJlZ2lzdGVySUQgcmVzdWx0VGFnLCBSZWdp c3RlcklEIHJlc3VsdFBheWxvYWQsIHNpemVfdCBjYWNoZWRPZmZzZXQpCkBAIC01MzQsNyArNTI2 LDcgQEAgdm9pZCBKSVQ6OnByaXZhdGVDb21waWxlUHV0QnlJZFRyYW5zaXRpb24oU3RydWN0dXJl U3R1YkluZm8qIHN0dWJJbmZvLCBTdHJ1Y3R1cmUKICAgICBsb2FkMzIoQWRkcmVzcyhzdGFja1Bv aW50ZXJSZWdpc3RlciwgT0JKRUNUX09GRlNFVE9GKEpJVFN0YWNrRnJhbWUsIGFyZ3NbMl0pICsg c2l6ZW9mKHZvaWQqKSArIE9CSkVDVF9PRkZTRVRPRihKU1ZhbHVlLCB1LmFzQml0cy5wYXlsb2Fk KSksIHJlZ1QzKTsKICAgICBsb2FkMzIoQWRkcmVzcyhzdGFja1BvaW50ZXJSZWdpc3RlciwgT0JK RUNUX09GRlNFVE9GKEpJVFN0YWNrRnJhbWUsIGFyZ3NbMl0pICsgc2l6ZW9mKHZvaWQqKSArIE9C SkVDVF9PRkZTRVRPRihKU1ZhbHVlLCB1LmFzQml0cy50YWcpKSwgcmVnVDIpOwogI2VuZGlmCi0g ICAgY29tcGlsZVB1dERpcmVjdE9mZnNldChyZWdUMCwgcmVnVDIsIHJlZ1QzLCBuZXdTdHJ1Y3R1 cmUsIGNhY2hlZE9mZnNldCk7CisgICAgY29tcGlsZVB1dERpcmVjdE9mZnNldChyZWdUMCwgcmVn VDIsIHJlZ1QzLCBjYWNoZWRPZmZzZXQpOwogICAgIAogICAgIHJldCgpOwogICAgIApAQCAtNzAz LDcgKzY5NSw3IEBAIHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZUdldEJ5SWRTZWxmTGlzdChTdHJ1 Y3R1cmVTdHViSW5mbyogc3R1YkluZm8sIFBvbHltb3JwaGljCiAgICAgYm9vbCBuZWVkc1N0dWJM aW5rID0gZmFsc2U7CiAgICAgaWYgKHNsb3QuY2FjaGVkUHJvcGVydHlUeXBlKCkgPT0gUHJvcGVy dHlTbG90OjpHZXR0ZXIpIHsKICAgICAgICAgbmVlZHNTdHViTGluayA9IHRydWU7Ci0gICAgICAg IGNvbXBpbGVHZXREaXJlY3RPZmZzZXQocmVnVDAsIHJlZ1QyLCByZWdUMSwgc3RydWN0dXJlLCBj YWNoZWRPZmZzZXQpOworICAgICAgICBjb21waWxlR2V0RGlyZWN0T2Zmc2V0KHJlZ1QwLCByZWdU MiwgcmVnVDEsIGNhY2hlZE9mZnNldCk7CiAgICAgICAgIEpJVFN0dWJDYWxsIHN0dWJDYWxsKHRo aXMsIGN0aV9vcF9nZXRfYnlfaWRfZ2V0dGVyX3N0dWIpOwogICAgICAgICBzdHViQ2FsbC5hZGRB cmd1bWVudChyZWdUMSk7CiAgICAgICAgIHN0dWJDYWxsLmFkZEFyZ3VtZW50KHJlZ1QwKTsKQEAg LTcxOCw3ICs3MTAsNyBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVHZXRCeUlkU2VsZkxpc3Qo U3RydWN0dXJlU3R1YkluZm8qIHN0dWJJbmZvLCBQb2x5bW9ycGhpYwogICAgICAgICBzdHViQ2Fs bC5hZGRBcmd1bWVudChUcnVzdGVkSW1tUHRyKHN0dWJJbmZvLT5jYWxsUmV0dXJuTG9jYXRpb24u ZXhlY3V0YWJsZUFkZHJlc3MoKSkpOwogICAgICAgICBzdHViQ2FsbC5jYWxsKCk7CiAgICAgfSBl bHNlCi0gICAgICAgIGNvbXBpbGVHZXREaXJlY3RPZmZzZXQocmVnVDAsIHJlZ1QxLCByZWdUMCwg c3RydWN0dXJlLCBjYWNoZWRPZmZzZXQpOworICAgICAgICBjb21waWxlR2V0RGlyZWN0T2Zmc2V0 KHJlZ1QwLCByZWdUMSwgcmVnVDAsIGNhY2hlZE9mZnNldCk7CiAKICAgICBKdW1wIHN1Y2Nlc3Mg PSBqdW1wKCk7CiAgICAgCg==