112952 2013-03-21 12:41:21 -0700 JSC: Fix lexer charPosition computation when “rewind"ing the lexer 2013-03-21 13:09:02 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam fpizlo ggaren joepeck mhahnenberg msaboff oliver timothy oldest_to_newest 860582 0 mark.lam 2013-03-21 12:41:21 -0700 Currently, the lexer keeps a m_charPosition field which is supposed to track the m_code pointer. m_charPosition used to be m_column which cannot be computed directly from the m_code pointer. Now that we’re computing the char position instead of the column, we can get rid of m_charPosition and just compute it as m_code - m_codeStartPlusOffset, where m_codeStartPlusOffset is m_codeStart + the SourceCode offset. This fixes a bug where m_charPosition gets out of sync with m_code when we “rewind” the lexer by setting m_code back to an earlier position in the source string. ref: <rdar://problem/13467032>. 860588 1 194322 mark.lam 2013-03-21 12:50:41 -0700 Created attachment 194322 the patch 860602 2 194322 msaboff 2013-03-21 13:04:42 -0700 Comment on attachment 194322 the patch Looks good. 860608 3 mark.lam 2013-03-21 13:09:02 -0700 Thanks for the review. Landed in r146505: <http://trac.webkit.org/changeset/146505>. 194322 2013-03-21 12:50:41 -0700 2013-03-21 13:04:42 -0700 the patch bug-112952.patch text/plain 4381 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ2NDk4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDEzLTAzLTIxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggbGV4ZXIgY2hhclBvc2l0aW9uIGNvbXB1dGF0aW9uIHdoZW4gInJld2luZCJpbmcgdGhlIGxl eGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEy OTUyLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENo YW5nZWQgdGhlIExleGVyIHRvIG5vIGxvbmdlciBrZWVwIGEgbV9jaGFyUG9zaXRpb24uIEluc3Rl YWQsIHdlIGNvbXB1dGUKKyAgICAgICAgY3VycmVudENoYXJQb3NpdGlvbigpIGZyb20gbV9jb2Rl IGFuZCBtX2NvZGVTdGFydFBsdXNPZmZzZXQsIHdoZXJlCisgICAgICAgIG1fY29kZVN0YXJ0UGx1 c09mZnNldCBpcyB0aGUgU291cmNlUHJvdmlkZXIgbV9jb2RlU3RhcnQgKyB0aGUgU291cmNlQ29k ZQorICAgICAgICBzdGFydCBvZmZzZXQuIFRoaXMgZW5zdXJlcyB0aGF0IHRoZSBjaGFyUG9zaXRp b24gaXMgYWx3YXlzIGluIHN5bmMgd2l0aAorICAgICAgICBtX2NvZGUuCisKKyAgICAgICAgKiBw YXJzZXIvTGV4ZXIuY3BwOgorICAgICAgICAoSlNDOjo6OnNldENvZGUpOgorICAgICAgICAoSlND Ojo6OmludGVybmFsU2hpZnQpOgorICAgICAgICAoSlNDOjo6OnNoaWZ0KToKKyAgICAgICAgKEpT Qzo6OjpsZXgpOgorICAgICAgICAqIHBhcnNlci9MZXhlci5oOgorICAgICAgICAoSlNDOjpMZXhl cjo6Y3VycmVudENoYXJQb3NpdGlvbik6CisgICAgICAgIChKU0M6Ojo6bGV4RXhwZWN0SWRlbnRp Zmllcik6CisKIDIwMTMtMDMtMjEgIE1hcmsgSGFobmVuYmVyZyAgPG1oYWhuZW5iZXJnQGFwcGxl LmNvbT4KIAogICAgICAgICBPYmplY3RpdmUtQyBBUEk6IHdyYXBwZXJDbGFzcyBob2xkcyBhIHN0 YXRpYyBKU0NsYXNzUmVmLCB3aGljaCBjYXVzZXMgSlNHbG9iYWxPYmplY3RzIHRvIGxlYWsKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTGV4ZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTGV4ZXIuY3BwCShyZXZpc2lvbiAxNDYzNjIp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL0xleGVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTQ2LDExICs1NDYsMTEgQEAgdm9pZCBMZXhlcjxUPjo6c2V0Q29kZShjb25zdCBTb3Vy Y2VDb2RlJgogICAgICAgICBtX2NvZGVTdGFydCA9IDA7CiAKICAgICBtX3NvdXJjZSA9ICZzb3Vy Y2U7Ci0gICAgbV9jb2RlID0gbV9jb2RlU3RhcnQgKyBzb3VyY2Uuc3RhcnRPZmZzZXQoKTsKKyAg ICBtX2NvZGVTdGFydFBsdXNPZmZzZXQgPSBtX2NvZGVTdGFydCArIHNvdXJjZS5zdGFydE9mZnNl dCgpOworICAgIG1fY29kZSA9IG1fY29kZVN0YXJ0UGx1c09mZnNldDsKICAgICBtX2NvZGVFbmQg PSBtX2NvZGVTdGFydCArIHNvdXJjZS5lbmRPZmZzZXQoKTsKICAgICBtX2Vycm9yID0gZmFsc2U7 CiAgICAgbV9hdExpbmVTdGFydCA9IHRydWU7Ci0gICAgbV9jaGFyUG9zaXRpb24gPSAwOwogICAg IG1fbGV4RXJyb3JNZXNzYWdlID0gU3RyaW5nKCk7CiAgICAgCiAgICAgbV9idWZmZXI4LnJlc2Vy dmVJbml0aWFsQ2FwYWNpdHkoaW5pdGlhbFJlYWRCdWZmZXJDYXBhY2l0eSk7CkBAIC01NjcsNyAr NTY3LDYgQEAgdGVtcGxhdGUgPHR5cGVuYW1lIFQ+CiB0ZW1wbGF0ZSA8aW50IHNoaWZ0QW1vdW50 PiBBTFdBWVNfSU5MSU5FIHZvaWQgTGV4ZXI8VD46OmludGVybmFsU2hpZnQoKQogewogICAgIG1f Y29kZSArPSBzaGlmdEFtb3VudDsKLSAgICBtX2NoYXJQb3NpdGlvbiArPSBzaGlmdEFtb3VudDsK ICAgICBtX2N1cnJlbnQgPSAqbV9jb2RlOwogfQogCkBAIC01NzksNyArNTc4LDYgQEAgQUxXQVlT X0lOTElORSB2b2lkIExleGVyPFQ+OjpzaGlmdCgpCiAgICAgKyttX2NvZGU7CiAgICAgaWYgKExJ S0VMWShtX2NvZGUgPCBtX2NvZGVFbmQpKQogICAgICAgICBtX2N1cnJlbnQgPSAqbV9jb2RlOwot ICAgICsrbV9jaGFyUG9zaXRpb247CiB9CiAKIHRlbXBsYXRlIDx0eXBlbmFtZSBUPgpAQCAtMTMx OSw3ICsxMzE3LDcgQEAgc3RhcnQ6CiAgICAgICAgIHJldHVybiBFT0ZUT0s7CiAgICAgCiAgICAg dG9rZW5Mb2NhdGlvbi0+c3RhcnRPZmZzZXQgPSBjdXJyZW50T2Zmc2V0KCk7Ci0gICAgdG9rZW5M b2NhdGlvbi0+Y2hhclBvc2l0aW9uID0gbV9jaGFyUG9zaXRpb247CisgICAgdG9rZW5Mb2NhdGlv bi0+Y2hhclBvc2l0aW9uID0gY3VycmVudENoYXJQb3NpdGlvbigpOwogCiAgICAgQ2hhcmFjdGVy VHlwZSB0eXBlOwogICAgIGlmIChMSUtFTFkoaXNMYXRpbjEobV9jdXJyZW50KSkpCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL0xleGVyLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL3BhcnNlci9MZXhlci5oCShyZXZpc2lvbiAxNDYzNjIpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL0xleGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTkwLDcg KzkwLDcgQEAgcHVibGljOgogICAgIEpTVG9rZW5UeXBlIGxleChKU1Rva2VuRGF0YSosIEpTVG9r ZW5Mb2NhdGlvbiosIHVuc2lnbmVkLCBib29sIHN0cmljdE1vZGUpOwogICAgIGJvb2wgbmV4dFRv a2VuSXNDb2xvbigpOwogICAgIGludCBsaW5lTnVtYmVyKCkgY29uc3QgeyByZXR1cm4gbV9saW5l TnVtYmVyOyB9Ci0gICAgaW50IGN1cnJlbnRDaGFyUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBt X2NoYXJQb3NpdGlvbjsgfQorICAgIGludCBjdXJyZW50Q2hhclBvc2l0aW9uKCkgY29uc3QgeyBy ZXR1cm4gbV9jb2RlIC0gbV9jb2RlU3RhcnRQbHVzT2Zmc2V0OyB9CiAgICAgdm9pZCBzZXRMYXN0 TGluZU51bWJlcihpbnQgbGFzdExpbmVOdW1iZXIpIHsgbV9sYXN0TGluZU51bWJlciA9IGxhc3RM aW5lTnVtYmVyOyB9CiAgICAgaW50IGxhc3RMaW5lTnVtYmVyKCkgY29uc3QgeyByZXR1cm4gbV9s YXN0TGluZU51bWJlcjsgfQogICAgIGJvb2wgcHJldlRlcm1pbmF0b3IoKSBjb25zdCB7IHJldHVy biBtX3Rlcm1pbmF0b3I7IH0KQEAgLTE3MCw3ICsxNzAsNiBAQCBwcml2YXRlOgogCiAgICAgaW50 IG1fbGluZU51bWJlcjsKICAgICBpbnQgbV9sYXN0TGluZU51bWJlcjsKLSAgICBpbnQgbV9jaGFy UG9zaXRpb247CiAKICAgICBWZWN0b3I8TENoYXI+IG1fYnVmZmVyODsKICAgICBWZWN0b3I8VUNo YXI+IG1fYnVmZmVyMTY7CkBAIC0xODEsNiArMTgwLDcgQEAgcHJpdmF0ZToKICAgICBjb25zdCBU KiBtX2NvZGU7CiAgICAgY29uc3QgVCogbV9jb2RlU3RhcnQ7CiAgICAgY29uc3QgVCogbV9jb2Rl RW5kOworICAgIGNvbnN0IFQqIG1fY29kZVN0YXJ0UGx1c09mZnNldDsKICAgICBib29sIG1faXNS ZXBhcnNpbmc7CiAgICAgYm9vbCBtX2F0TGluZVN0YXJ0OwogICAgIGJvb2wgbV9lcnJvcjsKQEAg LTMxNyw3ICszMTcsNiBAQCBBTFdBWVNfSU5MSU5FIEpTVG9rZW5UeXBlIExleGVyPFQ+OjpsZXhF CiAgICAgICAgIG1fY3VycmVudCA9IDA7CiAKICAgICBtX2NvZGUgPSBwdHI7Ci0gICAgbV9jaGFy UG9zaXRpb24gPSBtX2NoYXJQb3NpdGlvbiArIChtX2NvZGUgLSBzdGFydCk7CiAKICAgICAvLyBD cmVhdGUgdGhlIGlkZW50aWZpZXIgaWYgbmVlZGVkCiAgICAgaWYgKGxleGVyRmxhZ3MgJiBMZXhl eEZsYWdzRG9udEJ1aWxkS2V5d29yZHMpCkBAIC0zMjcsNyArMzI2LDcgQEAgQUxXQVlTX0lOTElO RSBKU1Rva2VuVHlwZSBMZXhlcjxUPjo6bGV4RQogICAgIHRva2VuTG9jYXRpb24tPmxpbmUgPSBt X2xpbmVOdW1iZXI7CiAgICAgdG9rZW5Mb2NhdGlvbi0+c3RhcnRPZmZzZXQgPSBzdGFydCAtIG1f Y29kZVN0YXJ0OwogICAgIHRva2VuTG9jYXRpb24tPmVuZE9mZnNldCA9IGN1cnJlbnRPZmZzZXQo KTsKLSAgICB0b2tlbkxvY2F0aW9uLT5jaGFyUG9zaXRpb24gPSBtX2NoYXJQb3NpdGlvbjsKKyAg ICB0b2tlbkxvY2F0aW9uLT5jaGFyUG9zaXRpb24gPSBjdXJyZW50Q2hhclBvc2l0aW9uKCk7CiAg ICAgbV9sYXN0VG9rZW4gPSBJREVOVDsKICAgICByZXR1cm4gSURFTlQ7CiAgICAgCg==