45289 2010-09-07 04:47:04 -0700 Refactoring multiline comments in the lexer 2010-09-09 13:28:02 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 zherczeg webkit-unassigned abarth darin eric webkit.review.bot oldest_to_newest 274966 0 zherczeg 2010-09-07 04:47:04 -0700 Removing more labels. 274990 1 66713 zherczeg 2010-09-07 06:05:12 -0700 Created attachment 66713 patch --parse-only reports a big change, but I am unsure it is really caused by the patch. Who knows... ============================================================================= ** TOTAL **: 1.063x as fast 33.6ms +/- 1.5% 31.6ms +/- 1.6% significant ============================================================================= jquery: - 5.1ms +/- 4.4% 4.9ms +/- 4.6% 1.3.2: - 5.1ms +/- 4.4% 4.9ms +/- 4.6% mootools: 1.080x as fast 5.4ms +/- 6.8% 5.0ms +/- 0.0% significant 1.2.2-core-nc: 1.080x as fast 5.4ms +/- 6.8% 5.0ms +/- 0.0% significant prototype: 1.067x as fast 6.4ms +/- 5.8% 6.0ms +/- 0.0% significant 1.6.0.3: 1.067x as fast 6.4ms +/- 5.8% 6.0ms +/- 0.0% significant concat: 1.064x as fast 16.7ms +/- 2.1% 15.7ms +/- 2.2% significant jquery-mootools-prototype: 1.064x as fast 16.7ms +/- 2.1% 15.7ms +/- 2.2% significant SS has no change: ============================================================================= ** TOTAL **: - 523.1ms +/- 0.6% 521.2ms +/- 0.5% ============================================================================= 275299 2 66713 darin 2010-09-07 14:34:10 -0700 Comment on attachment 66713 patch > + if (UNLIKELY(m_current == '*')) { > + shift(); > + if (m_current == '/') { > + shift(); > + return true; > + } > + if (m_current == '*') > + continue; > + } This ends up comparing with '*' twice, which seems like a shame given it's also slightly confusing logic. Instead of the if statement and the continue statement, we could just use while instead of if. Does that make things slower? > @@ -1002,7 +1027,8 @@ inNumberAfterDecimalPoint: > m_terminator = true; > if (lastTokenWasRestrKeyword()) { > token = SEMICOLON; > - goto doneSemicolon; > + m_delimited = true; > + goto returnToken; > } > goto start; > case CharacterInvalid: Why is this change included in the same patch? It seems unrelated and should be done based on its own merits, not as a ridealong. We can keep the doneSemicolon symbol. 275704 3 66863 zherczeg 2010-09-08 02:45:34 -0700 Created attachment 66863 Reworked patch Just upload the final version of the patch. 275708 4 zherczeg 2010-09-08 03:08:08 -0700 Landed in http://trac.webkit.org/changeset/66962. 275741 5 66874 zherczeg 2010-09-08 04:09:42 -0700 Created attachment 66874 removing doneSemicolon label I still see the perf increase after apply these simple changes. 33.6ms -> 32.8ms (previous patch) -> 31.5ms (this patch) 276334 6 zherczeg 2010-09-08 23:54:51 -0700 Landed in http://trac.webkit.org/changeset/67066 276705 7 webkit.review.bot 2010-09-09 13:28:02 -0700 http://trac.webkit.org/changeset/67066 might have broken Leopard Intel Debug (Tests) The following changes are on the blame list: http://trac.webkit.org/changeset/67065 http://trac.webkit.org/changeset/67066 66713 2010-09-07 06:05:12 -0700 2010-09-08 03:08:20 -0700 patch 0001-lexer-multiline-comment.patch text/plain 4634 zherczeg RnJvbSBmNmE1OTcxM2E3YWU1OWJjMmY5ZGI2ZTlhMjYwMmRjMzQ1NjU4OGQ5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBab2x0YW4gSGVyY3plZyA8emhlcmN6ZWdAaW5mLnUtc3plZ2Vk Lmh1PgpEYXRlOiBUdWUsIDcgU2VwIDIwMTAgMTU6MDE6MzMgKzAyMDAKU3ViamVjdDogW1BBVENI XSBsZXhlci1tdWx0aWxpbmUtY29tbWVudAoKU2lnbmVkLW9mZi1ieTogWm9sdGFuIEhlcmN6ZWcg PHpoZXJjemVnQGluZi51LXN6ZWdlZC5odT4KLS0tCiBKYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cg ICAgICAgIHwgICAyMCArKysrKysrKysrKysKIEphdmFTY3JpcHRDb3JlL3BhcnNlci9MZXhlci5j cHAgfCAgIDYzICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogSmF2YVNj cmlwdENvcmUvcGFyc2VyL0xleGVyLmggICB8ICAgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCA1MyBp bnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cgYi9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggOWEzNTdiNS4uNjJm OWEzNCAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL0phdmFTY3Jp cHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEwLTA5LTA3ICBab2x0YW4gSGVy Y3plZyAgPHpoZXJjemVnQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3JpbmcgbXVsdGlsaW5lIGNvbW1lbnRzIGluIHRo ZSBsZXhlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDUyODkKKworICAgICAgICBNdWx0aUxpbmUgY29tbWVudCBwYXJzaW5nIGlzIG1vdmVkIHRvIGEg c2VwYXJhdGUKKyAgICAgICAgZnVuY3Rpb24sIGFuZCBkb25lU2VtaWNvbG9uIGxhYmVsIGlzIHJl bW92ZWQuCisKKyAgICAgICAgSW4gbXkgbWFjaGluZSwgdGhlIC0tcGFyc2Utb25seSBwZXJmb3Jt YW5jZSBpcyBpbmNyZWFzZWQKKyAgICAgICAgYnkgNiUgKGZyb20gMzMuNm1zIHRvIDMxLjZtcyks IGJ1dCBJIGZlZWwgaXQgaXMgbW9yZSBvZiBhIGNvZGUKKyAgICAgICAgbW90aW9uIHJhdGhlciB0 aGFuIGEgcmVhbCBzcGVlZCBpbmNyZWFzZS4gU3VuU3BpZGVyIHJlcG9ydHMgbm8KKyAgICAgICAg Y2hhbmdlIChmcm9tIDUyMy4xbXMgdG8gNTIxLjJtcykuCisKKyAgICAgICAgKiBwYXJzZXIvTGV4 ZXIuY3BwOgorICAgICAgICAoSlNDOjpMZXhlcjo6cGFyc2VNdWx0aWxpbmVDb21tZW50KToKKyAg ICAgICAgKEpTQzo6TGV4ZXI6OmxleCk6CisgICAgICAgICogcGFyc2VyL0xleGVyLmg6CisKIDIw MTAtMDktMDYgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBXaW5k b3dzIGJ1aWxkIGZpeApkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvcGFyc2VyL0xleGVyLmNw cCBiL0phdmFTY3JpcHRDb3JlL3BhcnNlci9MZXhlci5jcHAKaW5kZXggNmM0ZGIzMi4uZjIyMmIz NyAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvcGFyc2VyL0xleGVyLmNwcAorKysgYi9KYXZh U2NyaXB0Q29yZS9wYXJzZXIvTGV4ZXIuY3BwCkBAIC02NzUsNiArNjc1LDI5IEBAIEFMV0FZU19J TkxJTkUgYm9vbCBMZXhlcjo6cGFyc2VOdW1iZXJBZnRlckV4cG9uZW50SW5kaWNhdG9yKCkKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIAorQUxXQVlTX0lOTElORSBib29sIExleGVyOjpwYXJzZU11bHRp bGluZUNvbW1lbnQoKQoreworICAgIHdoaWxlICh0cnVlKSB7CisgICAgICAgIGlmIChVTkxJS0VM WShtX2N1cnJlbnQgPT0gJyonKSkgeworICAgICAgICAgICAgc2hpZnQoKTsKKyAgICAgICAgICAg IGlmIChtX2N1cnJlbnQgPT0gJy8nKSB7CisgICAgICAgICAgICAgICAgc2hpZnQoKTsKKyAgICAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmICht X2N1cnJlbnQgPT0gJyonKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisK KyAgICAgICAgaWYgKFVOTElLRUxZKG1fY3VycmVudCA9PSAtMSkpCisgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICAgICAgaWYgKGlzTGluZVRlcm1pbmF0b3IobV9jdXJyZW50KSkKKyAg ICAgICAgICAgIHNoaWZ0TGluZVRlcm1pbmF0b3IoKTsKKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgc2hpZnQoKTsKKyAgICB9Cit9CisKIEpTVG9rZW5UeXBlIExleGVyOjpsZXgoSlNUb2tlbkRh dGEqIGx2YWxwLCBKU1Rva2VuSW5mbyogbGxvY3AsIExleFR5cGUgbGV4VHlwZSkKIHsKICAgICBB U1NFUlQoIW1fZXJyb3IpOwpAQCAtODM1LDcgKzg1OCw5IEBAIHN0YXJ0OgogICAgICAgICB9CiAg ICAgICAgIGlmIChtX2N1cnJlbnQgPT0gJyonKSB7CiAgICAgICAgICAgICBzaGlmdCgpOwotICAg ICAgICAgICAgZ290byBpbk11bHRpTGluZUNvbW1lbnQ7CisgICAgICAgICAgICBpZiAocGFyc2VN dWx0aWxpbmVDb21tZW50KCkpCisgICAgICAgICAgICAgICAgZ290byBzdGFydDsKKyAgICAgICAg ICAgIGdvdG8gcmV0dXJuRXJyb3I7CiAgICAgICAgIH0KICAgICAgICAgaWYgKG1fY3VycmVudCA9 PSAnPScpIHsKICAgICAgICAgICAgIHNoaWZ0KCk7CkBAIC0xMDAyLDcgKzEwMjcsOCBAQCBpbk51 bWJlckFmdGVyRGVjaW1hbFBvaW50OgogICAgICAgICBtX3Rlcm1pbmF0b3IgPSB0cnVlOwogICAg ICAgICBpZiAobGFzdFRva2VuV2FzUmVzdHJLZXl3b3JkKCkpIHsKICAgICAgICAgICAgIHRva2Vu ID0gU0VNSUNPTE9OOwotICAgICAgICAgICAgZ290byBkb25lU2VtaWNvbG9uOworICAgICAgICAg ICAgbV9kZWxpbWl0ZWQgPSB0cnVlOworICAgICAgICAgICAgZ290byByZXR1cm5Ub2tlbjsKICAg ICAgICAgfQogICAgICAgICBnb3RvIHN0YXJ0OwogICAgIGNhc2UgQ2hhcmFjdGVySW52YWxpZDoK QEAgLTEwMjQsNDQgKzEwNTAsMTkgQEAgaW5TaW5nbGVMaW5lQ29tbWVudDoKICAgICBzaGlmdExp bmVUZXJtaW5hdG9yKCk7CiAgICAgbV9hdExpbmVTdGFydCA9IHRydWU7CiAgICAgbV90ZXJtaW5h dG9yID0gdHJ1ZTsKLSAgICBpZiAobGFzdFRva2VuV2FzUmVzdHJLZXl3b3JkKCkpCi0gICAgICAg IGdvdG8gZG9uZVNlbWljb2xvbjsKLSAgICBnb3RvIHN0YXJ0OwotCi1pbk11bHRpTGluZUNvbW1l bnQ6Ci0gICAgd2hpbGUgKHRydWUpIHsKLSAgICAgICAgaWYgKFVOTElLRUxZKG1fY3VycmVudCA9 PSAnKicpKSB7Ci0gICAgICAgICAgICBzaGlmdCgpOwotICAgICAgICAgICAgaWYgKG1fY3VycmVu dCA9PSAnLycpCi0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBpZiAobV9jdXJy ZW50ID09ICcqJykKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotCi0gICAg ICAgIGlmIChVTkxJS0VMWShtX2N1cnJlbnQgPT0gLTEpKQotICAgICAgICAgICAgZ290byByZXR1 cm5FcnJvcjsKLQotICAgICAgICBpZiAoaXNMaW5lVGVybWluYXRvcihtX2N1cnJlbnQpKQotICAg ICAgICAgICAgc2hpZnRMaW5lVGVybWluYXRvcigpOwotICAgICAgICBlbHNlCi0gICAgICAgICAg ICBzaGlmdCgpOwotICAgIH0KLSAgICBzaGlmdCgpOwotICAgIGdvdG8gc3RhcnQ7CisgICAgaWYg KCFsYXN0VG9rZW5XYXNSZXN0cktleXdvcmQoKSkKKyAgICAgICAgZ290byBzdGFydDsKIAotZG9u ZVNlbWljb2xvbjoKICAgICB0b2tlbiA9IFNFTUlDT0xPTjsKICAgICBtX2RlbGltaXRlZCA9IHRy dWU7CiAgICAgLy8gRmFsbCB0aHJvdWdoIGludG8gcmV0dXJuVG9rZW4uCiAKLXJldHVyblRva2Vu OiB7Ci0gICAgaW50IGxpbmVOdW1iZXIgPSBtX2xpbmVOdW1iZXI7Ci0gICAgbGxvY3AtPmxpbmUg PSBsaW5lTnVtYmVyOworcmV0dXJuVG9rZW46CisgICAgbGxvY3AtPmxpbmUgPSBtX2xpbmVOdW1i ZXI7CiAgICAgbGxvY3AtPnN0YXJ0T2Zmc2V0ID0gc3RhcnRPZmZzZXQ7CiAgICAgbGxvY3AtPmVu ZE9mZnNldCA9IGN1cnJlbnRPZmZzZXQoKTsKICAgICBtX2xhc3RUb2tlbiA9IHRva2VuOwogICAg IHJldHVybiB0b2tlbjsKLX0KIAogcmV0dXJuRXJyb3I6CiAgICAgbV9lcnJvciA9IHRydWU7CmRp ZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTGV4ZXIuaCBiL0phdmFTY3JpcHRDb3Jl L3BhcnNlci9MZXhlci5oCmluZGV4IGRhODRhNmIuLmU2YzFlZmQgMTAwNjQ0Ci0tLSBhL0phdmFT Y3JpcHRDb3JlL3BhcnNlci9MZXhlci5oCisrKyBiL0phdmFTY3JpcHRDb3JlL3BhcnNlci9MZXhl ci5oCkBAIC0xMDEsNiArMTAxLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIEFMV0FZU19J TkxJTkUgYm9vbCBwYXJzZURlY2ltYWwoZG91YmxlJiByZXR1cm5WYWx1ZSk7CiAgICAgICAgIEFM V0FZU19JTkxJTkUgdm9pZCBwYXJzZU51bWJlckFmdGVyRGVjaW1hbFBvaW50KCk7CiAgICAgICAg IEFMV0FZU19JTkxJTkUgYm9vbCBwYXJzZU51bWJlckFmdGVyRXhwb25lbnRJbmRpY2F0b3IoKTsK KyAgICAgICAgQUxXQVlTX0lOTElORSBib29sIHBhcnNlTXVsdGlsaW5lQ29tbWVudCgpOwogCiAg ICAgICAgIHN0YXRpYyBjb25zdCBzaXplX3QgaW5pdGlhbFJlYWRCdWZmZXJDYXBhY2l0eSA9IDMy OwogCi0tIAoxLjYuMC40Cgo= 66863 2010-09-08 02:45:34 -0700 2010-09-08 02:45:34 -0700 Reworked patch 0001-lexer-multiline-comment.patch text/plain 3621 zherczeg RnJvbSA2MTRiNWE0NGM0OGYwZDY1OWQ3NTliOTQxMGZhYmEzNTcyMmZkMjAxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBab2x0YW4gSGVyY3plZyA8emhlcmN6ZWdAaW5mLnUtc3plZ2Vk Lmh1PgpEYXRlOiBXZWQsIDggU2VwIDIwMTAgMTE6Mzk6MTMgKzAyMDAKU3ViamVjdDogW1BBVENI XSBsZXhlci1tdWx0aWxpbmUtY29tbWVudAoKU2lnbmVkLW9mZi1ieTogWm9sdGFuIEhlcmN6ZWcg PHpoZXJjemVnQGluZi51LXN6ZWdlZC5odT4KLS0tCiBKYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cg ICAgICAgIHwgICAxNyArKysrKysrKysrKysrKwogSmF2YVNjcmlwdENvcmUvcGFyc2VyL0xleGVy LmNwcCB8ICAgNDYgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIEphdmFT Y3JpcHRDb3JlL3BhcnNlci9MZXhlci5oICAgfCAgICAxICsKIDMgZmlsZXMgY2hhbmdlZCwgNDIg aW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDAxNGM1ZjguLmIx YThmNWMgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wOS0wNyAgWm9sdGFuIEhl cmN6ZWcgIDx6aGVyY3plZ0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yaW5nIG11bHRpbGluZSBjb21tZW50cyBpbiB0 aGUgbGV4ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ1Mjg5CisKKyAgICAgICAgTXVsdGlMaW5lIGNvbW1lbnQgcGFyc2luZyBpcyBtb3ZlZCB0byBh IHNlcGFyYXRlIGZ1bmN0aW9uLgorCisgICAgICAgIFNsaWdodCBwZXJmb3JtYW5jZSBpbmNyZWFz ZSBvbiAtLXBhcnNlLW9ubHkgdGVzdHMgKGZyb20gMzMuNm1zIHRvIDMyLjhtcykKKyAgICAgICAg U3VuU3BpZGVyIHJlcG9ydHMgbm8gY2hhbmdlIChmcm9tIDUyMy4xbXMgdG8gNTIxLjJtcykuCisK KyAgICAgICAgKiBwYXJzZXIvTGV4ZXIuY3BwOgorICAgICAgICAoSlNDOjpMZXhlcjo6cGFyc2VN dWx0aWxpbmVDb21tZW50KToKKyAgICAgICAgKEpTQzo6TGV4ZXI6OmxleCk6CisgICAgICAgICog cGFyc2VyL0xleGVyLmg6CisKIDIwMTAtMDktMDcgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBDb21waWxlIGZpeCBhdHRlbXB0IGZvciB3aW5kb3dzLgpk aWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvcGFyc2VyL0xleGVyLmNwcCBiL0phdmFTY3JpcHRD b3JlL3BhcnNlci9MZXhlci5jcHAKaW5kZXggNmM0ZGIzMi4uMDIxZGQ2YiAxMDA2NDQKLS0tIGEv SmF2YVNjcmlwdENvcmUvcGFyc2VyL0xleGVyLmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9wYXJz ZXIvTGV4ZXIuY3BwCkBAIC02NzUsNiArNjc1LDI3IEBAIEFMV0FZU19JTkxJTkUgYm9vbCBMZXhl cjo6cGFyc2VOdW1iZXJBZnRlckV4cG9uZW50SW5kaWNhdG9yKCkKICAgICByZXR1cm4gdHJ1ZTsK IH0KIAorQUxXQVlTX0lOTElORSBib29sIExleGVyOjpwYXJzZU11bHRpbGluZUNvbW1lbnQoKQor eworICAgIHdoaWxlICh0cnVlKSB7CisgICAgICAgIHdoaWxlIChVTkxJS0VMWShtX2N1cnJlbnQg PT0gJyonKSkgeworICAgICAgICAgICAgc2hpZnQoKTsKKyAgICAgICAgICAgIGlmIChtX2N1cnJl bnQgPT0gJy8nKSB7CisgICAgICAgICAgICAgICAgc2hpZnQoKTsKKyAgICAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIGlmIChVTkxJ S0VMWShtX2N1cnJlbnQgPT0gLTEpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAg ICAgIGlmIChpc0xpbmVUZXJtaW5hdG9yKG1fY3VycmVudCkpCisgICAgICAgICAgICBzaGlmdExp bmVUZXJtaW5hdG9yKCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHNoaWZ0KCk7CisgICAg fQorfQorCiBKU1Rva2VuVHlwZSBMZXhlcjo6bGV4KEpTVG9rZW5EYXRhKiBsdmFscCwgSlNUb2tl bkluZm8qIGxsb2NwLCBMZXhUeXBlIGxleFR5cGUpCiB7CiAgICAgQVNTRVJUKCFtX2Vycm9yKTsK QEAgLTgzNSw3ICs4NTYsOSBAQCBzdGFydDoKICAgICAgICAgfQogICAgICAgICBpZiAobV9jdXJy ZW50ID09ICcqJykgewogICAgICAgICAgICAgc2hpZnQoKTsKLSAgICAgICAgICAgIGdvdG8gaW5N dWx0aUxpbmVDb21tZW50OworICAgICAgICAgICAgaWYgKHBhcnNlTXVsdGlsaW5lQ29tbWVudCgp KQorICAgICAgICAgICAgICAgIGdvdG8gc3RhcnQ7CisgICAgICAgICAgICBnb3RvIHJldHVybkVy cm9yOwogICAgICAgICB9CiAgICAgICAgIGlmIChtX2N1cnJlbnQgPT0gJz0nKSB7CiAgICAgICAg ICAgICBzaGlmdCgpOwpAQCAtMTAyOCwyNyArMTA1MSw2IEBAIGluU2luZ2xlTGluZUNvbW1lbnQ6 CiAgICAgICAgIGdvdG8gZG9uZVNlbWljb2xvbjsKICAgICBnb3RvIHN0YXJ0OwogCi1pbk11bHRp TGluZUNvbW1lbnQ6Ci0gICAgd2hpbGUgKHRydWUpIHsKLSAgICAgICAgaWYgKFVOTElLRUxZKG1f Y3VycmVudCA9PSAnKicpKSB7Ci0gICAgICAgICAgICBzaGlmdCgpOwotICAgICAgICAgICAgaWYg KG1fY3VycmVudCA9PSAnLycpCi0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBp ZiAobV9jdXJyZW50ID09ICcqJykKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAg fQotCi0gICAgICAgIGlmIChVTkxJS0VMWShtX2N1cnJlbnQgPT0gLTEpKQotICAgICAgICAgICAg Z290byByZXR1cm5FcnJvcjsKLQotICAgICAgICBpZiAoaXNMaW5lVGVybWluYXRvcihtX2N1cnJl bnQpKQotICAgICAgICAgICAgc2hpZnRMaW5lVGVybWluYXRvcigpOwotICAgICAgICBlbHNlCi0g ICAgICAgICAgICBzaGlmdCgpOwotICAgIH0KLSAgICBzaGlmdCgpOwotICAgIGdvdG8gc3RhcnQ7 Ci0KIGRvbmVTZW1pY29sb246CiAgICAgdG9rZW4gPSBTRU1JQ09MT047CiAgICAgbV9kZWxpbWl0 ZWQgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvcGFyc2VyL0xleGVyLmggYi9K YXZhU2NyaXB0Q29yZS9wYXJzZXIvTGV4ZXIuaAppbmRleCBkYTg0YTZiLi5lNmMxZWZkIDEwMDY0 NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTGV4ZXIuaAorKysgYi9KYXZhU2NyaXB0Q29y ZS9wYXJzZXIvTGV4ZXIuaApAQCAtMTAxLDYgKzEwMSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAg ICAgICBBTFdBWVNfSU5MSU5FIGJvb2wgcGFyc2VEZWNpbWFsKGRvdWJsZSYgcmV0dXJuVmFsdWUp OwogICAgICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgcGFyc2VOdW1iZXJBZnRlckRlY2ltYWxQb2lu dCgpOwogICAgICAgICBBTFdBWVNfSU5MSU5FIGJvb2wgcGFyc2VOdW1iZXJBZnRlckV4cG9uZW50 SW5kaWNhdG9yKCk7CisgICAgICAgIEFMV0FZU19JTkxJTkUgYm9vbCBwYXJzZU11bHRpbGluZUNv bW1lbnQoKTsKIAogICAgICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IGluaXRpYWxSZWFkQnVmZmVy Q2FwYWNpdHkgPSAzMjsKIAotLSAKMS42LjAuNAoK 66874 2010-09-08 04:09:42 -0700 2010-09-08 11:42:48 -0700 removing doneSemicolon label 0001-doneSemicolon.patch text/plain 2420 zherczeg RnJvbSBkYTdhZWEzYTY0NDFhZmM4NTI2Yzk2NDdkZTRhYTRjNDcyMGE3MmE3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBab2x0YW4gSGVyY3plZyA8emhlcmN6ZWdAaW5mLnUtc3plZ2Vk Lmh1PgpEYXRlOiBXZWQsIDggU2VwIDIwMTAgMTM6MDU6MDUgKzAyMDAKU3ViamVjdDogW1BBVENI XSBkb25lU2VtaWNvbG9uCgpTaWduZWQtb2ZmLWJ5OiBab2x0YW4gSGVyY3plZyA8emhlcmN6ZWdA aW5mLnUtc3plZ2VkLmh1PgotLS0KIEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyAgICAgICAgfCAg IDE2ICsrKysrKysrKysrKysrKysKIEphdmFTY3JpcHRDb3JlL3BhcnNlci9MZXhlci5jcHAgfCAg IDE1ICsrKysrKy0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCA5 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBiMWE4ZjVjLi5kYjE0ODc5IDEwMDY0NAotLS0g YS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDktMDggIFpvbHRhbiBIZXJjemVnICA8emhlcmN6ZWdA d2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSZW1vdmluZyBkb25lU2VtaWNvbG9uIGxhYmVsIGluIHRoZSBsZXhlcgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUyODkKKworICAgICAgICBB cyBhIHNpZGUgZWZmZWN0IG9mIG1vdmluZyB0aGUgbXVsdGlsaW5lIGNvbW1lbnQgcGFyc2luZwor ICAgICAgICB0byBhIHNlcGFyYXRlIGZ1bmN0aW9uLCBhbiBvcHBvcnR1bml0eSByYWlzZWQgdG8g c2ltcGxpZnkKKyAgICAgICAgdGhlIHNpbmdsZSBsaW5lIGNvbW1lbnQgcGFyc2luZywgYW5kIHJl bW92aW5nIGRvbmVTZW1pY29sb24KKyAgICAgICAgbGFiZWwuIFNsaWdodCBwZXJmb3JtYW5jZSBp bmNyZWFzZSBvbiAtLXBhcnNlLW9ubHkKKyAgICAgICAgdGVzdHMgKGZyb20gMzIuOG1zIHRvIDMx LjVtcykKKworICAgICAgICAqIHBhcnNlci9MZXhlci5jcHA6CisgICAgICAgIChKU0M6OkxleGVy OjpsZXgpOgorCiAyMDEwLTA5LTA3ICBab2x0YW4gSGVyY3plZyAgPHpoZXJjemVnQHdlYmtpdC5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9K YXZhU2NyaXB0Q29yZS9wYXJzZXIvTGV4ZXIuY3BwIGIvSmF2YVNjcmlwdENvcmUvcGFyc2VyL0xl eGVyLmNwcAppbmRleCAwMjFkZDZiLi5jYzQzMjFkIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9wYXJzZXIvTGV4ZXIuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL3BhcnNlci9MZXhlci5jcHAK QEAgLTEwMjUsNyArMTAyNSw4IEBAIGluTnVtYmVyQWZ0ZXJEZWNpbWFsUG9pbnQ6CiAgICAgICAg IG1fdGVybWluYXRvciA9IHRydWU7CiAgICAgICAgIGlmIChsYXN0VG9rZW5XYXNSZXN0cktleXdv cmQoKSkgewogICAgICAgICAgICAgdG9rZW4gPSBTRU1JQ09MT047Ci0gICAgICAgICAgICBnb3Rv IGRvbmVTZW1pY29sb247CisgICAgICAgICAgICBtX2RlbGltaXRlZCA9IHRydWU7CisgICAgICAg ICAgICBnb3RvIHJldHVyblRva2VuOwogICAgICAgICB9CiAgICAgICAgIGdvdG8gc3RhcnQ7CiAg ICAgY2FzZSBDaGFyYWN0ZXJJbnZhbGlkOgpAQCAtMTA0NywyMyArMTA0OCwxOSBAQCBpblNpbmds ZUxpbmVDb21tZW50OgogICAgIHNoaWZ0TGluZVRlcm1pbmF0b3IoKTsKICAgICBtX2F0TGluZVN0 YXJ0ID0gdHJ1ZTsKICAgICBtX3Rlcm1pbmF0b3IgPSB0cnVlOwotICAgIGlmIChsYXN0VG9rZW5X YXNSZXN0cktleXdvcmQoKSkKLSAgICAgICAgZ290byBkb25lU2VtaWNvbG9uOwotICAgIGdvdG8g c3RhcnQ7CisgICAgaWYgKCFsYXN0VG9rZW5XYXNSZXN0cktleXdvcmQoKSkKKyAgICAgICAgZ290 byBzdGFydDsKIAotZG9uZVNlbWljb2xvbjoKICAgICB0b2tlbiA9IFNFTUlDT0xPTjsKICAgICBt X2RlbGltaXRlZCA9IHRydWU7CiAgICAgLy8gRmFsbCB0aHJvdWdoIGludG8gcmV0dXJuVG9rZW4u CiAKLXJldHVyblRva2VuOiB7Ci0gICAgaW50IGxpbmVOdW1iZXIgPSBtX2xpbmVOdW1iZXI7Ci0g ICAgbGxvY3AtPmxpbmUgPSBsaW5lTnVtYmVyOworcmV0dXJuVG9rZW46CisgICAgbGxvY3AtPmxp bmUgPSBtX2xpbmVOdW1iZXI7CiAgICAgbGxvY3AtPnN0YXJ0T2Zmc2V0ID0gc3RhcnRPZmZzZXQ7 CiAgICAgbGxvY3AtPmVuZE9mZnNldCA9IGN1cnJlbnRPZmZzZXQoKTsKICAgICBtX2xhc3RUb2tl biA9IHRva2VuOwogICAgIHJldHVybiB0b2tlbjsKLX0KIAogcmV0dXJuRXJyb3I6CiAgICAgbV9l cnJvciA9IHRydWU7Ci0tIAoxLjYuMC40Cgo=