128719 2014-02-12 19:39:08 -0800 No need to save reservedZoneSize when dropping the JSLock 2014-02-12 22:46:04 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam benjamin cmarcelo commit-queue fpizlo ggaren mhahnenberg mmirman msaboff oliver oldest_to_newest 980141 0 mark.lam 2014-02-12 19:39:08 -0800 The reservedZoneSize does not change due to the VM being run on a different thread. Hence, there is no need to save and restore its value. Instead of calling updateReservedZoneSize() to update the stack limit, we now call updateStackPointerAtVMEntry() to do the job. updateStackPointerAtVMEntry() will update the stackPointerAtVMEntry and delegate to updateStackLimit() to update the stack limit based on the new stackPointerAtVMEntry. 980145 1 224043 mark.lam 2014-02-12 19:49:52 -0800 Created attachment 224043 the patch. 980171 2 224043 ggaren 2014-02-12 22:30:50 -0800 Comment on attachment 224043 the patch. View in context: https://bugs.webkit.org/attachment.cgi?id=224043&action=review r=me > Source/JavaScriptCore/runtime/VM.cpp:735 > +void VM::updateStackPointerAtVMEntry(void* sp) This should be named "setStackPointerAtVMEntry". 980174 3 mark.lam 2014-02-12 22:46:04 -0800 Thanks for the review. The patch has been updated and landed in r164018: <http://trac.webkit.org/r164018>. 224043 2014-02-12 19:49:52 -0800 2014-02-12 22:30:50 -0800 the patch. bug-128719.patch text/plain 14117 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYzOTk5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDg4IEBA CisyMDE0LTAyLTEyICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBO byBuZWVkIHRvIHNhdmUgcmVzZXJ2ZWRab25lU2l6ZSB3aGVuIGRyb3BwaW5nIHRoZSBKU0xvY2su CisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjg3MTk+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHJlc2VydmVkWm9uZVNpemUgZG9l cyBub3QgY2hhbmdlIGR1ZSB0byB0aGUgVk0gYmVpbmcgcnVuIG9uIGEgZGlmZmVyZW50CisgICAg ICAgIHRocmVhZC4gSGVuY2UsIHRoZXJlIGlzIG5vIG5lZWQgdG8gc2F2ZSBhbmQgcmVzdG9yZSBp dHMgdmFsdWUuIEluc3RlYWQgb2YKKyAgICAgICAgY2FsbGluZyB1cGRhdGVSZXNlcnZlZFpvbmVT aXplKCkgdG8gdXBkYXRlIHRoZSBzdGFjayBsaW1pdCwgd2Ugbm93IGNhbGwKKyAgICAgICAgdXBk YXRlU3RhY2tQb2ludGVyQXRWTUVudHJ5KCkgdG8gZG8gdGhlIGpvYi4gdXBkYXRlU3RhY2tQb2lu dGVyQXRWTUVudHJ5KCkKKyAgICAgICAgd2lsbCB1cGRhdGUgdGhlIHN0YWNrUG9pbnRlckF0Vk1F bnRyeSBhbmQgZGVsZWdhdGUgdG8gdXBkYXRlU3RhY2tMaW1pdCgpIHRvCisgICAgICAgIHVwZGF0 ZSB0aGUgc3RhY2sgbGltaXQgYmFzZWQgb24gdGhlIG5ldyBzdGFja1BvaW50ZXJBdFZNRW50cnku CisKKyAgICAgICAgKiBydW50aW1lL0Vycm9ySGFuZGxpbmdTY29wZS5jcHA6CisgICAgICAgIChK U0M6OkVycm9ySGFuZGxpbmdTY29wZTo6RXJyb3JIYW5kbGluZ1Njb3BlKToKKyAgICAgICAgKEpT Qzo6RXJyb3JIYW5kbGluZ1Njb3BlOjp+RXJyb3JIYW5kbGluZ1Njb3BlKToKKyAgICAgICAgLSBQ cmV2aW91c2x5LCB3ZSBpbml0aWFsaXplIHN0YWNrUG9pbnRlckF0Vk1FbnRyeSBpbiBWTUVudHJ5 U2NvcGUuIFRoaXMKKyAgICAgICAgICBtZWFucyB0aGF0IHRoZSBzdGFja1BvaW50ZXJBdFZNRW50 cnkgbWF5IG5vdCBiZSBpbml0aWFsaXplIHdoZW4gd2UKKyAgICAgICAgICBpbnN0YW50aWF0ZSB0 aGUgRXJyb3JIYW5kbGluZ1Njb3BlLiBBbmQgc28sIHdlIG5lZWRlZCB0byBpbml0aWFsaXplIHRo ZQorICAgICAgICAgIHN0YWNrUG9pbnRlckF0Vk1FbnRyeSBpbiB0aGUgRXJyb3JIYW5kbGluZ1Nj b3BlIGNvbnN0cnVjdG9yIGlmIGl0J3Mgbm90CisgICAgICAgICAgYWxyZWFkeSBpbml0aWFsaXpl ZC4KKworICAgICAgICAgIE5vdyB0aGF0IHdlIGluaXRpYWxpemUgdGhlIHN0YWNrUG9pbnRlckF0 Vk1FbnRyeSB3aGVuIHdlIGxvY2sgdGhlIFZNIEpTTG9jaywKKyAgICAgICAgICB3ZSBhcmUgZ3Vh cmFudGVlZCB0aGF0IGl0IHdpbGwgYmUgaW5pdGlhbGl6ZWQgYnkgdGhlIHRpbWUgd2UgaW5zdGFu dGlhdGUKKyAgICAgICAgICB0aGUgRXJyb3JIYW5kbGluZ1Njb3BlLiBIZW5jZSwgd2UgY2FuIGNo YW5nZSB0aGUgRXJyb3JIYW5kbGluZ1Njb3BlIGNvZGUKKyAgICAgICAgICB0byBqdXN0IGFzc2Vy dCB0aGF0IHRoZSBzdGFja1BvaW50ZXJBdFZNRW50cnkgaXMgaW5pdGlhbGl6ZWQgaW5zdGVhZC4K KworICAgICAgICAqIHJ1bnRpbWUvSW5pdGlhbGl6ZVRocmVhZGluZy5jcHA6CisgICAgICAgIChK U0M6OmluaXRpYWxpemVUaHJlYWRpbmcpOgorICAgICAgICAtIFdlIG5vIGxvbmdlciBuZWVkIHRv IHNhdmUgdGhlIHJlc2VydmVkWm9uZVNpemUuIFJlbW92ZSB0aGUgcmVsYXRlZCBjb2RlLgorCisg ICAgICAgICogcnVudGltZS9KU0xvY2suY3BwOgorICAgICAgICAoSlNDOjpKU0xvY2s6OmxvY2sp OgorICAgICAgICAtIFdoZW4gd2UgZ3JhYiB0aGUgSlNMb2NrIG11dGV4IGZvciB0aGUgZmlyc3Qg dGltZSwgdGhlcmUgaXMgbm8gcmVhc29uIHdoeQorICAgICAgICAgIHRoZSBzdGFja1BvaW50ZXJB dFZNRW50cnkgc2hvdWxkIGJlIGluaXRpYWxpemVkLiBCeSBkZWZpbml0aW9uLCBncmFiYmluZwor ICAgICAgICAgIHRoZSBsb2NrIGZvciB0aGUgZmlyc3QgdGltZSBlcXVhdGVzIHRvIGVudGVyaW5n IHRoZSBWTSBmb3IgdGhlIGZpcnN0IHRpbWUuCisgICAgICAgICAgSGVuY2UsIHdlIGNhbiBqdXN0 IGFzc2VydCB0aGF0IHN0YWNrUG9pbnRlckF0Vk1FbnRyeSBpcyB1bmluaXRpYWxpemVkLAorICAg ICAgICAgIGFuZCBpbml0aWFsaXplIGl0IHVuY29uZGl0aW9uYWxseS4KKworICAgICAgICAgIFRo ZSBvbmx5IGV4Y2VwdGlvbiB0byB0aGlzIGlzIGlmIHdlJ3JlIGxvY2tpbmcgdG8gcmVncmFiIHRo ZSBKU0xvY2sgaW4KKyAgICAgICAgICBncmFiQWxsTG9ja3MoKSwgYnV0IGdyYWJBbGxMb2Nrcygp IHdpbGwgdGFrZSBjYXJlIG9mIHJlc3RvcmluZyB0aGUKKyAgICAgICAgICBzdGFja1BvaW50ZXJB dFZNRW50cnkgaW4gdGhhdCBjYXNlIGFmdGVyIGxvY2soKSByZXR1cm5zLiBzdGFja1BvaW50ZXJB dFZNRW50cnkKKyAgICAgICAgICBzaG91bGQgc3RpbGwgYmUgMCB3aGVuIHdlJ3ZlIGp1c3QgbG9j a2VkIHRoZSBKU0xvY2suIFNvLCB0aGUgYWJvdmUgYXNzZXJ0aW9uCisgICAgICAgICAgYWx3YXlz IGhvbGRzIHRydWUuCisKKyAgICAgICAgICBOb3RlOiBWTTo6dXBkYXRlU3RhY2tQb2ludGVyQXRW TUVudHJ5KCkgd2lsbCB0YWtlIGNhcmUgb2YgY2FsbGluZworICAgICAgICAgIFZNOjp1cGRhdGVT dGFja0xpbWl0KCkgYmFzZWQgb24gdGhlIG5ldyBzdGFja1BvaW50ZXJBdFZNRW50cnkuCisKKyAg ICAgICAgLSBUaGVyZSBpcyBubyBuZWVkIHRvIHNhdmUgdGhlIHJlc2VydmVkWm9uZVNpemUuIFRo ZSByZXNlcnZlZFpvbmVTaXplIGlzCisgICAgICAgICAgc2V0IHRvIE9wdGlvbnM6OnJlc2VydmVk Wm9uZVNpemUoKSB3aGVuIHRoZSBWTSBpcyBpbml0aWFsaXplZC4gVGhlcmVhZnRlciwKKyAgICAg ICAgICB0aGUgRXJyb3JIYW5kbGluZ1Njb3BlIHdpbGwgY2hhbmdlIGl0IHRvIE9wdGlvbnM6OmVy cm9yTW9kZVJlc2VydmVkWm9uZVNpemUoKQorICAgICAgICAgIHdoZW4gd2UncmUgaGFuZGxpbmcg YW4gZXJyb3IsIGFuZCBpdCB3aWxsIHJlc3RvcmUgaXQgYWZ0ZXJ3YXJkcy4gVGhlcmUgaXMKKyAg ICAgICAgICBubyBvdGhlciByZWFzb24gd2Ugc2hvdWxkIGJlIGNoYW5naW5nIHRoZSByZXNlcnZl ZFpvbmVTaXplLiBIZW5jZSwgd2UgY2FuCisgICAgICAgICAgcmVtb3ZlIHRoZSB1bm5lY2Vzc2Fy eSBjb2RlIHRvIHNhdmUgaXQgaGVyZS4KKworICAgICAgICAoSlNDOjpKU0xvY2s6OnVubG9jayk6 CisgICAgICAgIC0gU2ltaWxhcmx5LCB3aGVuIHRoZSBsb2NrQ291bnQgcmVhY2hlcyAwIGluIHVu bG9jaygpLCBpdCBpcyBzeW5vbnltb3VzIHdpdGgKKyAgICAgICAgICBleGl0aW5nIHRoZSBWTS4g SGVuY2UsIHdlIHNob3VsZCBqdXN0IGNsZWFyIHRoZSBzdGFja1BvaW50ZXJBdFZNRW50cnkgYW5k CisgICAgICAgICAgdXBkYXRlIHRoZSBzdGFja0xpbWl0LiBFeGl0aW5nIHRoZSBWTSBzaG91bGQg aGF2ZSBubyBlZmZlY3Qgb24gdGhlIFZNCisgICAgICAgICAgcmVzZXJ2ZWRab25lU2l6ZS4gSGVu Y2UsIHdlIGNhbiByZW1vdmUgdGhlIHVubmVjZXNzYXJ5IGNvZGUgdG8gInJlc3RvcmUiIGl0Lgor CisgICAgICAgIChKU0M6OkpTTG9jazo6ZHJvcEFsbExvY2tzKToKKyAgICAgICAgLSBXaGVuIGRy b3BwaW5nIGxvY2tzLCB3ZSBkbyBub3QgbmVlZCB0byBzYXZlIHRoZSByZXNlcnZlZFpvbmVTaXpl IGJlY2F1c2UKKyAgICAgICAgICB0aGUgcmVzZXJ2ZWRab25lU2l6ZSBzaG91bGQgcmVtYWluIHRo ZSBzYW1lIHJlZ2FyZGxlc3Mgb2Ygd2hpY2ggdGhyZWFkCisgICAgICAgICAgd2UgYXJlIGV4ZWN1 dGluZyBKUyBvbi4gSGVuY2UsIHdlIGNhbiByZW1vdmUgdGhlIHVubmVjZXNzYXJ5IGNvZGUgdG8g c2F2ZQorICAgICAgICAgIHRoZSByZXNlcnZlZFpvbmVTaXplIGhlcmUuCisKKyAgICAgICAgKEpT Qzo6SlNMb2NrOjpncmFiQWxsTG9ja3MpOgorICAgICAgICAtIFdoZW4gcmUtZ3JhYmJpbmcgbG9j a3MsIHJlc3RvcmluZyB0aGUgc3RhY2tQb2ludGVyQXRWTUVudHJ5IHZpYQorICAgICAgICAgIFZN Ojp1cGRhdGVTdGFja1BvaW50ZXJBdFZNRW50cnkoKSB3aWxsIHRha2UgY2FyZSBvZiB1cGRhdGlu ZyB0aGUgc3RhY2sgbGltaXQuCisgICAgICAgICAgQXMgZXhwbGFpbmVkIGFib3ZlLCB0aGVyZSdz IG5vIG5lZWQgdG8gc2F2ZSB0aGUgcmVzZXJ2ZWRab25lU2l6ZS4gSGVuY2UsCisgICAgICAgICAg dGhlcmUncyBubyBuZWVkIHRvICJyZXN0b3JlIiBpdCBoZXJlLgorCisgICAgICAgICogcnVudGlt ZS9WTS5jcHA6CisgICAgICAgIChKU0M6OlZNOjpWTSk6CisgICAgICAgIChKU0M6OlZNOjp1cGRh dGVTdGFja1BvaW50ZXJBdFZNRW50cnkpOgorICAgICAgICAtIFNldHMgdGhlIHN0YWNrUG9pbnRl ckF0Vk1FbnRyeSBhbmQgZGVsZWdhdGVzIHRvIHVwZGF0ZVN0YWNrTGltaXQoKSB0byB1cGRhdGUK KyAgICAgICAgICB0aGUgc3RhY2sgbGltaXQgYmFzZWQgb24gdGhlIG5ldyBzdGFja1BvaW50ZXJB dFZNRW50cnkuCisgICAgICAgIChKU0M6OlZNOjp1cGRhdGVTdGFja0xpbWl0KToKKyAgICAgICAg KiBydW50aW1lL1ZNLmg6CisgICAgICAgIChKU0M6OlZNOjpzdGFja1BvaW50ZXJBdFZNRW50cnkp OgorICAgICAgICAtIFJlbmFtZWQgc3RhY2tQb2ludGVyQXRWTUVudHJ5IHRvIG1fc3RhY2tQb2lu dGVyQXRWTUVudHJ5IGFuZCBtYWRlIGl0IHByaXZhdGUuCisgICAgICAgICAgQWRkZWQgYSBzdGFj a1BvaW50ZXJBdFZNRW50cnkoKSBmdW5jdGlvbiB0byByZWFkIHRoZSB2YWx1ZS4KKwogMjAxNC0w Mi0xMiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IENsZWFudXAgSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FcnJvckhhbmRsaW5nU2NvcGUuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Vycm9ySGFuZGxpbmdTY29wZS5j cHAJKHJldmlzaW9uIDE2Mzk5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Vy cm9ySGFuZGxpbmdTY29wZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1LDggKzM1LDcgQEAgbmFt ZXNwYWNlIEpTQyB7CiBFcnJvckhhbmRsaW5nU2NvcGU6OkVycm9ySGFuZGxpbmdTY29wZShWTSYg dm0pCiAgICAgOiBtX3ZtKHZtKQogewotICAgIGlmICghbV92bS5zdGFja1BvaW50ZXJBdFZNRW50 cnkpCi0gICAgICAgIG1fdm0uc3RhY2tQb2ludGVyQXRWTUVudHJ5ID0gdGhpczsKKyAgICBSRUxF QVNFX0FTU0VSVChtX3ZtLnN0YWNrUG9pbnRlckF0Vk1FbnRyeSgpKTsKICAgICBzaXplX3QgbmV3 UmVzZXJ2ZWRab25lU2l6ZSA9IE9wdGlvbnM6OmVycm9yTW9kZVJlc2VydmVkWm9uZVNpemUoKTsK ICAgICBtX3NhdmVkUmVzZXJ2ZWRab25lU2l6ZSA9IG1fdm0udXBkYXRlUmVzZXJ2ZWRab25lU2l6 ZShuZXdSZXNlcnZlZFpvbmVTaXplKTsKICNpZiBFTkFCTEUoTExJTlRfQ19MT09QKQpAQCAtNDYs OCArNDUsNyBAQCBFcnJvckhhbmRsaW5nU2NvcGU6OkVycm9ySGFuZGxpbmdTY29wZShWCiAKIEVy cm9ySGFuZGxpbmdTY29wZTo6fkVycm9ySGFuZGxpbmdTY29wZSgpCiB7Ci0gICAgaWYgKG1fdm0u c3RhY2tQb2ludGVyQXRWTUVudHJ5ID09IHRoaXMpCi0gICAgICAgIG1fdm0uc3RhY2tQb2ludGVy QXRWTUVudHJ5ID0gbnVsbHB0cjsKKyAgICBSRUxFQVNFX0FTU0VSVChtX3ZtLnN0YWNrUG9pbnRl ckF0Vk1FbnRyeSgpKTsKICAgICBtX3ZtLnVwZGF0ZVJlc2VydmVkWm9uZVNpemUobV9zYXZlZFJl c2VydmVkWm9uZVNpemUpOwogI2lmIEVOQUJMRShMTElOVF9DX0xPT1ApCiAgICAgbV92bS5pbnRl cnByZXRlci0+c3RhY2soKS5zZXRSZXNlcnZlZFpvbmVTaXplKG1fc2F2ZWRSZXNlcnZlZFpvbmVT aXplKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0luaXRpYWxpemVUaHJl YWRpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0lu aXRpYWxpemVUaHJlYWRpbmcuY3BwCShyZXZpc2lvbiAxNjM5OTUpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9Jbml0aWFsaXplVGhyZWFkaW5nLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNzMsOSArNzMsNyBAQCB2b2lkIGluaXRpYWxpemVUaHJlYWRpbmcoKQogICAgICAgICBEaXNh bGxvd0dDOjppbml0aWFsaXplKCk7CiAjZW5kaWYKICAgICAgICAgV1RGVGhyZWFkRGF0YSYgdGhy ZWFkRGF0YSA9IHd0ZlRocmVhZERhdGEoKTsKLSAgICAgICAgCiAgICAgICAgIHRocmVhZERhdGEu c2V0U2F2ZWRMYXN0U3RhY2tUb3AodGhyZWFkRGF0YS5zdGFjaygpLm9yaWdpbigpKTsKLSAgICAg ICAgdGhyZWFkRGF0YS5zZXRTYXZlZFJlc2VydmVkWm9uZVNpemUoT3B0aW9uczo6cmVzZXJ2ZWRa b25lU2l6ZSgpKTsKICAgICB9KTsKIH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSlNMb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU0xvY2suY3BwCShyZXZpc2lvbiAxNjM5OTUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0xvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjMsMTEgKzEyMyw5IEBA IHZvaWQgSlNMb2NrOjpsb2NrKGludHB0cl90IGxvY2tDb3VudCkKIAogICAgIFdURlRocmVhZERh dGEmIHRocmVhZERhdGEgPSB3dGZUaHJlYWREYXRhKCk7CiAKLSAgICBpZiAoIW1fdm0tPnN0YWNr UG9pbnRlckF0Vk1FbnRyeSkgewotICAgICAgICB2b2lkKiBwID0gJnA7Ci0gICAgICAgIG1fdm0t PnN0YWNrUG9pbnRlckF0Vk1FbnRyeSA9IHA7IC8vIEEgcHJveHkgZm9yIHRoZSBjdXJyZW50IHN0 YWNrIHBvaW50ZXIuCi0gICAgICAgIHRocmVhZERhdGEuc2V0U2F2ZWRSZXNlcnZlZFpvbmVTaXpl KG1fdm0tPnVwZGF0ZVJlc2VydmVkWm9uZVNpemUoT3B0aW9uczo6cmVzZXJ2ZWRab25lU2l6ZSgp KSk7Ci0gICAgfQorICAgIFJFTEVBU0VfQVNTRVJUKCFtX3ZtLT5zdGFja1BvaW50ZXJBdFZNRW50 cnkoKSk7CisgICAgdm9pZCogcCA9ICZwOyAvLyBBIHByb3h5IGZvciB0aGUgY3VycmVudCBzdGFj ayBwb2ludGVyLgorICAgIG1fdm0tPnVwZGF0ZVN0YWNrUG9pbnRlckF0Vk1FbnRyeShwKTsKIAog ICAgIG1fdm0tPnNldExhc3RTdGFja1RvcCh0aHJlYWREYXRhLnNhdmVkTGFzdFN0YWNrVG9wKCkp OwogfQpAQCAtMTQ1LDEwICsxNDMsOCBAQCB2b2lkIEpTTG9jazo6dW5sb2NrKGludHB0cl90IHVu bG9ja0NvdW50CiAgICAgbV9sb2NrQ291bnQgLT0gdW5sb2NrQ291bnQ7CiAKICAgICBpZiAoIW1f bG9ja0NvdW50KSB7Ci0gICAgICAgIGlmIChtX3ZtKSB7Ci0gICAgICAgICAgICBtX3ZtLT5zdGFj a1BvaW50ZXJBdFZNRW50cnkgPSBudWxscHRyOwotICAgICAgICAgICAgbV92bS0+dXBkYXRlUmVz ZXJ2ZWRab25lU2l6ZSh3dGZUaHJlYWREYXRhKCkuc2F2ZWRSZXNlcnZlZFpvbmVTaXplKCkpOwot ICAgICAgICB9CisgICAgICAgIGlmIChtX3ZtKQorICAgICAgICAgICAgbV92bS0+dXBkYXRlU3Rh Y2tQb2ludGVyQXRWTUVudHJ5KG51bGxwdHIpOwogICAgICAgICBzZXRPd25lclRocmVhZCgwKTsK ICAgICAgICAgbV9sb2NrLnVubG9jaygpOwogICAgIH0KQEAgLTE4NSw5ICsxODEsOCBAQCB1bnNp Z25lZCBKU0xvY2s6OmRyb3BBbGxMb2NrcyhEcm9wQWxsTG9jCiAjZW5kaWYKIAogICAgIFdURlRo cmVhZERhdGEmIHRocmVhZERhdGEgPSB3dGZUaHJlYWREYXRhKCk7Ci0gICAgdGhyZWFkRGF0YS5z ZXRTYXZlZFN0YWNrUG9pbnRlckF0Vk1FbnRyeShtX3ZtLT5zdGFja1BvaW50ZXJBdFZNRW50cnkp OworICAgIHRocmVhZERhdGEuc2V0U2F2ZWRTdGFja1BvaW50ZXJBdFZNRW50cnkobV92bS0+c3Rh Y2tQb2ludGVyQXRWTUVudHJ5KCkpOwogICAgIHRocmVhZERhdGEuc2V0U2F2ZWRMYXN0U3RhY2tU b3AobV92bS0+bGFzdFN0YWNrVG9wKCkpOwotICAgIHRocmVhZERhdGEuc2V0U2F2ZWRSZXNlcnZl ZFpvbmVTaXplKG1fdm0tPnJlc2VydmVkWm9uZVNpemUoKSk7CiAKICAgICB1bnNpZ25lZCBkcm9w cGVkTG9ja0NvdW50ID0gbV9sb2NrQ291bnQ7CiAgICAgdW5sb2NrKGRyb3BwZWRMb2NrQ291bnQp OwpAQCAtMjE2LDkgKzIxMSw4IEBAIHZvaWQgSlNMb2NrOjpncmFiQWxsTG9ja3MoRHJvcEFsbExv Y2tzKiAKICAgICAtLW1fbG9ja0Ryb3BEZXB0aDsKIAogICAgIFdURlRocmVhZERhdGEmIHRocmVh ZERhdGEgPSB3dGZUaHJlYWREYXRhKCk7Ci0gICAgbV92bS0+c3RhY2tQb2ludGVyQXRWTUVudHJ5 ID0gdGhyZWFkRGF0YS5zYXZlZFN0YWNrUG9pbnRlckF0Vk1FbnRyeSgpOworICAgIG1fdm0tPnVw ZGF0ZVN0YWNrUG9pbnRlckF0Vk1FbnRyeSh0aHJlYWREYXRhLnNhdmVkU3RhY2tQb2ludGVyQXRW TUVudHJ5KCkpOwogICAgIG1fdm0tPnNldExhc3RTdGFja1RvcCh0aHJlYWREYXRhLnNhdmVkTGFz dFN0YWNrVG9wKCkpOwotICAgIG1fdm0tPnVwZGF0ZVJlc2VydmVkWm9uZVNpemUodGhyZWFkRGF0 YS5zYXZlZFJlc2VydmVkWm9uZVNpemUoKSk7CiB9CiAKIEpTTG9jazo6RHJvcEFsbExvY2tzOjpE cm9wQWxsTG9ja3MoRXhlY1N0YXRlKiBleGVjKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvVk0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1ZNLmNwcAkocmV2aXNpb24gMTYzOTk1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvVk0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzMsNyArMTczLDYgQEAgVk06OlZNKFZN VHlwZSB2bVR5cGUsIEhlYXBUeXBlIGhlYXBUeXBlKQogICAgICwgdm1UeXBlKHZtVHlwZSkKICAg ICAsIGNsaWVudERhdGEoMCkKICAgICAsIHRvcENhbGxGcmFtZShDYWxsRnJhbWU6Om5vQ2FsbGVy KCkpCi0gICAgLCBzdGFja1BvaW50ZXJBdFZNRW50cnkoMCkKICAgICAsIGFycmF5Q29uc3RydWN0 b3JUYWJsZShhZG9wdFB0cihuZXcgSGFzaFRhYmxlKEpTQzo6YXJyYXlDb25zdHJ1Y3RvclRhYmxl KSkpCiAgICAgLCBhcnJheVByb3RvdHlwZVRhYmxlKGFkb3B0UHRyKG5ldyBIYXNoVGFibGUoSlND OjphcnJheVByb3RvdHlwZVRhYmxlKSkpCiAgICAgLCBib29sZWFuUHJvdG90eXBlVGFibGUoYWRv cHRQdHIobmV3IEhhc2hUYWJsZShKU0M6OmJvb2xlYW5Qcm90b3R5cGVUYWJsZSkpKQpAQCAtMjIz LDYgKzIyMiw3IEBAIFZNOjpWTShWTVR5cGUgdm1UeXBlLCBIZWFwVHlwZSBoZWFwVHlwZSkKICNp ZiBFTkFCTEUoR0NfVkFMSURBVElPTikKICAgICAsIG1faW5pdGlhbGl6aW5nT2JqZWN0Q2xhc3Mo MCkKICNlbmRpZgorICAgICwgbV9zdGFja1BvaW50ZXJBdFZNRW50cnkoMCkKICAgICAsIG1fc3Rh Y2tMaW1pdCgwKQogI2lmIEVOQUJMRShMTElOVF9DX0xPT1ApCiAgICAgLCBtX2pzU3RhY2tMaW1p dCgwKQpAQCAtNzMyLDYgKzczMiwxMiBAQCB2b2lkIFZNOjogY2xlYXJFeGNlcHRpb25TdGFjaygp CiAgICAgbV9leGNlcHRpb25TdGFjayA9IFJlZkNvdW50ZWRBcnJheTxTdGFja0ZyYW1lPigpOwog fQogCit2b2lkIFZNOjp1cGRhdGVTdGFja1BvaW50ZXJBdFZNRW50cnkodm9pZCogc3ApCit7Cisg ICAgbV9zdGFja1BvaW50ZXJBdFZNRW50cnkgPSBzcDsKKyAgICB1cGRhdGVTdGFja0xpbWl0KCk7 Cit9CisKIHNpemVfdCBWTTo6dXBkYXRlUmVzZXJ2ZWRab25lU2l6ZShzaXplX3QgcmVzZXJ2ZWRa b25lU2l6ZSkKIHsKICAgICBzaXplX3Qgb2xkUmVzZXJ2ZWRab25lU2l6ZSA9IG1fcmVzZXJ2ZWRa b25lU2l6ZTsKQEAgLTc0NCw5ICs3NTAsOSBAQCBzaXplX3QgVk06OnVwZGF0ZVJlc2VydmVkWm9u ZVNpemUoc2l6ZV90CiAKIGlubGluZSB2b2lkIFZNOjp1cGRhdGVTdGFja0xpbWl0KCkKIHsKLSAg ICBpZiAoc3RhY2tQb2ludGVyQXRWTUVudHJ5KSB7CisgICAgaWYgKG1fc3RhY2tQb2ludGVyQXRW TUVudHJ5KSB7CiAgICAgICAgIEFTU0VSVCh3dGZUaHJlYWREYXRhKCkuc3RhY2soKS5pc0dyb3dp bmdEb3dud2FyZCgpKTsKLSAgICAgICAgY2hhciogc3RhcnRPZlN0YWNrID0gcmVpbnRlcnByZXRf Y2FzdDxjaGFyKj4oc3RhY2tQb2ludGVyQXRWTUVudHJ5KTsKKyAgICAgICAgY2hhciogc3RhcnRP ZlN0YWNrID0gcmVpbnRlcnByZXRfY2FzdDxjaGFyKj4obV9zdGFja1BvaW50ZXJBdFZNRW50cnkp OwogI2lmIEVOQUJMRShGVExfSklUKQogICAgICAgICBtX3N0YWNrTGltaXQgPSB3dGZUaHJlYWRE YXRhKCkuc3RhY2soKS5yZWN1cnNpb25MaW1pdChzdGFydE9mU3RhY2ssIE9wdGlvbnM6Om1heFBl clRocmVhZFN0YWNrVXNhZ2UoKSwgbV9yZXNlcnZlZFpvbmVTaXplICsgbV9sYXJnZXN0RlRMU3Rh Y2tTaXplKTsKICAgICAgICAgbV9mdGxTdGFja0xpbWl0ID0gd3RmVGhyZWFkRGF0YSgpLnN0YWNr KCkucmVjdXJzaW9uTGltaXQoc3RhcnRPZlN0YWNrLCBPcHRpb25zOjptYXhQZXJUaHJlYWRTdGFj a1VzYWdlKCksIG1fcmVzZXJ2ZWRab25lU2l6ZSArIDIgKiBtX2xhcmdlc3RGVExTdGFja1NpemUp OwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5oCShyZXZpc2lvbiAxNjM5OTUpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5oCSh3b3JraW5nIGNvcHkpCkBAIC0y MzAsNyArMjMwLDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIFZNVHlwZSB2bVR5cGU7CiAg ICAgICAgIENsaWVudERhdGEqIGNsaWVudERhdGE7CiAgICAgICAgIEV4ZWNTdGF0ZSogdG9wQ2Fs bEZyYW1lOwotICAgICAgICB2b2lkKiBzdGFja1BvaW50ZXJBdFZNRW50cnk7CiAgICAgICAgIFdh dGNoZG9nIHdhdGNoZG9nOwogCiAgICAgICAgIGNvbnN0IE93blB0cjxjb25zdCBIYXNoVGFibGU+ IGFycmF5Q29uc3RydWN0b3JUYWJsZTsKQEAgLTM3OSw2ICszNzgsOSBAQCBuYW1lc3BhY2UgSlND IHsKICAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgSlNWYWx1ZSB0aHJvd0V4Y2VwdGlvbihFeGVj U3RhdGUqLCBKU1ZhbHVlKTsKICAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgSlNPYmplY3QqIHRo cm93RXhjZXB0aW9uKEV4ZWNTdGF0ZSosIEpTT2JqZWN0Kik7CiAgICAgICAgIAorICAgICAgICB2 b2lkKiBzdGFja1BvaW50ZXJBdFZNRW50cnkoKSBjb25zdCB7IHJldHVybiBtX3N0YWNrUG9pbnRl ckF0Vk1FbnRyeTsgfQorICAgICAgICB2b2lkIHVwZGF0ZVN0YWNrUG9pbnRlckF0Vk1FbnRyeSh2 b2lkKik7CisKICAgICAgICAgc2l6ZV90IHJlc2VydmVkWm9uZVNpemUoKSBjb25zdCB7IHJldHVy biBtX3Jlc2VydmVkWm9uZVNpemU7IH0KICAgICAgICAgc2l6ZV90IHVwZGF0ZVJlc2VydmVkWm9u ZVNpemUoc2l6ZV90IHJlc2VydmVkWm9uZVNpemUpOwogCkBAIC01MjksNiArNTMxLDcgQEAgbmFt ZXNwYWNlIEpTQyB7CiAjaWYgRU5BQkxFKEdDX1ZBTElEQVRJT04pCiAgICAgICAgIGNvbnN0IENs YXNzSW5mbyogbV9pbml0aWFsaXppbmdPYmplY3RDbGFzczsKICNlbmRpZgorICAgICAgICB2b2lk KiBtX3N0YWNrUG9pbnRlckF0Vk1FbnRyeTsKICAgICAgICAgc2l6ZV90IG1fcmVzZXJ2ZWRab25l U2l6ZTsKICNpZiBFTkFCTEUoTExJTlRfQ19MT09QKQogICAgICAgICBzdHJ1Y3QgewpJbmRleDog U291cmNlL1dURi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi9DaGFuZ2VMb2cJ KHJldmlzaW9uIDE2Mzk5OSkKKysrIFNvdXJjZS9XVEYvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDItMTIgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUu Y29tPgorCisgICAgICAgIE5vIG5lZWQgdG8gc2F2ZSByZXNlcnZlZFpvbmVTaXplIHdoZW4gZHJv cHBpbmcgdGhlIEpTTG9jay4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyODcxOT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9X VEZUaHJlYWREYXRhLmNwcDoKKyAgICAgICAgKFdURjo6V1RGVGhyZWFkRGF0YTo6V1RGVGhyZWFk RGF0YSk6CisgICAgICAgICogd3RmL1dURlRocmVhZERhdGEuaDoKKyAgICAgICAgLSByZW1vdmVk IHVubm5lZWRlZCBtX3NhdmVkUmVzZXJ2ZWRab25lU2l6ZS4KKwogMjAxNC0wMi0xMSAgTWFyayBI YWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAgICAgIDMyLWJpdCBMTElu dCB3cml0ZUJhcnJpZXJPbkdsb2JhbE9iamVjdCBpcyB3cm9uZwpJbmRleDogU291cmNlL1dURi93 dGYvV1RGVGhyZWFkRGF0YS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvV1RGVGhy ZWFkRGF0YS5jcHAJKHJldmlzaW9uIDE2Mzk5NSkKKysrIFNvdXJjZS9XVEYvd3RmL1dURlRocmVh ZERhdGEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MSw3ICs1MSw2IEBAIFdURlRocmVhZERhdGE6 OldURlRocmVhZERhdGEoKQogI2VuZGlmCiAgICAgLCBtX3NhdmVkU3RhY2tQb2ludGVyQXRWTUVu dHJ5KDApCiAgICAgLCBtX3NhdmVkTGFzdFN0YWNrVG9wKHN0YWNrKCkub3JpZ2luKCkpCi0gICAg LCBtX3NhdmVkUmVzZXJ2ZWRab25lU2l6ZSgwKQogewogI2lmIFVTRShXRUJfVEhSRUFEKQogICAg IHN0YXRpYyBKU0M6OklkZW50aWZpZXJUYWJsZSogc2hhcmVkSWRlbnRpZmllclRhYmxlID0gbmV3 IEpTQzo6SWRlbnRpZmllclRhYmxlKCk7CkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9XVEZUaHJlYWRE YXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvV1RGVGhyZWFkRGF0YS5oCShyZXZp c2lvbiAxNjM5OTUpCisrKyBTb3VyY2UvV1RGL3d0Zi9XVEZUaHJlYWREYXRhLmgJKHdvcmtpbmcg Y29weSkKQEAgLTEyNiwxNiArMTI2LDYgQEAgcHVibGljOgogICAgICAgICBtX3NhdmVkTGFzdFN0 YWNrVG9wID0gbGFzdFN0YWNrVG9wOwogICAgIH0KIAotICAgIHNpemVfdCBzYXZlZFJlc2VydmVk Wm9uZVNpemUoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIG1fc2F2ZWRSZXNlcnZlZFpvbmVTaXpl OwotICAgIH0KLQotICAgIHZvaWQgc2V0U2F2ZWRSZXNlcnZlZFpvbmVTaXplKHNpemVfdCByZXNl cnZlZFpvbmVTaXplKQotICAgIHsKLSAgICAgICAgbV9zYXZlZFJlc2VydmVkWm9uZVNpemUgPSBy ZXNlcnZlZFpvbmVTaXplOwotICAgIH0KLQogICAgIHZvaWQqIG1fYXBpRGF0YTsKIAogcHJpdmF0 ZToKQEAgLTE1MCw3ICsxNDAsNiBAQCBwcml2YXRlOgogI2VuZGlmCiAgICAgdm9pZCogbV9zYXZl ZFN0YWNrUG9pbnRlckF0Vk1FbnRyeTsKICAgICB2b2lkKiBtX3NhdmVkTGFzdFN0YWNrVG9wOwot ICAgIHNpemVfdCBtX3NhdmVkUmVzZXJ2ZWRab25lU2l6ZTsKIAogICAgIHN0YXRpYyBXVEZfRVhQ T1JUREFUQSBUaHJlYWRTcGVjaWZpYzxXVEZUaHJlYWREYXRhPiogc3RhdGljRGF0YTsKICAgICBm cmllbmQgV1RGVGhyZWFkRGF0YSYgd3RmVGhyZWFkRGF0YSgpOwo=