126266 2013-12-27 10:25:47 -0800 CStack: Cosmetic: rename VM::entryScope to firstEntryScope. 2014-01-09 13:08:34 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 126320 1 mark.lam mark.lam fpizlo ggaren mhahnenberg msaboff oliver oldest_to_newest 963130 0 mark.lam 2013-12-27 10:25:47 -0800 This is a purely cosmetic change in preparation for an upcoming patch to have a separate stack limit for JS execution vs native C execution. 963131 1 220064 mark.lam 2013-12-27 10:30:05 -0800 Created attachment 220064 the patch. 963132 2 220064 mark.lam 2013-12-27 10:35:59 -0800 Comment on attachment 220064 the patch. View in context: https://bugs.webkit.org/attachment.cgi?id=220064&action=review > Source/JavaScriptCore/ChangeLog:3 > + Stack: Cosmetic: rename VM::entryScope to firstEntryScope. typo: "Stack" ==> "CStack". Fixed before commit. 963133 3 mark.lam 2013-12-27 10:36:32 -0800 Landed in r161104: <http://trac.webkit.org/r161104>. 963846 4 ggaren 2014-01-02 12:52:56 -0800 Why? "Previous first" sounds like an oxymoron. "Entry scope" makes more sense to me. "Entry" means "entry from C++". 963930 5 mark.lam 2014-01-02 15:33:46 -0800 (In reply to comment #4) > Why? > > "Previous first" sounds like an oxymoron. "Entry scope" makes more sense to me. "Entry" means "entry from C++". I renamed entryScope to firstEntryScope to distinguish it from topEntryScope which is introduced in https://bugs.webkit.org/show_bug.cgi?id=126334. topEntryScope will eventually be needed in the computation of JS stack usage in https://bugs.webkit.org/show_bug.cgi?id=126320 (which is what started this series of patches). Also, bear in mind that there is a chain of entryScopes (or will be with the introduction of topEntryScope). The first entry sc That said, I agree that “previousFirstEntryScope” sounds ridiculous, and it also makes the code harder to understand. I’ll upload a follow up patch shortly that will improve that part. 963931 6 mark.lam 2014-01-02 15:34:54 -0800 (In reply to comment #5) > Also, bear in mind that there is a chain of entryScopes (or will be with the introduction of topEntryScope). The first entry sc Incomplete thought ... I meant to say: The first entry scope is not the only entry scope. Hence, just calling it entryScope may not be accurate. 963936 7 ggaren 2014-01-02 15:43:43 -0800 > I renamed entryScope to firstEntryScope to distinguish it from topEntryScope which is introduced in https://bugs.webkit.org/show_bug.cgi?id=126334. I see. Putting that comment in your ChangeLog would have explained things for me. Since this is a part of adding topEntryScope, and since I've marked that patch r-, I'll mark this patch r- too. 963937 8 220064 ggaren 2014-01-02 15:43:50 -0800 Comment on attachment 220064 the patch. I see. I'll mark this patch r+, since it's a 963958 9 220267 mark.lam 2014-01-02 16:34:16 -0800 Created attachment 220267 follow up patch to remove the need for VMEntryScope::m_prevFirstEntryScope. 964214 10 220267 ggaren 2014-01-03 12:07:37 -0800 Comment on attachment 220267 follow up patch to remove the need for VMEntryScope::m_prevFirstEntryScope. r=me 964740 11 mark.lam 2014-01-06 13:45:02 -0800 Thanks for the review. Follow up patch landed in r161369 on the jsCStack branch: <http://trac.webkit.org/r161369>. 220064 2013-12-27 10:30:05 -0800 2014-01-02 15:43:49 -0800 the patch. bug-126266.patch text/plain 7252 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYxMTAzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDEzLTEyLTI3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBT dGFjazogQ29zbWV0aWM6IHJlbmFtZSBWTTo6ZW50cnlTY29wZSB0byBmaXJzdEVudHJ5U2NvcGUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjYyNjYu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxzbyBy ZW5hbWVkIFZNRW50cnlTY29wZTo6bV9wcmV2IHRvIG1fcHJldkZpcnN0RW50cnlTY29wZS4KKwor ICAgICAgICAqIGRlYnVnZ2VyL0RlYnVnZ2VyLmNwcDoKKyAgICAgICAgKEpTQzo6RGVidWdnZXI6 OnJlY29tcGlsZUFsbEpTRnVuY3Rpb25zKToKKyAgICAgICAgKiBoZWFwL0hlYXAuY3BwOgorICAg ICAgICAoSlNDOjpIZWFwOjpsYXN0Q2hhbmNlVG9GaW5hbGl6ZSk6CisgICAgICAgIChKU0M6Okhl YXA6OmRlbGV0ZUFsbENvbXBpbGVkQ29kZSk6CisgICAgICAgICogaW50ZXJwcmV0ZXIvQ2FsbEZy YW1lLmNwcDoKKyAgICAgICAgKEpTQzo6Q2FsbEZyYW1lOjp2bUVudHJ5R2xvYmFsT2JqZWN0KToK KyAgICAgICAgKiBpbnRlcnByZXRlci9KU1N0YWNrLmNwcDoKKyAgICAgICAgKEpTQzo6SlNTdGFj azo6dXBkYXRlU3RhY2tMaW1pdCk6CisgICAgICAgICogcnVudGltZS9WTS5jcHA6CisgICAgICAg IChKU0M6OlZNOjpWTSk6CisgICAgICAgIChKU0M6OlZNOjpyZWxlYXNlRXhlY3V0YWJsZU1lbW9y eSk6CisgICAgICAgICogcnVudGltZS9WTS5oOgorICAgICAgICAqIHJ1bnRpbWUvVk1FbnRyeVNj b3BlLmNwcDoKKyAgICAgICAgKEpTQzo6Vk1FbnRyeVNjb3BlOjpWTUVudHJ5U2NvcGUpOgorICAg ICAgICAoSlNDOjpWTUVudHJ5U2NvcGU6On5WTUVudHJ5U2NvcGUpOgorICAgICAgICAqIHJ1bnRp bWUvVk1FbnRyeVNjb3BlLmg6CisKIDIwMTMtMTItMjUgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBw bGUuY29tPgogCiAgICAgICAgIGpzYy1sYXlvdXQtdGVzdHMueWFtbC9qcy9zY3JpcHQtdGVzdHMv ZnVuY3Rpb24tYXBwbHktYWxpYXNlZC5qcy5sYXlvdXQtbm8tY2ppdCBpcyBmYWlsaW5nLgpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RlYnVnZ2VyL0RlYnVnZ2VyLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXIuY3BwCShyZXZpc2lv biAxNjExMDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXIuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xOTYsOCArMTk2LDggQEAgdm9pZCBEZWJ1Z2dlcjo6cmVjb21w aWxlQWxsSlNGdW5jdGlvbnMoVgogewogICAgIC8vIElmIEphdmFTY3JpcHQgaXMgcnVubmluZywg aXQncyBub3Qgc2FmZSB0byByZWNvbXBpbGUsIHNpbmNlIHdlJ2xsIGVuZAogICAgIC8vIHVwIHRo cm93aW5nIGF3YXkgY29kZSB0aGF0IGlzIGxpdmUgb24gdGhlIHN0YWNrLgotICAgIEFTU0VSVCgh dm0tPmVudHJ5U2NvcGUpOwotICAgIGlmICh2bS0+ZW50cnlTY29wZSkKKyAgICBBU1NFUlQoIXZt LT5maXJzdEVudHJ5U2NvcGUpOworICAgIGlmICh2bS0+Zmlyc3RFbnRyeVNjb3BlKQogICAgICAg ICByZXR1cm47CiAgICAgCiAgICAgdm0tPnByZXBhcmVUb0Rpc2NhcmRDb2RlKCk7CkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAkocmV2aXNpb24gMTYxMTAzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5MSw3ICsy OTEsNyBAQCBib29sIEhlYXA6OmlzUGFnZWRPdXQoZG91YmxlIGRlYWRsaW5lKQogLy8gUnVuIGFs bCBwZW5kaW5nIGZpbmFsaXplcnMgbm93IGJlY2F1c2Ugd2Ugd29uJ3QgZ2V0IGFub3RoZXIgY2hh bmNlLgogdm9pZCBIZWFwOjpsYXN0Q2hhbmNlVG9GaW5hbGl6ZSgpCiB7Ci0gICAgUkVMRUFTRV9B U1NFUlQoIW1fdm0tPmVudHJ5U2NvcGUpOworICAgIFJFTEVBU0VfQVNTRVJUKCFtX3ZtLT5maXJz dEVudHJ5U2NvcGUpOwogICAgIFJFTEVBU0VfQVNTRVJUKG1fb3BlcmF0aW9uSW5Qcm9ncmVzcyA9 PSBOb09wZXJhdGlvbik7CiAKICAgICBtX29iamVjdFNwYWNlLmxhc3RDaGFuY2VUb0ZpbmFsaXpl KCk7CkBAIC02OTUsNyArNjk1LDcgQEAgdm9pZCBIZWFwOjpkZWxldGVBbGxDb21waWxlZENvZGUo KQogewogICAgIC8vIElmIEphdmFTY3JpcHQgaXMgcnVubmluZywgaXQncyBub3Qgc2FmZSB0byBk ZWxldGUgY29kZSwgc2luY2Ugd2UnbGwgZW5kCiAgICAgLy8gdXAgZGVsZXRpbmcgY29kZSB0aGF0 IGlzIGxpdmUgb24gdGhlIHN0YWNrLgotICAgIGlmIChtX3ZtLT5lbnRyeVNjb3BlKQorICAgIGlm IChtX3ZtLT5maXJzdEVudHJ5U2NvcGUpCiAgICAgICAgIHJldHVybjsKIAogICAgIGZvciAoRXhl Y3V0YWJsZUJhc2UqIGN1cnJlbnQgPSBtX2NvbXBpbGVkQ29kZS5oZWFkKCk7IGN1cnJlbnQ7IGN1 cnJlbnQgPSBjdXJyZW50LT5uZXh0KCkpIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnRlcnByZXRlci9DYWxsRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnRlcnByZXRlci9DYWxsRnJhbWUuY3BwCShyZXZpc2lvbiAxNjExMDMpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTMwLDggKzEzMCw4IEBAIEpTR2xvYmFsT2JqZWN0KiBDYWxsRnJhbWU6OnZtRW50cnlH bG9iYWwKIAogICAgIC8vIEZvciBhbnkgRXhlY1N0YXRlIHRoYXQncyBub3QgYSBnbG9iYWxFeGVj LCB0aGUgCiAgICAgLy8gZHluYW1pYyBnbG9iYWwgb2JqZWN0IG11c3QgYmUgc2V0IHNpbmNlIGNv ZGUgaXMgcnVubmluZwotICAgIEFTU0VSVCh2bSgpLmVudHJ5U2NvcGUpOwotICAgIHJldHVybiB2 bSgpLmVudHJ5U2NvcGUtPmdsb2JhbE9iamVjdCgpOworICAgIEFTU0VSVCh2bSgpLmZpcnN0RW50 cnlTY29wZSk7CisgICAgcmV0dXJuIHZtKCkuZmlyc3RFbnRyeVNjb3BlLT5nbG9iYWxPYmplY3Qo KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgSlNDCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aW50ZXJwcmV0ZXIvSlNTdGFjay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2ludGVycHJldGVyL0pTU3RhY2suY3BwCShyZXZpc2lvbiAxNjExMDMpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSlNTdGFjay5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIwNCw4ICsyMDQsOCBAQCB2b2lkIEpTU3RhY2s6OnVwZGF0ZVN0YWNrTGltaXQoKQogICAgIGVs c2UKICAgICAgICAgZGlzYWJsZUVycm9yU3RhY2tSZXNlcnZlKCk7CiAjZW5kaWYKLSAgICBpZiAo bV92bS5lbnRyeVNjb3BlKQotICAgICAgICBtX3ZtLmVudHJ5U2NvcGUtPnVwZGF0ZVN0YWNrTGlt aXQoKTsKKyAgICBpZiAobV92bS5maXJzdEVudHJ5U2NvcGUpCisgICAgICAgIG1fdm0uZmlyc3RF bnRyeVNjb3BlLT51cGRhdGVTdGFja0xpbWl0KCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIEpTQwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmNwcAkocmV2aXNpb24gMTYxMTAzKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xOTgsNyArMTk4LDcgQEAgVk06OlZNKFZNVHlwZSB2bVR5cGUsIEhlYXBUeXBlIGhlYXBUeXBl KQogICAgICwganNBcnJheUNsYXNzSW5mbyhKU0FycmF5OjppbmZvKCkpCiAgICAgLCBqc0ZpbmFs T2JqZWN0Q2xhc3NJbmZvKEpTRmluYWxPYmplY3Q6OmluZm8oKSkKICAgICAsIHNpemVPZkxhc3RT Y3JhdGNoQnVmZmVyKDApCi0gICAgLCBlbnRyeVNjb3BlKDApCisgICAgLCBmaXJzdEVudHJ5U2Nv cGUoMCkKICAgICAsIG1fZW5hYmxlZFByb2ZpbGVyKDApCiAgICAgLCBtX3JlZ0V4cENhY2hlKG5l dyBSZWdFeHBDYWNoZSh0aGlzKSkKICNpZiBFTkFCTEUoUkVHRVhQX1RSQUNJTkcpCkBAIC01NTAs NyArNTUwLDcgQEAgdm9pZCBWTTo6cmVsZWFzZUV4ZWN1dGFibGVNZW1vcnkoKQogewogICAgIHBy ZXBhcmVUb0Rpc2NhcmRDb2RlKCk7CiAgICAgCi0gICAgaWYgKGVudHJ5U2NvcGUpIHsKKyAgICBp ZiAoZmlyc3RFbnRyeVNjb3BlKSB7CiAgICAgICAgIFN0YWNrUHJlc2VydmluZ1JlY29tcGlsZXIg cmVjb21waWxlcjsKICAgICAgICAgSGVhcEl0ZXJhdGlvblNjb3BlIGl0ZXJhdGlvblNjb3BlKGhl YXApOwogICAgICAgICBIYXNoU2V0PEpTQ2VsbCo+IHJvb3RzOwpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvVk0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9WTS5oCShyZXZpc2lvbiAxNjExMDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9WTS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MjYsNyArNDI2LDcgQEAgbmFtZXNw YWNlIEpTQyB7CiAKICAgICAgICAgdm9pZCBnYXRoZXJDb25zZXJ2YXRpdmVSb290cyhDb25zZXJ2 YXRpdmVSb290cyYpOwogCi0gICAgICAgIFZNRW50cnlTY29wZSogZW50cnlTY29wZTsKKyAgICAg ICAgVk1FbnRyeVNjb3BlKiBmaXJzdEVudHJ5U2NvcGU7CiAKICAgICAgICAgSGFzaFNldDxKU09i amVjdCo+IHN0cmluZ1JlY3Vyc2lvbkNoZWNrVmlzaXRlZE9iamVjdHM7CiAKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNRW50cnlTY29wZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1FbnRyeVNjb3BlLmNwcAkocmV2aXNpb24g MTYxMTAzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1FbnRyeVNjb3BlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzUsMTYgKzM1LDE2IEBAIFZNRW50cnlTY29wZTo6Vk1FbnRy eVNjb3BlKFZNJiB2bSwgSlNHbG8KICAgICA6IG1fdm0odm0pCiAgICAgLCBtX3N0YWNrKHd0ZlRo cmVhZERhdGEoKS5zdGFjaygpKQogICAgICwgbV9nbG9iYWxPYmplY3QoZ2xvYmFsT2JqZWN0KQot ICAgICwgbV9wcmV2KHZtLmVudHJ5U2NvcGUpCisgICAgLCBtX3ByZXZGaXJzdEVudHJ5U2NvcGUo dm0uZmlyc3RFbnRyeVNjb3BlKQogICAgICwgbV9wcmV2U3RhY2tMaW1pdCh2bS5zdGFja0xpbWl0 KCkpCiAgICAgLCBtX3ByZXZMYXN0U3RhY2tUb3Aodm0ubGFzdFN0YWNrVG9wKCkpCiB7Ci0gICAg aWYgKCF2bS5lbnRyeVNjb3BlKSB7CisgICAgaWYgKCF2bS5maXJzdEVudHJ5U2NvcGUpIHsKICNp ZiBFTkFCTEUoQVNTRU1CTEVSKQogICAgICAgICBpZiAoRXhlY3V0YWJsZUFsbG9jYXRvcjo6dW5k ZXJNZW1vcnlQcmVzc3VyZSgpKQogICAgICAgICAgICAgdm0uaGVhcC5kZWxldGVBbGxDb21waWxl ZENvZGUoKTsKICNlbmRpZgotICAgICAgICB2bS5lbnRyeVNjb3BlID0gdGhpczsKKyAgICAgICAg dm0uZmlyc3RFbnRyeVNjb3BlID0gdGhpczsKIAogICAgICAgICAvLyBSZXNldCB0aGUgZGF0ZSBj YWNoZSBiZXR3ZWVuIEpTIGludm9jYXRpb25zIHRvIGZvcmNlIHRoZSBWTSB0bwogICAgICAgICAv LyBvYnNlcnZlIHRpbWUgeG9uZSBjaGFuZ2VzLgpAQCAtNTksNyArNTksNyBAQCBWTUVudHJ5U2Nv cGU6OlZNRW50cnlTY29wZShWTSYgdm0sIEpTR2xvCiAKIFZNRW50cnlTY29wZTo6flZNRW50cnlT Y29wZSgpCiB7Ci0gICAgbV92bS5lbnRyeVNjb3BlID0gbV9wcmV2OworICAgIG1fdm0uZmlyc3RF bnRyeVNjb3BlID0gbV9wcmV2Rmlyc3RFbnRyeVNjb3BlOwogICAgIG1fdm0uc2V0U3RhY2tMaW1p dChtX3ByZXZTdGFja0xpbWl0KTsKICAgICBtX3ZtLnNldExhc3RTdGFja1RvcChtX3ByZXZMYXN0 U3RhY2tUb3ApOwogfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1FbnRy eVNjb3BlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1F bnRyeVNjb3BlLmgJKHJldmlzaW9uIDE2MTEwMykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL1ZNRW50cnlTY29wZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01MSw4ICs1MSw4IEBAIHBy aXZhdGU6CiAgICAgU3RhY2tCb3VuZHMgbV9zdGFjazsKICAgICBKU0dsb2JhbE9iamVjdCogbV9n bG9iYWxPYmplY3Q7CiAKLSAgICAvLyBtX3ByZXYsIG1fcHJldlN0YWNrTGltaXQgJiBtX3ByZXZM YXN0U3RhY2tUb3AgbWF5IGJlbG9uZyB0byBhIGRpZmZlcmVudCB0aHJlYWQncyBzdGFjay4KLSAg ICBWTUVudHJ5U2NvcGUqIG1fcHJldjsKKyAgICAvLyBtX3ByZXZGaXJzdEVudHJ5U2NvcGUsIG1f cHJldlN0YWNrTGltaXQgJiBtX3ByZXZMYXN0U3RhY2tUb3AgbWF5IGJlbG9uZyB0byBhIGRpZmZl cmVudCB0aHJlYWQncyBzdGFjay4KKyAgICBWTUVudHJ5U2NvcGUqIG1fcHJldkZpcnN0RW50cnlT Y29wZTsKICAgICB2b2lkKiBtX3ByZXZTdGFja0xpbWl0OwogICAgIHZvaWQqIG1fcHJldkxhc3RT dGFja1RvcDsKIH07Cg== 220267 2014-01-02 16:34:16 -0800 2014-01-03 12:07:36 -0800 follow up patch to remove the need for VMEntryScope::m_prevFirstEntryScope. bug-126266b.patch text/plain 2796 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYxMjQwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDE0LTAxLTAyICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG b2xsb3cgdXAgcGF0Y2ggdG8gcmVtb3ZlIHRoZSBuZWVkIGZvciBWTUVudHJ5U2NvcGU6Om1fcHJl dkZpcnN0RW50cnlTY29wZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyNjI2Ni4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGVyZSBjYW4gb25seSBiZSBvbmUgZmlyc3RFbnRyeVNjb3BlLiBJbnN0ZWFk IG9mIHNhdmluZyB0aGUgcHJldmlvdXMgdmFsdWUgb2YKKyAgICAgICAgVk06OmZpcnN0RW50cnlT Y29wZSwgd2Ugbm93IGNoZWNrIGlmIHRoZSBmaXJzdEVudHJ5U2NvcGUgaXMgdGhlIHNhbWUgYXMg dGhpcworICAgICAgICBWTUVudHJ5U2NvcGUgaW4gaXRzIGRlc3RydWN0b3IuIElmIHNvLCB3ZSB3 aWxsIHNldCBWTTo6Zmlyc3RFbnRyeVNjb3BlIHRvIDAuCisKKyAgICAgICAgKiBydW50aW1lL1ZN RW50cnlTY29wZS5jcHA6CisgICAgICAgIChKU0M6OlZNRW50cnlTY29wZTo6Vk1FbnRyeVNjb3Bl KToKKyAgICAgICAgKEpTQzo6Vk1FbnRyeVNjb3BlOjp+Vk1FbnRyeVNjb3BlKToKKyAgICAgICAg KiBydW50aW1lL1ZNRW50cnlTY29wZS5oOgorCiAyMDE0LTAxLTAyICBNYXJrIExhbSAgPG1hcmsu bGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGRyZXNzZWQgcmV2aWV3IGNvbW1lbnRzIGluIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjYzOTMjYzUuCkBAIC0zNTks NiArMzc1LDkgQEAKIAogICAgICAgICBOb3QgeWV0IHJldmlld2VkLgogCisgICAgICAgIFRoaXMg cGF0Y2ggaXMgc28gdGhhdCB3ZSBjYW4gZGlzdGluZ3Vpc2ggZmlyc3RFbnRyeVNjb3BlIGZyb20g dG9wRW50cnlTY29wZQorICAgICAgICB3aGljaCB3aWxsIGJlIGludHJvZHVjZWQgbGF0ZXIgaW4g aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjMzNC4KKwogICAgICAg ICBBbHNvIHJlbmFtZWQgVk1FbnRyeVNjb3BlOjptX3ByZXYgdG8gbV9wcmV2Rmlyc3RFbnRyeVNj b3BlLgogCiAgICAgICAgICogZGVidWdnZXIvRGVidWdnZXIuY3BwOgpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1FbnRyeVNjb3BlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTUVudHJ5U2NvcGUuY3BwCShyZXZpc2lvbiAxNjEy MzkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTUVudHJ5U2NvcGUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNyw2IEBAIFZNRW50cnlTY29wZTo6Vk1FbnRyeVNjb3Bl KFZNJiB2bSwgSlNHbG8KICAgICAsIG1fc3RhY2sod3RmVGhyZWFkRGF0YSgpLnN0YWNrKCkpCiAg ICAgLCBtX2dsb2JhbE9iamVjdChnbG9iYWxPYmplY3QpCiAgICAgLCBtX3ByZXZTdGFja1VzYWdl KDApCi0gICAgLCBtX3ByZXZGaXJzdEVudHJ5U2NvcGUodm0uZmlyc3RFbnRyeVNjb3BlKQogICAg ICwgbV9wcmV2VG9wRW50cnlTY29wZSh2bS50b3BFbnRyeVNjb3BlKQogICAgICwgbV9wcmV2U3Rh Y2tMaW1pdCh2bS5zdGFja0xpbWl0KCkpCiAjaWYgIUVOQUJMRShMTElOVF9DX0xPT1ApCkBAIC04 Myw3ICs4Miw4IEBAIFZNRW50cnlTY29wZTo6Vk1FbnRyeVNjb3BlKFZNJiB2bSwgSlNHbG8KIAog Vk1FbnRyeVNjb3BlOjp+Vk1FbnRyeVNjb3BlKCkKIHsKLSAgICBtX3ZtLmZpcnN0RW50cnlTY29w ZSA9IG1fcHJldkZpcnN0RW50cnlTY29wZTsKKyAgICBpZiAobV92bS5maXJzdEVudHJ5U2NvcGUg PT0gdGhpcykKKyAgICAgICAgbV92bS5maXJzdEVudHJ5U2NvcGUgPSBudWxscHRyOwogICAgIG1f dm0udG9wRW50cnlTY29wZSA9IG1fcHJldlRvcEVudHJ5U2NvcGU7CiAgICAgbV92bS5zZXRTdGFj a0xpbWl0KG1fcHJldlN0YWNrTGltaXQpOwogI2lmICFFTkFCTEUoTExJTlRfQ19MT09QKQpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1FbnRyeVNjb3BlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1FbnRyeVNjb3BlLmgJKHJldmlz aW9uIDE2MTIzOSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNRW50cnlTY29w ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01OSw3ICs1OSw2IEBAIHByaXZhdGU6CiAgICAgc2l6ZV90 IG1fcHJldlN0YWNrVXNhZ2U7CiAKICAgICAvLyBUaGUgZm9sbG93aW5nIHBvaW50ZXJzIG1heSBw b2ludCB0byBhIGRpZmZlcmVudCB0aHJlYWQncyBzdGFjay4KLSAgICBWTUVudHJ5U2NvcGUqIG1f cHJldkZpcnN0RW50cnlTY29wZTsKICAgICBWTUVudHJ5U2NvcGUqIG1fcHJldlRvcEVudHJ5U2Nv cGU7CiAgICAgdm9pZCogbV9wcmV2U3RhY2tMaW1pdDsKICNpZiAhRU5BQkxFKExMSU5UX0NfTE9P UCkK