13387 2007-04-18 00:56:52 -0700 [js-collector-tweaks] Shrink RegExpObject by 4 bytes 2007-04-23 03:07:21 -0700 1 1 1 Unclassified WebKit JavaScriptCore 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 13389 1 mjs mjs oldest_to_newest 14362 0 mjs 2007-04-18 00:56:52 -0700 Shrink RegexpObjectImp by 4 bytes. Somewhat inexplicably, this seems to be a .33% speedup on JS iBench. It also enables further optimizations. 14363 1 14068 mjs 2007-04-18 00:57:14 -0700 Created attachment 14068 07-js-gc-regexp-shrink.patch.txt 14245 2 14068 darin 2007-04-18 11:19:38 -0700 Comment on attachment 14068 07-js-gc-regexp-shrink.patch.txt r=me 14068 2007-04-18 00:57:14 -0700 2007-04-18 11:19:38 -0700 07-js-gc-regexp-shrink.patch.txt 07-js-gc-regexp-shrink.patch.txt text/plain 6981 mjs SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNzg2KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCShyZXZpc2lvbiAyMDc4NykKQEAgLTEsNyArMSwyOSBAQAorMjAwNy0wNC0wOCAgTWFjaWVq IFN0YWNob3dpYWsgIDxtanNAYXBwbGUuY29tPgorIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAtIHNocmluayBSZWdleHBPYmplY3RJbXAgYnkgNCBieXRl cworICAgICAgICAKKyAgICAgICAgU29tZXdoYXQgaW5leHBsaWNhYmx5LCB0aGlzIHNlZW1zIHRv IGJlIGEgLjMzJSBzcGVlZHVwIG9uIEpTIGlCZW5jaC4KKyAgICAgICAgCisgICAgICAgICoga2pz L3JlZ2V4cF9vYmplY3QuY3BwOgorICAgICAgICAoS0pTOjpSZWdFeHBPYmplY3RJbXBQcml2YXRl OjpSZWdFeHBPYmplY3RJbXBQcml2YXRlKToKKyAgICAgICAgKFJlZ0V4cE9iamVjdEltcDo6UmVn RXhwT2JqZWN0SW1wKToKKyAgICAgICAgKFJlZ0V4cE9iamVjdEltcDo6cGVyZm9ybU1hdGNoKToK KyAgICAgICAgKFJlZ0V4cE9iamVjdEltcDo6YXJyYXlPZk1hdGNoZXMpOgorICAgICAgICAoUmVn RXhwT2JqZWN0SW1wOjpnZXRCYWNrcmVmKToKKyAgICAgICAgKFJlZ0V4cE9iamVjdEltcDo6Z2V0 TGFzdE1hdGNoKToKKyAgICAgICAgKFJlZ0V4cE9iamVjdEltcDo6Z2V0TGFzdFBhcmVuKToKKyAg ICAgICAgKFJlZ0V4cE9iamVjdEltcDo6Z2V0TGVmdENvbnRleHQpOgorICAgICAgICAoUmVnRXhw T2JqZWN0SW1wOjpnZXRSaWdodENvbnRleHQpOgorICAgICAgICAoUmVnRXhwT2JqZWN0SW1wOjpn ZXRWYWx1ZVByb3BlcnR5KToKKyAgICAgICAgKFJlZ0V4cE9iamVjdEltcDo6cHV0VmFsdWVQcm9w ZXJ0eSk6CisgICAgICAgICoga2pzL3JlZ2V4cF9vYmplY3QuaDoKKwogMjAwNy0wNC0wOCAgTWFj aWVqIFN0YWNob3dpYWsgIDxtanNAYXBwbGUuY29tPgogCiAgICAgICAgIE5vdCByZXZpZXdlZCwg ZXhwZXJpbWVudGFsIGNoYW5nZS4KICAgICAgICAgCiAgICAgICAgIC0gc2hyaW5rIEFycmF5SW5z dGFuY2Ugb2JqZWN0cyBieSA0IGJ5dGVzCiAgICAgICAgIAogICAgICAgICBJIGRpZCB0aGlzIGJ5 IHN0b3JpbmcgdGhlIGNhcGFjaXR5IGJlZm9yZSB0aGUgYmVnaW5uaW5nIG9mIHRoZSBzdG9yYWdl IGFycmF5LiBJdCB0dXJucyBvdXQKSW5kZXg6IEphdmFTY3JpcHRDb3JlL2tqcy9yZWdleHBfb2Jq ZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9ranMvcmVnZXhwX29iamVjdC5j cHAJKHJldmlzaW9uIDIwNzg2KQorKysgSmF2YVNjcmlwdENvcmUva2pzL3JlZ2V4cF9vYmplY3Qu Y3BwCShyZXZpc2lvbiAyMDc4NykKQEAgLTE4MCw5ICsxODAsMTggQEAKIEBlbmQKICovCiAKK3N0 cnVjdCBLSlM6OlJlZ0V4cE9iamVjdEltcFByaXZhdGUgeworICAvLyBHbG9iYWwgc2VhcmNoIGNh Y2hlIC8gc2V0dGluZ3MKKyAgUmVnRXhwT2JqZWN0SW1wUHJpdmF0ZSgpIDogbGFzdElucHV0KCIi KSwgbGFzdE51bVN1YlBhdHRlcm5zKDApLCBtdWx0aWxpbmUoZmFsc2UpIHsgfQorICBVU3RyaW5n IGxhc3RJbnB1dDsKKyAgT3duQXJyYXlQdHI8aW50PiBsYXN0T3ZlY3RvcjsKKyAgdW5zaWduZWQg bGFzdE51bVN1YlBhdHRlcm5zIDogMzE7CisgIGJvb2wgbXVsdGlsaW5lICAgICAgICAgICAgICA6 IDE7Cit9OworCiBSZWdFeHBPYmplY3RJbXA6OlJlZ0V4cE9iamVjdEltcChFeGVjU3RhdGUqIGV4 ZWMsIEZ1bmN0aW9uUHJvdG90eXBlKiBmdW5jUHJvdG8sIFJlZ0V4cFByb3RvdHlwZSogcmVnUHJv dG8pCi0KLSAgOiBJbnRlcm5hbEZ1bmN0aW9uSW1wKGZ1bmNQcm90byksIGxhc3RJbnB1dCgiIiks IGxhc3ROdW1TdWJQYXR0ZXJucygwKSwgbXVsdGlsaW5lKGZhbHNlKQorICA6IEludGVybmFsRnVu Y3Rpb25JbXAoZnVuY1Byb3RvKQorICAsIGQobmV3IFJlZ0V4cE9iamVjdEltcFByaXZhdGUpCiB7 CiAgIC8vIEVDTUEgMTUuMTAuNS4xIFJlZ0V4cC5wcm90b3R5cGUKICAgcHV0RGlyZWN0KGV4ZWMt PnByb3BlcnR5TmFtZXMoKS5wcm90b3R5cGUsIHJlZ1Byb3RvLCBEb250RW51bSB8IERvbnREZWxl dGUgfCBSZWFkT25seSk7CkBAIC0yMTAsOSArMjE5LDkgQEAKICAgaWYgKCFtYXRjaC5pc051bGwo KSkgewogICAgIEFTU0VSVCh0bXBPdmVjdG9yKTsKICAgICAKLSAgICBsYXN0SW5wdXQgPSBzOwot ICAgIGxhc3RPdmVjdG9yLnNldCh0bXBPdmVjdG9yKTsKLSAgICBsYXN0TnVtU3ViUGF0dGVybnMg PSByLT5zdWJQYXR0ZXJucygpOworICAgIGQtPmxhc3RJbnB1dCA9IHM7CisgICAgZC0+bGFzdE92 ZWN0b3Iuc2V0KHRtcE92ZWN0b3IpOworICAgIGQtPmxhc3ROdW1TdWJQYXR0ZXJucyA9IHItPnN1 YlBhdHRlcm5zKCk7CiAgIH0KICAgCiAgIHJldHVybiBtYXRjaDsKQEAgLTIyMywyNyArMjMyLDI3 IEBACiAgIExpc3QgbGlzdDsKICAgLy8gVGhlIHJldHVybmVkIGFycmF5IGNvbnRhaW5zICdyZXN1 bHQnIGFzIGZpcnN0IGl0ZW0sIGZvbGxvd2VkIGJ5IHRoZSBsaXN0IG9mIG1hdGNoZXMKICAgbGlz dC5hcHBlbmQoanNTdHJpbmcocmVzdWx0KSk7Ci0gIGlmICggbGFzdE92ZWN0b3IgKQotICAgIGZv ciAoIHVuc2lnbmVkIGkgPSAxIDsgaSA8IGxhc3ROdW1TdWJQYXR0ZXJucyArIDEgOyArK2kgKQor ICBpZiAoZC0+bGFzdE92ZWN0b3IpCisgICAgZm9yICh1bnNpZ25lZCBpID0gMSA7IGkgPCBkLT5s YXN0TnVtU3ViUGF0dGVybnMgKyAxIDsgKytpKQogICAgIHsKLSAgICAgIGludCBzdGFydCA9IGxh c3RPdmVjdG9yWzIqaV07CisgICAgICBpbnQgc3RhcnQgPSBkLT5sYXN0T3ZlY3RvclsyKmldOwog ICAgICAgaWYgKHN0YXJ0ID09IC0xKQogICAgICAgICBsaXN0LmFwcGVuZChqc1VuZGVmaW5lZCgp KTsKICAgICAgIGVsc2UgewotICAgICAgICBVU3RyaW5nIHN1YnN0cmluZyA9IGxhc3RJbnB1dC5z dWJzdHIoIHN0YXJ0LCBsYXN0T3ZlY3RvclsyKmkrMV0gLSBzdGFydCApOworICAgICAgICBVU3Ry aW5nIHN1YnN0cmluZyA9IGQtPmxhc3RJbnB1dC5zdWJzdHIoc3RhcnQsIGQtPmxhc3RPdmVjdG9y WzIqaSsxXSAtIHN0YXJ0KTsKICAgICAgICAgbGlzdC5hcHBlbmQoanNTdHJpbmcoc3Vic3RyaW5n KSk7CiAgICAgICB9CiAgICAgfQogICBKU09iamVjdCAqYXJyID0gZXhlYy0+bGV4aWNhbEludGVy cHJldGVyKCktPmJ1aWx0aW5BcnJheSgpLT5jb25zdHJ1Y3QoZXhlYywgbGlzdCk7Ci0gIGFyci0+ cHV0KGV4ZWMsICJpbmRleCIsIGpzTnVtYmVyKGxhc3RPdmVjdG9yWzBdKSk7Ci0gIGFyci0+cHV0 KGV4ZWMsICJpbnB1dCIsIGpzU3RyaW5nKGxhc3RJbnB1dCkpOworICBhcnItPnB1dChleGVjLCAi aW5kZXgiLCBqc051bWJlcihkLT5sYXN0T3ZlY3RvclswXSkpOworICBhcnItPnB1dChleGVjLCAi aW5wdXQiLCBqc1N0cmluZyhkLT5sYXN0SW5wdXQpKTsKICAgcmV0dXJuIGFycjsKIH0KIAogSlNW YWx1ZSAqUmVnRXhwT2JqZWN0SW1wOjpnZXRCYWNrcmVmKHVuc2lnbmVkIGkpIGNvbnN0CiB7Ci0g IGlmIChsYXN0T3ZlY3RvciAmJiBpIDwgbGFzdE51bVN1YlBhdHRlcm5zICsgMSkgewotICAgIFVT dHJpbmcgc3Vic3RyaW5nID0gbGFzdElucHV0LnN1YnN0cihsYXN0T3ZlY3RvclsyKmldLCBsYXN0 T3ZlY3RvclsyKmkrMV0gLSBsYXN0T3ZlY3RvclsyKmldICk7CisgIGlmIChkLT5sYXN0T3ZlY3Rv ciAmJiBpIDwgZC0+bGFzdE51bVN1YlBhdHRlcm5zICsgMSkgeworICAgIFVTdHJpbmcgc3Vic3Ry aW5nID0gZC0+bGFzdElucHV0LnN1YnN0cihkLT5sYXN0T3ZlY3RvclsyKmldLCBkLT5sYXN0T3Zl Y3RvclsyKmkrMV0gLSBkLT5sYXN0T3ZlY3RvclsyKmldICk7CiAgICAgcmV0dXJuIGpzU3RyaW5n KHN1YnN0cmluZyk7CiAgIH0gCiAKQEAgLTI1Miw4ICsyNjEsOCBAQAogCiBKU1ZhbHVlICpSZWdF eHBPYmplY3RJbXA6OmdldExhc3RNYXRjaCgpIGNvbnN0CiB7Ci0gIGlmIChsYXN0T3ZlY3Rvcikg ewotICAgIFVTdHJpbmcgc3Vic3RyaW5nID0gbGFzdElucHV0LnN1YnN0cihsYXN0T3ZlY3Rvclsw XSwgbGFzdE92ZWN0b3JbMV0gLSBsYXN0T3ZlY3RvclswXSk7CisgIGlmIChkLT5sYXN0T3ZlY3Rv cikgeworICAgIFVTdHJpbmcgc3Vic3RyaW5nID0gZC0+bGFzdElucHV0LnN1YnN0cihkLT5sYXN0 T3ZlY3RvclswXSwgZC0+bGFzdE92ZWN0b3JbMV0gLSBkLT5sYXN0T3ZlY3RvclswXSk7CiAgICAg cmV0dXJuIGpzU3RyaW5nKHN1YnN0cmluZyk7CiAgIH0KICAgCkBAIC0yNjIsMTAgKzI3MSwxMCBA QAogCiBKU1ZhbHVlICpSZWdFeHBPYmplY3RJbXA6OmdldExhc3RQYXJlbigpIGNvbnN0CiB7Ci0g IGludCBpID0gbGFzdE51bVN1YlBhdHRlcm5zOworICBpbnQgaSA9IGQtPmxhc3ROdW1TdWJQYXR0 ZXJuczsKICAgaWYgKGkgPiAwKSB7Ci0gICAgQVNTRVJUKGxhc3RPdmVjdG9yKTsKLSAgICBVU3Ry aW5nIHN1YnN0cmluZyA9IGxhc3RJbnB1dC5zdWJzdHIobGFzdE92ZWN0b3JbMippXSwgbGFzdE92 ZWN0b3JbMippKzFdIC0gbGFzdE92ZWN0b3JbMippXSk7CisgICAgQVNTRVJUKGQtPmxhc3RPdmVj dG9yKTsKKyAgICBVU3RyaW5nIHN1YnN0cmluZyA9IGQtPmxhc3RJbnB1dC5zdWJzdHIoZC0+bGFz dE92ZWN0b3JbMippXSwgZC0+bGFzdE92ZWN0b3JbMippKzFdIC0gZC0+bGFzdE92ZWN0b3JbMipp XSk7CiAgICAgcmV0dXJuIGpzU3RyaW5nKHN1YnN0cmluZyk7CiAgIH0KICAgICAKQEAgLTI3NCw4 ICsyODMsOCBAQAogCiBKU1ZhbHVlICpSZWdFeHBPYmplY3RJbXA6OmdldExlZnRDb250ZXh0KCkg Y29uc3QKIHsKLSAgaWYgKGxhc3RPdmVjdG9yKSB7Ci0gICAgVVN0cmluZyBzdWJzdHJpbmcgPSBs YXN0SW5wdXQuc3Vic3RyKDAsIGxhc3RPdmVjdG9yWzBdKTsKKyAgaWYgKGQtPmxhc3RPdmVjdG9y KSB7CisgICAgVVN0cmluZyBzdWJzdHJpbmcgPSBkLT5sYXN0SW5wdXQuc3Vic3RyKDAsIGQtPmxh c3RPdmVjdG9yWzBdKTsKICAgICByZXR1cm4ganNTdHJpbmcoc3Vic3RyaW5nKTsKICAgfQogICAK QEAgLTI4NCw5ICsyOTMsOSBAQAogCiBKU1ZhbHVlICpSZWdFeHBPYmplY3RJbXA6OmdldFJpZ2h0 Q29udGV4dCgpIGNvbnN0CiB7Ci0gIGlmIChsYXN0T3ZlY3RvcikgewotICAgIFVTdHJpbmcgcyA9 IGxhc3RJbnB1dDsKLSAgICBVU3RyaW5nIHN1YnN0cmluZyA9IHMuc3Vic3RyKGxhc3RPdmVjdG9y WzFdLCBzLnNpemUoKSAtIGxhc3RPdmVjdG9yWzFdKTsKKyAgaWYgKGQtPmxhc3RPdmVjdG9yKSB7 CisgICAgVVN0cmluZyBzID0gZC0+bGFzdElucHV0OworICAgIFVTdHJpbmcgc3Vic3RyaW5nID0g cy5zdWJzdHIoZC0+bGFzdE92ZWN0b3JbMV0sIHMuc2l6ZSgpIC0gZC0+bGFzdE92ZWN0b3JbMV0p OwogICAgIHJldHVybiBqc1N0cmluZyhzdWJzdHJpbmcpOwogICB9CiAgIApAQCAtMzIwLDkgKzMy OSw5IEBACiAgICAgY2FzZSBEb2xsYXI5OgogICAgICAgcmV0dXJuIGdldEJhY2tyZWYoOSk7CiAg ICAgY2FzZSBJbnB1dDoKLSAgICAgIHJldHVybiBqc1N0cmluZyhsYXN0SW5wdXQpOworICAgICAg cmV0dXJuIGpzU3RyaW5nKGQtPmxhc3RJbnB1dCk7CiAgICAgY2FzZSBNdWx0aWxpbmU6Ci0gICAg ICByZXR1cm4ganNCb29sZWFuKG11bHRpbGluZSk7CisgICAgICByZXR1cm4ganNCb29sZWFuKGQt Pm11bHRpbGluZSk7CiAgICAgY2FzZSBMYXN0TWF0Y2g6CiAgICAgICByZXR1cm4gZ2V0TGFzdE1h dGNoKCk7CiAgICAgY2FzZSBMYXN0UGFyZW46CkBAIC0zNDcsMTAgKzM1NiwxMCBAQAogewogICBz d2l0Y2ggKHRva2VuKSB7CiAgICAgY2FzZSBJbnB1dDoKLSAgICAgIGxhc3RJbnB1dCA9IHZhbHVl LT50b1N0cmluZyhleGVjKTsKKyAgICAgIGQtPmxhc3RJbnB1dCA9IHZhbHVlLT50b1N0cmluZyhl eGVjKTsKICAgICAgIGJyZWFrOwogICAgIGNhc2UgTXVsdGlsaW5lOgotICAgICAgbXVsdGlsaW5l ID0gdmFsdWUtPnRvQm9vbGVhbihleGVjKTsKKyAgICAgIGQtPm11bHRpbGluZSA9IHZhbHVlLT50 b0Jvb2xlYW4oZXhlYyk7CiAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgQVNTRVJU KDApOwpJbmRleDogSmF2YVNjcmlwdENvcmUva2pzL3JlZ2V4cF9vYmplY3QuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBKYXZhU2NyaXB0Q29yZS9ranMvcmVnZXhwX29iamVjdC5oCShyZXZpc2lvbiAyMDc4NikK KysrIEphdmFTY3JpcHRDb3JlL2tqcy9yZWdleHBfb2JqZWN0LmgJKHJldmlzaW9uIDIwNzg3KQpA QCAtNjAsNiArNjAsOCBAQAogICAgIFJlZ0V4cCAqcmVnOwogICB9OwogCisgIGNsYXNzIFJlZ0V4 cE9iamVjdEltcFByaXZhdGU7CisKICAgY2xhc3MgUmVnRXhwT2JqZWN0SW1wIDogcHVibGljIElu dGVybmFsRnVuY3Rpb25JbXAgewogICBwdWJsaWM6CiAgICAgZW51bSB7IERvbGxhcjEsIERvbGxh cjIsIERvbGxhcjMsIERvbGxhcjQsIERvbGxhcjUsIERvbGxhcjYsIERvbGxhcjcsIERvbGxhcjgs IERvbGxhcjksIApAQCAtODcsMTEgKzg5LDcgQEAKICAgICBKU1ZhbHVlICpnZXRMZWZ0Q29udGV4 dCgpIGNvbnN0OwogICAgIEpTVmFsdWUgKmdldFJpZ2h0Q29udGV4dCgpIGNvbnN0OwogCi0gICAg Ly8gR2xvYmFsIHNlYXJjaCBjYWNoZSAvIHNldHRpbmdzCi0gICAgVVN0cmluZyBsYXN0SW5wdXQ7 Ci0gICAgT3duQXJyYXlQdHI8aW50PiBsYXN0T3ZlY3RvcjsKLSAgICB1bnNpZ25lZCBsYXN0TnVt U3ViUGF0dGVybnMgOiAzMTsKLSAgICBib29sIG11bHRpbGluZSAgICAgICAgICAgICAgOiAxOwor ICAgIE93blB0cjxSZWdFeHBPYmplY3RJbXBQcml2YXRlPiBkOwogICAgIAogICAgIHN0YXRpYyBj b25zdCBDbGFzc0luZm8gaW5mbzsKICAgfTsK