136894 2014-09-17 13:14:21 -0700 Change CallFrame to use Callee instead of JSScope to implement vm() 2014-09-17 15:34:25 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 136724 1 msaboff msaboff fpizlo ggaren mark.lam mmirman oliver oldest_to_newest 1035755 0 msaboff 2014-09-17 13:14:21 -0700 Currently CallFrame::vm() uses JSScope to implement vm(). In preparation of eliminating JSScope slot from the CallFrame, change the implementation to use the Callee. 1035765 1 238264 msaboff 2014-09-17 13:58:03 -0700 Created attachment 238264 Patch 1035783 2 238264 ggaren 2014-09-17 15:24:15 -0700 Comment on attachment 238264 Patch r=me 1035788 3 msaboff 2014-09-17 15:34:25 -0700 Committed r173706: <http://trac.webkit.org/changeset/173706> 238264 2014-09-17 13:58:03 -0700 2014-09-17 15:24:15 -0700 Patch 136894.patch text/plain 11345 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTczNjk4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBA CisyMDE0LTA5LTE3ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIENoYW5nZSBDYWxsRnJhbWUgdG8gdXNlIENhbGxlZSBpbnN0ZWFkIG9mIEpTU2NvcGUgdG8g aW1wbGVtZW50IHZtKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzNjg5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZGVkIEpTQ2VsbDo6dm0oKSBtZXRob2QgdGhhdCBjYW4gYmUgdXNlZCBvbiBhbnkg SlNPYmplY3QuICBDaGFuZ2VkIENhbGxGcmFtZTo6dm0oKSB0bworICAgICAgICB1c2UgSlNDZWxs Ojp2bSB3aXRoIHRoZSBDYWxsZWUuICBNYWRlIHNpbWlsYXIgY2hhbmdlcyBpbiB0aGUgTExJbnQu CisgICAgICAgIEluIHN1cHBvcnQgb2YgdGhpcywgY2hhbmdlZCBKU0dsb2JhbE9iamVjdDo6aW5p dCgpIHRvIHRha2UgYSBWTSYgcGFyYW1ldGVyLCBhcyB0aGVyZSBpcworICAgICAgICBhIGNoaWNr ZW4vZWdnIHByb2JsZW0gd2l0aCB0cnlpbmcgdG8gdXNlIHRoZSBDYWxsZWUgaW4gdGhlIGdsb2Jh bCBleGVjIGJlZm9yZSB0aGUgQ2FsbGVlCisgICAgICAgIGhhcyBiZWVuIGNyZWF0ZS4gIEJlc2lk ZXMsIHRoZSB2bSBpcyByZWFkaWx5IGF2YWlsYWJsZSBpbiBmaW5pc2hDcmVhdGlvbigpLCB0aGUg Y2FsbGVyIG9mCisgICAgICAgIGluaXQoKS4KKworICAgICAgICAqIGxsaW50L0xvd0xldmVsSW50 ZXJwcmV0ZXIzMl82NC5hc206CisgICAgICAgICogbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0 LmFzbToKKyAgICAgICAgQ2hhbmdlZCB0aGUgY2FsY3VsYXRpb24gb2YgQ2FsbEZyYW1lOjpWTSB0 byB1c2UgdGhlIENhbGxlZSBpbnN0ZWFkIG9mIEpTU2NvcGUuCisKKyAgICAgICAgKiBydW50aW1l L0pTQ2VsbC5oOgorICAgICAgICAqIHJ1bnRpbWUvSlNDZWxsSW5saW5lcy5oOgorICAgICAgICAo SlNDOjpKU0NlbGw6OnZtKTogTmV3IG1ldGhvZCBmb3IgZ2V0dGluZyBWTSBmcm9tIHRoZSBwb2lu dGVyLgorICAgICAgICAoSlNDOjpFeGVjU3RhdGU6OnZtKTogTW92ZWQgdGhpcyBtZXRob2QgZnJv bSBKU1Njb3BlLmggdG8gaGVyZSBzaW5jZSB0aGlzIGZpbGUKKyAgICAgICAgY29udGFpbnMgdGhl IGltcGxlbWVudGF0aW9uIG9mIEpTQ2VsbDo6dm0oKSwgdGhpcyBmaWxlIGlzIGluY2x1ZGVkIGJ5 IGFsbCB1c2VycworICAgICAgICBvZiBDYWxsRnJhbWU6OnZtLCBhbmQgbGFzdGx5IHB1dHRpbmcg aXQgaW4gQ2FsbEZyYW1lSW5saW5lcy5oIHJlcXVpcmVkIGNoYW5naW5nCisgICAgICAgIG1hbnkg b3RoZXIgLmggZmlsZXMgYW5kIHBvc3NpYmxlIHRoZSBXZWJDb3JlIGdlbmVyYXRvciBnZW5lcmF0 ZS1iaW5kaW5ncy5wbC4KKworICAgICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwOgor ICAgICAgICAoSlNDOjpKU0dsb2JhbE9iamVjdDo6aW5pdCk6CisgICAgICAgICogcnVudGltZS9K U0dsb2JhbE9iamVjdC5oOgorICAgICAgICAoSlNDOjpKU0dsb2JhbE9iamVjdDo6ZmluaXNoQ3Jl YXRpb24pOgorICAgICAgICBDaGFuZ2VkIGluaXQoKSB0byB0YWtlIGEgVk0gcGFyYW1ldGVyLgor CisgICAgICAgICogcnVudGltZS9KU1Njb3BlLmg6CisgICAgICAgIChKU0M6OkV4ZWNTdGF0ZTo6 dm0pOiBEZWxldGVkLgorCiAyMDE0LTA5LTE2ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZGlzYWJsZSBuYXRpdmUgaW5saW5pbmcgYmVjYXVz ZSBpdCBjYXVzZXMgYnVpbGQgZmFpbHVyZXMuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv bGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjMyXzY0LmFzbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjMyXzY0LmFzbQkocmV2aXNp b24gMTczNjk4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJw cmV0ZXIzMl82NC5hc20JKHdvcmtpbmcgY29weSkKQEAgLTM4Nyw3ICszODcsNyBAQCBtYWNybyBt YWtlSG9zdEZ1bmN0aW9uQ2FsbChlbnRyeSwgdGVtcDEsCiBlbmQKIAogX2hhbmRsZVVuY2F1Z2h0 RXhjZXB0aW9uOgotICAgIGxvYWRwIFNjb3BlQ2hhaW4gKyBQYXlsb2FkT2Zmc2V0W2Nmcl0sIHQz CisgICAgbG9hZHAgQ2FsbGVlICsgUGF5bG9hZE9mZnNldFtjZnJdLCB0MwogICAgIGFuZHAgTWFy a2VkQmxvY2tNYXNrLCB0MwogICAgIGxvYWRwIE1hcmtlZEJsb2NrOjptX3dlYWtTZXQgKyBXZWFr U2V0OjptX3ZtW3QzXSwgdDMKICAgICBsb2FkcCBWTTo6Y2FsbEZyYW1lRm9yVGhyb3dbdDNdLCBj ZnIKQEAgLTY4OSw3ICs2ODksNyBAQCBtYWNybyBmdW5jdGlvbkFyaXR5Q2hlY2soZG9uZUxhYmVs LCBzbG93CiBlbmQKIAogbWFjcm8gYnJhbmNoSWZFeGNlcHRpb24obGFiZWwpCi0gICAgbG9hZHAg U2NvcGVDaGFpbltjZnJdLCB0MworICAgIGxvYWRwIENhbGxlZVtjZnJdLCB0MwogICAgIGFuZHAg TWFya2VkQmxvY2tNYXNrLCB0MwogICAgIGxvYWRwIE1hcmtlZEJsb2NrOjptX3dlYWtTZXQgKyBX ZWFrU2V0OjptX3ZtW3QzXSwgdDMKICAgICBiaWVxIFZNOjptX2V4Y2VwdGlvbiArIFRhZ09mZnNl dFt0M10sIEVtcHR5VmFsdWVUYWcsIC5ub0V4Y2VwdGlvbgpAQCAtMjAzNiw3ICsyMDM2LDcgQEAg X2xsaW50X29wX2NhdGNoOgogICAgICMgdGhlIGludGVycHJldGVyJ3MgdGhyb3cgdHJhbXBvbGlu ZSAoc2VlIF9sbGludF90aHJvd190cmFtcG9saW5lKS4KICAgICAjIFRoZSB0aHJvd2luZyBjb2Rl IG11c3QgaGF2ZSBrbm93biB0aGF0IHdlIHdlcmUgdGhyb3dpbmcgdG8gdGhlIGludGVycHJldGVy LAogICAgICMgYW5kIGhhdmUgc2V0IFZNOjp0YXJnZXRJbnRlcnByZXRlclBDRm9yVGhyb3cuCi0g ICAgbG9hZHAgU2NvcGVDaGFpbiArIFBheWxvYWRPZmZzZXRbY2ZyXSwgdDMKKyAgICBsb2FkcCBD YWxsZWUgKyBQYXlsb2FkT2Zmc2V0W2Nmcl0sIHQzCiAgICAgYW5kcCBNYXJrZWRCbG9ja01hc2ss IHQzCiAgICAgbG9hZHAgTWFya2VkQmxvY2s6Om1fd2Vha1NldCArIFdlYWtTZXQ6Om1fdm1bdDNd LCB0MwogICAgIGxvYWRwIFZNOjpjYWxsRnJhbWVGb3JUaHJvd1t0M10sIGNmcgpAQCAtMjEyNCw2 ICsyMTI0LDcgQEAgbWFjcm8gbmF0aXZlQ2FsbFRyYW1wb2xpbmUoZXhlY3V0YWJsZU9mZgogICAg IGxvYWRpIFNjb3BlQ2hhaW4gKyBQYXlsb2FkT2Zmc2V0W3QwXSwgdDEKICAgICBzdG9yZWkgQ2Vs bFRhZywgU2NvcGVDaGFpbiArIFRhZ09mZnNldFtjZnJdCiAgICAgc3RvcmVpIHQxLCBTY29wZUNo YWluICsgUGF5bG9hZE9mZnNldFtjZnJdCisgICAgbG9hZGkgQ2FsbGVlICsgUGF5bG9hZE9mZnNl dFt0MF0sIHQxCiAgICAgaWYgWDg2IG9yIFg4Nl9XSU4KICAgICAgICAgc3VicCA4LCBzcCAjIGFs aWduIHN0YWNrIHBvaW50ZXIKICAgICAgICAgYW5kcCBNYXJrZWRCbG9ja01hc2ssIHQxCkBAIC0y MTM1LDEzICsyMTM2LDEzIEBAIG1hY3JvIG5hdGl2ZUNhbGxUcmFtcG9saW5lKGV4ZWN1dGFibGVP ZmYKICAgICAgICAgbG9hZHAgSlNGdW5jdGlvbjo6bV9leGVjdXRhYmxlW3QxXSwgdDEKICAgICAg ICAgY2hlY2tTdGFja1BvaW50ZXJBbGlnbm1lbnQodDMsIDB4ZGVhZDAwMDEpCiAgICAgICAgIGNh bGwgZXhlY3V0YWJsZU9mZnNldFRvRnVuY3Rpb25bdDFdCi0gICAgICAgIGxvYWRwIFNjb3BlQ2hh aW5bY2ZyXSwgdDMKKyAgICAgICAgbG9hZHAgQ2FsbGVlW2Nmcl0sIHQzCiAgICAgICAgIGFuZHAg TWFya2VkQmxvY2tNYXNrLCB0MwogICAgICAgICBsb2FkcCBNYXJrZWRCbG9jazo6bV93ZWFrU2V0 ICsgV2Vha1NldDo6bV92bVt0M10sIHQzCiAgICAgICAgIGFkZHAgOCwgc3AKICAgICBlbHNpZiBB Uk0gb3IgQVJNdjcgb3IgQVJNdjdfVFJBRElUSU9OQUwgb3IgQ19MT09QIG9yIE1JUFMgb3IgU0g0 CiAgICAgICAgIHN1YnAgOCwgc3AgIyBhbGlnbiBzdGFjayBwb2ludGVyCi0gICAgICAgICMgdDEg YWxyZWFkeSBjb250YWlucyB0aGUgU2NvcGVDaGFpbi4KKyAgICAgICAgIyB0MSBhbHJlYWR5IGNv bnRhaW5zIHRoZSBDYWxsZWUuCiAgICAgICAgIGFuZHAgTWFya2VkQmxvY2tNYXNrLCB0MQogICAg ICAgICBsb2FkcCBNYXJrZWRCbG9jazo6bV93ZWFrU2V0ICsgV2Vha1NldDo6bV92bVt0MV0sIHQx CiAgICAgICAgIHN0b3JlcCBjZnIsIFZNOjp0b3BDYWxsRnJhbWVbdDFdCkBAIC0yMTU4LDcgKzIx NTksNyBAQCBtYWNybyBuYXRpdmVDYWxsVHJhbXBvbGluZShleGVjdXRhYmxlT2ZmCiAgICAgICAg IGVsc2UKICAgICAgICAgICAgIGNhbGwgZXhlY3V0YWJsZU9mZnNldFRvRnVuY3Rpb25bdDFdCiAg ICAgICAgIGVuZAotICAgICAgICBsb2FkcCBTY29wZUNoYWluW2Nmcl0sIHQzCisgICAgICAgIGxv YWRwIENhbGxlZVtjZnJdLCB0MwogICAgICAgICBhbmRwIE1hcmtlZEJsb2NrTWFzaywgdDMKICAg ICAgICAgbG9hZHAgTWFya2VkQmxvY2s6Om1fd2Vha1NldCArIFdlYWtTZXQ6Om1fdm1bdDNdLCB0 MwogICAgICAgICBhZGRwIDgsIHNwCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQv TG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbQkocmV2aXNpb24gMTczNjk4KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXI2NC5hc20J KHdvcmtpbmcgY29weSkKQEAgLTMyNyw3ICszMjcsNyBAQCBlbmQKIAogCiBfaGFuZGxlVW5jYXVn aHRFeGNlcHRpb246Ci0gICAgbG9hZHAgU2NvcGVDaGFpbltjZnJdLCB0MworICAgIGxvYWRwIENh bGxlZVtjZnJdLCB0MwogICAgIGFuZHAgTWFya2VkQmxvY2tNYXNrLCB0MwogICAgIGxvYWRwIE1h cmtlZEJsb2NrOjptX3dlYWtTZXQgKyBXZWFrU2V0OjptX3ZtW3QzXSwgdDMKICAgICBsb2FkcCBW TTo6Y2FsbEZyYW1lRm9yVGhyb3dbdDNdLCBjZnIKQEAgLTU3OCw3ICs1NzgsNyBAQCBtYWNybyBm dW5jdGlvbkFyaXR5Q2hlY2soZG9uZUxhYmVsLCBzbG93CiBlbmQKIAogbWFjcm8gYnJhbmNoSWZF eGNlcHRpb24obGFiZWwpCi0gICAgbG9hZHAgU2NvcGVDaGFpbltjZnJdLCB0MworICAgIGxvYWRw IENhbGxlZVtjZnJdLCB0MwogICAgIGFuZHAgTWFya2VkQmxvY2tNYXNrLCB0MwogICAgIGxvYWRw IE1hcmtlZEJsb2NrOjptX3dlYWtTZXQgKyBXZWFrU2V0OjptX3ZtW3QzXSwgdDMKICAgICBidHF6 IFZNOjptX2V4Y2VwdGlvblt0M10sIC5ub0V4Y2VwdGlvbgpAQCAtMTg5Miw3ICsxODkyLDcgQEAg X2xsaW50X29wX2NhdGNoOgogICAgICMgdGhlIGludGVycHJldGVyJ3MgdGhyb3cgdHJhbXBvbGlu ZSAoc2VlIF9sbGludF90aHJvd190cmFtcG9saW5lKS4KICAgICAjIFRoZSB0aHJvd2luZyBjb2Rl IG11c3QgaGF2ZSBrbm93biB0aGF0IHdlIHdlcmUgdGhyb3dpbmcgdG8gdGhlIGludGVycHJldGVy LAogICAgICMgYW5kIGhhdmUgc2V0IFZNOjp0YXJnZXRJbnRlcnByZXRlclBDRm9yVGhyb3cuCi0g ICAgbG9hZHAgU2NvcGVDaGFpbltjZnJdLCB0MworICAgIGxvYWRwIENhbGxlZVtjZnJdLCB0Mwog ICAgIGFuZHAgTWFya2VkQmxvY2tNYXNrLCB0MwogICAgIGxvYWRwIE1hcmtlZEJsb2NrOjptX3dl YWtTZXQgKyBXZWFrU2V0OjptX3ZtW3QzXSwgdDMKICAgICBsb2FkcCBWTTo6Y2FsbEZyYW1lRm9y VGhyb3dbdDNdLCBjZnIKQEAgLTE5NTIsNyArMTk1Miw3IEBAIG1hY3JvIG5hdGl2ZUNhbGxUcmFt cG9saW5lKGV4ZWN1dGFibGVPZmYKICAgICAgICAgICAgIGNvbnN0IGFyZzIgPSB0MSAgIyB0MSA9 IHJkeAogICAgICAgICAgICAgY29uc3QgdGVtcCA9IHQwCiAgICAgICAgIGVuZAotICAgICAgICBs b2FkcCBTY29wZUNoYWluW2Nmcl0sIHQwCisgICAgICAgIGxvYWRwIENhbGxlZVtjZnJdLCB0MAog ICAgICAgICBhbmRwIE1hcmtlZEJsb2NrTWFzaywgdDAKICAgICAgICAgbG9hZHAgTWFya2VkQmxv Y2s6Om1fd2Vha1NldCArIFdlYWtTZXQ6Om1fdm1bdDBdLCB0MAogICAgICAgICBzdG9yZXAgY2Zy LCBWTTo6dG9wQ2FsbEZyYW1lW3QwXQpAQCAtMTk3MCwxMSArMTk3MCwxMSBAQCBtYWNybyBuYXRp dmVDYWxsVHJhbXBvbGluZShleGVjdXRhYmxlT2ZmCiAgICAgICAgIGlmIFg4Nl82NF9XSU4KICAg ICAgICAgICAgIGFkZHAgMzIsIHNwCiAgICAgICAgIGVuZAotICAgICAgICBsb2FkcCBTY29wZUNo YWluW2Nmcl0sIHQzCisgICAgICAgIGxvYWRwIENhbGxlZVtjZnJdLCB0MwogICAgICAgICBhbmRw IE1hcmtlZEJsb2NrTWFzaywgdDMKICAgICAgICAgbG9hZHAgTWFya2VkQmxvY2s6Om1fd2Vha1Nl dCArIFdlYWtTZXQ6Om1fdm1bdDNdLCB0MwogICAgIGVsc2lmIEFSTTY0IG9yIENfTE9PUAotICAg ICAgICBsb2FkcCBTY29wZUNoYWluW2Nmcl0sIHQwCisgICAgICAgIGxvYWRwIENhbGxlZVtjZnJd LCB0MAogICAgICAgICBhbmRwIE1hcmtlZEJsb2NrTWFzaywgdDAKICAgICAgICAgbG9hZHAgTWFy a2VkQmxvY2s6Om1fd2Vha1NldCArIFdlYWtTZXQ6Om1fdm1bdDBdLCB0MAogICAgICAgICBzdG9y ZXAgY2ZyLCBWTTo6dG9wQ2FsbEZyYW1lW3QwXQpAQCAtMTk5Myw3ICsxOTkzLDcgQEAgbWFjcm8g bmF0aXZlQ2FsbFRyYW1wb2xpbmUoZXhlY3V0YWJsZU9mZgogICAgICAgICAgICAgY2FsbCBleGVj dXRhYmxlT2Zmc2V0VG9GdW5jdGlvblt0MV0KICAgICAgICAgZW5kCiAgICAgICAgIHJlc3RvcmVS ZXR1cm5BZGRyZXNzQmVmb3JlUmV0dXJuKHQzKQotICAgICAgICBsb2FkcCBTY29wZUNoYWluW2Nm cl0sIHQzCisgICAgICAgIGxvYWRwIENhbGxlZVtjZnJdLCB0MwogICAgICAgICBhbmRwIE1hcmtl ZEJsb2NrTWFzaywgdDMKICAgICAgICAgbG9hZHAgTWFya2VkQmxvY2s6Om1fd2Vha1NldCArIFdl YWtTZXQ6Om1fdm1bdDNdLCB0MwogICAgIGVsc2UKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTQ2VsbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTQ2VsbC5oCShyZXZpc2lvbiAxNzM2OTgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0NlbGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTA0LDYgKzEwNCw4IEBAIHB1 YmxpYzoKIAogICAgIGNvbnN0IGNoYXIqIGNsYXNzTmFtZSgpIGNvbnN0OwogCisgICAgVk0qIHZt KCkgY29uc3Q7CisKICAgICAvLyBFeHRyYWN0aW5nIHRoZSB2YWx1ZS4KICAgICBKU19FWFBPUlRf UFJJVkFURSBib29sIGdldFN0cmluZyhFeGVjU3RhdGUqLCBTdHJpbmcmKSBjb25zdDsKICAgICBK U19FWFBPUlRfUFJJVkFURSBTdHJpbmcgZ2V0U3RyaW5nKEV4ZWNTdGF0ZSopIGNvbnN0OyAvLyBu dWxsIHN0cmluZyBpZiBub3QgYSBzdHJpbmcKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTQ2VsbElubGluZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0NlbGxJbmxpbmVzLmgJKHJldmlzaW9uIDE3MzY5OCkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ2VsbElubGluZXMuaAkod29ya2luZyBjb3B5KQpAQCAt MzMsNiArMzMsNyBAQAogI2luY2x1ZGUgIkpTRGVzdHJ1Y3RpYmxlT2JqZWN0LmgiCiAjaW5jbHVk ZSAiSlNPYmplY3QuaCIKICNpbmNsdWRlICJKU1N0cmluZy5oIgorI2luY2x1ZGUgIk1hcmtlZEJs b2NrLmgiCiAjaW5jbHVkZSAiU3RydWN0dXJlLmgiCiAjaW5jbHVkZSA8d3RmL0NvbXBpbGF0aW9u VGhyZWFkLmg+CiAKQEAgLTExMSw2ICsxMTIsMTcgQEAgaW5saW5lIHZvaWQgSlNDZWxsOjp2aXNp dENoaWxkcmVuKEpTQ2VsbAogICAgIHZpc2l0b3IuYXBwZW5kVW5iYXJyaWVyZWRQb2ludGVyKCZz dHJ1Y3R1cmUpOwogfQogCitpbmxpbmUgVk0qIEpTQ2VsbDo6dm0oKSBjb25zdAoreworICAgIHJl dHVybiBNYXJrZWRCbG9jazo6YmxvY2tGb3IodGhpcyktPnZtKCk7Cit9CisKK2lubGluZSBWTSYg RXhlY1N0YXRlOjp2bSgpIGNvbnN0Cit7CisgICAgQVNTRVJUKGNhbGxlZSgpLT52bSgpKTsKKyAg ICByZXR1cm4gKmNhbGxlZSgpLT52bSgpOworfQorCiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgogdm9p ZCogYWxsb2NhdGVDZWxsKEhlYXAmIGhlYXAsIHNpemVfdCBzaXplKQogewpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNwcAkocmV2aXNp b24gMTczNjk4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmpl Y3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTksOSArMTk5LDkgQEAgdm9pZCBKU0dsb2JhbE9i amVjdDo6c2V0R2xvYmFsVGhpcyhWTSYgdgogICAgIG1fZ2xvYmFsVGhpcy5zZXQodm0sIHRoaXMs IGdsb2JhbFRoaXMpOwogfQogCi12b2lkIEpTR2xvYmFsT2JqZWN0Ojppbml0KCkKK3ZvaWQgSlNH bG9iYWxPYmplY3Q6OmluaXQoVk0mIHZtKQogewotICAgIEFTU0VSVCh2bSgpLmN1cnJlbnRUaHJl YWRJc0hvbGRpbmdBUElMb2NrKCkpOworICAgIEFTU0VSVCh2bS5jdXJyZW50VGhyZWFkSXNIb2xk aW5nQVBJTG9jaygpKTsKIAogICAgIEpTR2xvYmFsT2JqZWN0OjpnbG9iYWxFeGVjKCktPmluaXQo MCwgMCwgdGhpcywgQ2FsbEZyYW1lOjpub0NhbGxlcigpLCAwLCAwKTsKIApAQCAtMjE1LDggKzIx NSw3IEBAIHZvaWQgSlNHbG9iYWxPYmplY3Q6OmluaXQoKQogI2VuZGlmCiAKICAgICBFeGVjU3Rh dGUqIGV4ZWMgPSBKU0dsb2JhbE9iamVjdDo6Z2xvYmFsRXhlYygpOwotICAgIFZNJiB2bSA9IGV4 ZWMtPnZtKCk7Ci0gICAgCisKICAgICBtX2Z1bmN0aW9uUHJvdG90eXBlLnNldCh2bSwgdGhpcywg RnVuY3Rpb25Qcm90b3R5cGU6OmNyZWF0ZSh2bSwgRnVuY3Rpb25Qcm90b3R5cGU6OmNyZWF0ZVN0 cnVjdHVyZSh2bSwgdGhpcywganNOdWxsKCkpKSk7IC8vIFRoZSByZWFsIHByb3RvdHlwZSB3aWxs IGJlIHNldCBvbmNlIE9iamVjdFByb3RvdHlwZSBpcyBjcmVhdGVkLgogICAgIG1fY2FsbGVlU3Ry dWN0dXJlLnNldCh2bSwgdGhpcywgSlNDYWxsZWU6OmNyZWF0ZVN0cnVjdHVyZSh2bSwgdGhpcywg anNOdWxsKCkpKTsKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9i YWxPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U0dsb2JhbE9iamVjdC5oCShyZXZpc2lvbiAxNzM2OTgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMDMsNyArMzAz LDcgQEAgcHJvdGVjdGVkOgogICAgICAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbih2bSk7CiAgICAg ICAgIHN0cnVjdHVyZSgpLT5zZXRHbG9iYWxPYmplY3Qodm0sIHRoaXMpOwogICAgICAgICBtX2V4 cGVyaW1lbnRzRW5hYmxlZCA9IG1fZ2xvYmFsT2JqZWN0TWV0aG9kVGFibGUtPmphdmFTY3JpcHRF eHBlcmltZW50c0VuYWJsZWQodGhpcyk7Ci0gICAgICAgIGluaXQoKTsKKyAgICAgICAgaW5pdCh2 bSk7CiAgICAgICAgIHNldEdsb2JhbFRoaXModm0sIEpTUHJveHk6OmNyZWF0ZSh2bSwgSlNQcm94 eTo6Y3JlYXRlU3RydWN0dXJlKHZtLCB0aGlzLCBwcm90b3R5cGUoKSwgUHVyZUZvcndhcmRpbmdQ cm94eVR5cGUpLCB0aGlzKSk7CiAgICAgfQogCkBAIC0zMTIsNyArMzEyLDcgQEAgcHJvdGVjdGVk OgogICAgICAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbih2bSk7CiAgICAgICAgIHN0cnVjdHVyZSgp LT5zZXRHbG9iYWxPYmplY3Qodm0sIHRoaXMpOwogICAgICAgICBtX2V4cGVyaW1lbnRzRW5hYmxl ZCA9IG1fZ2xvYmFsT2JqZWN0TWV0aG9kVGFibGUtPmphdmFTY3JpcHRFeHBlcmltZW50c0VuYWJs ZWQodGhpcyk7Ci0gICAgICAgIGluaXQoKTsKKyAgICAgICAgaW5pdCh2bSk7CiAgICAgICAgIHNl dEdsb2JhbFRoaXModm0sIHRoaXNWYWx1ZSk7CiAgICAgfQogCkBAIC02MDQsNyArNjA0LDcgQEAg cHJpdmF0ZToKIAogICAgIEpTX0VYUE9SVF9QUklWQVRFIHZvaWQgc2V0R2xvYmFsVGhpcyhWTSYs IEpTT2JqZWN0KiBnbG9iYWxUaGlzKTsKIAotICAgIEpTX0VYUE9SVF9QUklWQVRFIHZvaWQgaW5p dCgpOworICAgIEpTX0VYUE9SVF9QUklWQVRFIHZvaWQgaW5pdChWTSYpOwogCiAgICAgdm9pZCBj cmVhdGVUaHJvd1R5cGVFcnJvcihWTSYpOwogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9KU1Njb3BlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSlNTY29wZS5oCShyZXZpc2lvbiAxNzM2OTgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU1Njb3BlLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzNiwxMiArMjM2LDYgQEAg aW5saW5lIEpTU2NvcGUqIFJlZ2lzdGVyOjpzY29wZSgpIGNvbnN0CiAgICAgcmV0dXJuIGpzQ2Fz dDxKU1Njb3BlKj4oanNWYWx1ZSgpKTsKIH0KIAotaW5saW5lIFZNJiBFeGVjU3RhdGU6OnZtKCkg Y29uc3QKLXsKLSAgICBBU1NFUlQoc2NvcGUoKS0+dm0oKSk7Ci0gICAgcmV0dXJuICpzY29wZSgp LT52bSgpOwotfQotCiBpbmxpbmUgSlNHbG9iYWxPYmplY3QqIEV4ZWNTdGF0ZTo6bGV4aWNhbEds b2JhbE9iamVjdCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHNjb3BlKCktPmdsb2JhbE9iamVjdCgp Owo=