23026 2008-12-29 15:12:04 -0800 Move the deleted offsets vector into the PropertyMap 2008-12-29 16:29:05 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned oldest_to_newest 103738 0 sam 2008-12-29 15:12:04 -0800 It is both rare to have deleted offsets and you are guaranteed to have a PropertMap if you have one, moving the Vector into the hashtable's struct would be a win for memory. 103739 1 26304 sam 2008-12-29 15:14:33 -0800 Created attachment 26304 patch 103742 2 26304 oliver 2008-12-29 16:09:30 -0800 Comment on attachment 26304 patch r=me, assuming perf is good 103746 3 sam 2008-12-29 16:29:05 -0800 Landed in r39502. 26304 2008-12-29 15:14:33 -0800 2008-12-29 16:09:30 -0800 patch moveDeletedOFfsets.diff text/plain 7108 sam SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDM5NTAx KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMDgtMTIt MjkgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXRjaCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMDI2CisgICAgICAgIE1vdmUgdGhlIGRlbGV0ZWQgb2Zmc2V0 cyB2ZWN0b3IgaW50byB0aGUgUHJvcGVydHlNYXAKKworICAgICAgICBTYXZlcyAzIHdvcmRzIHBl ciBTdHJ1Y3R1cmUuCisKKyAgICAgICAgKiBydW50aW1lL1Byb3BlcnR5TWFwSGFzaFRhYmxlLmg6 CisgICAgICAgICogcnVudGltZS9TdHJ1Y3R1cmUuY3BwOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1 cmU6OmFkZFByb3BlcnR5VHJhbnNpdGlvbik6CisgICAgICAgIChKU0M6OlN0cnVjdHVyZTo6Y2hh bmdlUHJvdG90eXBlVHJhbnNpdGlvbik6CisgICAgICAgIChKU0M6OlN0cnVjdHVyZTo6Z2V0dGVy U2V0dGVyVHJhbnNpdGlvbik6CisgICAgICAgIChKU0M6OlN0cnVjdHVyZTo6dG9EaWN0aW9uYXJ5 VHJhbnNpdGlvbik6CisgICAgICAgIChKU0M6OlN0cnVjdHVyZTo6ZnJvbURpY3Rpb25hcnlUcmFu c2l0aW9uKToKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlOjpjb3B5UHJvcGVydHlUYWJsZSk6Cisg ICAgICAgIChKU0M6OlN0cnVjdHVyZTo6cHV0KToKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlOjpy ZW1vdmUpOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmU6OnJlaGFzaFByb3BlcnR5TWFwSGFzaFRh YmxlKToKKyAgICAgICAgKiBydW50aW1lL1N0cnVjdHVyZS5oOgorICAgICAgICAoSlNDOjpTdHJ1 Y3R1cmU6OnByb3BlcnR5U3RvcmFnZVNpemUpOgorCiAyMDA4LTEyLTI5ICBDYW1lcm9uIFp3YXJp Y2ggIDxjd3p3YXJpY2hAdXdhdGVybG9vLmNhPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZl ciBIdW50LgpJbmRleDogcnVudGltZS9Qcm9wZXJ0eU1hcEhhc2hUYWJsZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIHJ1bnRpbWUvUHJvcGVydHlNYXBIYXNoVGFibGUuaAkocmV2aXNpb24gMzk0OTcpCisrKyBy dW50aW1lL1Byb3BlcnR5TWFwSGFzaFRhYmxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTIyLDYgKzIy LDcgQEAKICNkZWZpbmUgUHJvcGVydHlNYXBIYXNoVGFibGVfaAogCiAjaW5jbHVkZSAiVVN0cmlu Zy5oIgorI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogbmFtZXNwYWNlIEpTQyB7CiAKQEAgLTU4 LDYgKzU5LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHVuc2lnbmVkIGtleUNvdW50Owog ICAgICAgICB1bnNpZ25lZCBkZWxldGVkU2VudGluZWxDb3VudDsKICAgICAgICAgdW5zaWduZWQg bGFzdEluZGV4VXNlZDsKKyAgICAgICAgVmVjdG9yPHVuc2lnbmVkPiogZGVsZXRlZE9mZnNldHM7 CiAgICAgICAgIHVuc2lnbmVkIGVudHJ5SW5kaWNlc1sxXTsKIAogICAgICAgICBQcm9wZXJ0eU1h cEVudHJ5KiBlbnRyaWVzKCkKSW5kZXg6IHJ1bnRpbWUvU3RydWN0dXJlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBydW50aW1lL1N0cnVjdHVyZS5jcHAJKHJldmlzaW9uIDM5NDk3KQorKysgcnVudGltZS9T dHJ1Y3R1cmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzgsNyArMzc4LDYgQEAgUGFzc1JlZlB0 cjxTdHJ1Y3R1cmU+IFN0cnVjdHVyZTo6YWRkUHJvcAogewogICAgIEFTU0VSVCghc3RydWN0dXJl LT5tX2lzRGljdGlvbmFyeSk7CiAgICAgQVNTRVJUKHN0cnVjdHVyZS0+dHlwZUluZm8oKS50eXBl KCkgPT0gT2JqZWN0VHlwZSk7Ci0gICAgQVNTRVJUKHN0cnVjdHVyZS0+bV9kZWxldGVkT2Zmc2V0 cy5pc0VtcHR5KCkpOwogICAgIEFTU0VSVCghU3RydWN0dXJlOjphZGRQcm9wZXJ0eVRyYW5zaXRp b25Ub0V4aXN0aW5nU3RydWN0dXJlKHN0cnVjdHVyZSwgcHJvcGVydHlOYW1lLCBhdHRyaWJ1dGVz LCBvZmZzZXQpKTsKIAogICAgIGlmIChzdHJ1Y3R1cmUtPm1fdHJhbnNpdGlvbkNvdW50ID4gc19t YXhUcmFuc2l0aW9uTGVuZ3RoKSB7CkBAIC00NTAsNyArNDQ5LDYgQEAgUGFzc1JlZlB0cjxTdHJ1 Y3R1cmU+IFN0cnVjdHVyZTo6Y2hhbmdlUAogICAgIFJlZlB0cjxTdHJ1Y3R1cmU+IHRyYW5zaXRp b24gPSBjcmVhdGUocHJvdG90eXBlLCBzdHJ1Y3R1cmUtPnR5cGVJbmZvKCkpOwogCiAgICAgdHJh bnNpdGlvbi0+bV90cmFuc2l0aW9uQ291bnQgPSBzdHJ1Y3R1cmUtPm1fdHJhbnNpdGlvbkNvdW50 ICsgMTsKLSAgICB0cmFuc2l0aW9uLT5tX2RlbGV0ZWRPZmZzZXRzID0gc3RydWN0dXJlLT5tX2Rl bGV0ZWRPZmZzZXRzOwogICAgIHRyYW5zaXRpb24tPm1fcHJvcGVydHlTdG9yYWdlQ2FwYWNpdHkg PSBzdHJ1Y3R1cmUtPm1fcHJvcGVydHlTdG9yYWdlQ2FwYWNpdHk7CiAgICAgdHJhbnNpdGlvbi0+ bV9oYXNHZXR0ZXJTZXR0ZXJQcm9wZXJ0aWVzID0gc3RydWN0dXJlLT5tX2hhc0dldHRlclNldHRl clByb3BlcnRpZXM7CiAKQEAgLTQ2Nyw3ICs0NjUsNiBAQCBQYXNzUmVmUHRyPFN0cnVjdHVyZT4g U3RydWN0dXJlOjpnZXR0ZXJTCiB7CiAgICAgUmVmUHRyPFN0cnVjdHVyZT4gdHJhbnNpdGlvbiA9 IGNyZWF0ZShzdHJ1Y3R1cmUtPnN0b3JlZFByb3RvdHlwZSgpLCBzdHJ1Y3R1cmUtPnR5cGVJbmZv KCkpOwogICAgIHRyYW5zaXRpb24tPm1fdHJhbnNpdGlvbkNvdW50ID0gc3RydWN0dXJlLT5tX3Ry YW5zaXRpb25Db3VudCArIDE7Ci0gICAgdHJhbnNpdGlvbi0+bV9kZWxldGVkT2Zmc2V0cyA9IHN0 cnVjdHVyZS0+bV9kZWxldGVkT2Zmc2V0czsKICAgICB0cmFuc2l0aW9uLT5tX3Byb3BlcnR5U3Rv cmFnZUNhcGFjaXR5ID0gc3RydWN0dXJlLT5tX3Byb3BlcnR5U3RvcmFnZUNhcGFjaXR5OwogICAg IHRyYW5zaXRpb24tPm1faGFzR2V0dGVyU2V0dGVyUHJvcGVydGllcyA9IHRyYW5zaXRpb24tPm1f aGFzR2V0dGVyU2V0dGVyUHJvcGVydGllczsKIApAQCAtNDg2LDcgKzQ4Myw2IEBAIFBhc3NSZWZQ dHI8U3RydWN0dXJlPiBTdHJ1Y3R1cmU6OnRvRGljdGkKIAogICAgIFJlZlB0cjxTdHJ1Y3R1cmU+ IHRyYW5zaXRpb24gPSBjcmVhdGUoc3RydWN0dXJlLT5tX3Byb3RvdHlwZSwgc3RydWN0dXJlLT50 eXBlSW5mbygpKTsKICAgICB0cmFuc2l0aW9uLT5tX2lzRGljdGlvbmFyeSA9IHRydWU7Ci0gICAg dHJhbnNpdGlvbi0+bV9kZWxldGVkT2Zmc2V0cyA9IHN0cnVjdHVyZS0+bV9kZWxldGVkT2Zmc2V0 czsKICAgICB0cmFuc2l0aW9uLT5tX3Byb3BlcnR5U3RvcmFnZUNhcGFjaXR5ID0gc3RydWN0dXJl LT5tX3Byb3BlcnR5U3RvcmFnZUNhcGFjaXR5OwogICAgIHRyYW5zaXRpb24tPm1faGFzR2V0dGVy U2V0dGVyUHJvcGVydGllcyA9IHN0cnVjdHVyZS0+bV9oYXNHZXR0ZXJTZXR0ZXJQcm9wZXJ0aWVz OwogCkBAIC01MDcsNyArNTAzLDcgQEAgUGFzc1JlZlB0cjxTdHJ1Y3R1cmU+IFN0cnVjdHVyZTo6 ZnJvbURpYwogCiAgICAgLy8gRklNWEU6IFdlIGNhbiBtYWtlIHRoaXMgbW9yZSBlZmZpY2llbnQg YnkgY2Fub25pY2FsaXppbmcgdGhlIFN0cnVjdHVyZSAoZHJhaW5pbmcgdGhlCiAgICAgLy8gZGVs ZXRlZCBvZmZzZXRzIHZlY3RvcikgYmVmb3JlIHRyYW5zaXRpb25pbmcgZnJvbSBkaWN0aW9uYXJ5 LiAKLSAgICBpZiAoc3RydWN0dXJlLT5tX2RlbGV0ZWRPZmZzZXRzLmlzRW1wdHkoKSkKKyAgICBp ZiAoIXN0cnVjdHVyZS0+bV9wcm9wZXJ0eVRhYmxlIHx8ICFzdHJ1Y3R1cmUtPm1fcHJvcGVydHlU YWJsZS0+ZGVsZXRlZE9mZnNldHMgfHwgc3RydWN0dXJlLT5tX3Byb3BlcnR5VGFibGUtPmRlbGV0 ZWRPZmZzZXRzLT5pc0VtcHR5KCkpCiAgICAgICAgIHN0cnVjdHVyZS0+bV9pc0RpY3Rpb25hcnkg PSBmYWxzZTsKIAogICAgIHJldHVybiBzdHJ1Y3R1cmU7CkBAIC02MDMsNiArNTk5LDEwIEBAIFBy b3BlcnR5TWFwSGFzaFRhYmxlKiBTdHJ1Y3R1cmU6OmNvcHlQcm8KICAgICAgICAgICAgIGtleS0+ cmVmKCk7CiAgICAgfQogCisgICAgLy8gQ29weSB0aGUgZGVsZXRlZE9mZnNldHMgdmVjdG9yLgor ICAgIGlmIChtX3Byb3BlcnR5VGFibGUtPmRlbGV0ZWRPZmZzZXRzKQorICAgICAgICBuZXdUYWJs ZS0+ZGVsZXRlZE9mZnNldHMgPSBuZXcgVmVjdG9yPHVuc2lnbmVkPigqbV9wcm9wZXJ0eVRhYmxl LT5kZWxldGVkT2Zmc2V0cyk7CisKICAgICByZXR1cm4gbmV3VGFibGU7CiB9CiAKQEAgLTcyOCw5 ICs3MjgsOSBAQCBzaXplX3QgU3RydWN0dXJlOjpwdXQoY29uc3QgSWRlbnRpZmllciYgCiAgICAg bV9wcm9wZXJ0eVRhYmxlLT5lbnRyaWVzKClbZW50cnlJbmRleCAtIDFdLmluZGV4ID0gKyttX3By b3BlcnR5VGFibGUtPmxhc3RJbmRleFVzZWQ7CiAKICAgICB1bnNpZ25lZCBuZXdPZmZzZXQ7Ci0g ICAgaWYgKCFtX2RlbGV0ZWRPZmZzZXRzLmlzRW1wdHkoKSkgewotICAgICAgICBuZXdPZmZzZXQg PSBtX2RlbGV0ZWRPZmZzZXRzLmxhc3QoKTsKLSAgICAgICAgbV9kZWxldGVkT2Zmc2V0cy5yZW1v dmVMYXN0KCk7CisgICAgaWYgKG1fcHJvcGVydHlUYWJsZS0+ZGVsZXRlZE9mZnNldHMgJiYgIW1f cHJvcGVydHlUYWJsZS0+ZGVsZXRlZE9mZnNldHMtPmlzRW1wdHkoKSkgeworICAgICAgICBuZXdP ZmZzZXQgPSBtX3Byb3BlcnR5VGFibGUtPmRlbGV0ZWRPZmZzZXRzLT5sYXN0KCk7CisgICAgICAg IG1fcHJvcGVydHlUYWJsZS0+ZGVsZXRlZE9mZnNldHMtPnJlbW92ZUxhc3QoKTsKICAgICB9IGVs c2UKICAgICAgICAgbmV3T2Zmc2V0ID0gbV9wcm9wZXJ0eVRhYmxlLT5rZXlDb3VudDsKICAgICBt X3Byb3BlcnR5VGFibGUtPmVudHJpZXMoKVtlbnRyeUluZGV4IC0gMV0ub2Zmc2V0ID0gbmV3T2Zm c2V0OwpAQCAtNzk4LDcgKzc5OCwxMCBAQCBzaXplX3QgU3RydWN0dXJlOjpyZW1vdmUoY29uc3Qg SWRlbnRpZmllCiAgICAgbV9wcm9wZXJ0eVRhYmxlLT5lbnRyaWVzKClbZW50cnlJbmRleCAtIDFd LmtleSA9IDA7CiAgICAgbV9wcm9wZXJ0eVRhYmxlLT5lbnRyaWVzKClbZW50cnlJbmRleCAtIDFd LmF0dHJpYnV0ZXMgPSAwOwogICAgIG1fcHJvcGVydHlUYWJsZS0+ZW50cmllcygpW2VudHJ5SW5k ZXggLSAxXS5vZmZzZXQgPSAwOwotICAgIG1fZGVsZXRlZE9mZnNldHMuYXBwZW5kKG9mZnNldCk7 CisKKyAgICBpZiAoIW1fcHJvcGVydHlUYWJsZS0+ZGVsZXRlZE9mZnNldHMpCisgICAgICAgIG1f cHJvcGVydHlUYWJsZS0+ZGVsZXRlZE9mZnNldHMgPSBuZXcgVmVjdG9yPHVuc2lnbmVkPjsKKyAg ICBtX3Byb3BlcnR5VGFibGUtPmRlbGV0ZWRPZmZzZXRzLT5hcHBlbmQob2Zmc2V0KTsKIAogICAg IEFTU0VSVChtX3Byb3BlcnR5VGFibGUtPmtleUNvdW50ID49IDEpOwogICAgIC0tbV9wcm9wZXJ0 eVRhYmxlLT5rZXlDb3VudDsKQEAgLTkwMyw2ICs5MDYsNyBAQCB2b2lkIFN0cnVjdHVyZTo6cmVo YXNoUHJvcGVydHlNYXBIYXNoVGFiCiAgICAgICAgIH0KICAgICB9CiAgICAgbV9wcm9wZXJ0eVRh YmxlLT5sYXN0SW5kZXhVc2VkID0gbGFzdEluZGV4VXNlZDsKKyAgICBtX3Byb3BlcnR5VGFibGUt PmRlbGV0ZWRPZmZzZXRzID0gb2xkVGFibGUtPmRlbGV0ZWRPZmZzZXRzOwogCiAgICAgZmFzdEZy ZWUob2xkVGFibGUpOwogCkluZGV4OiBydW50aW1lL1N0cnVjdHVyZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IHJ1bnRpbWUvU3RydWN0dXJlLmgJKHJldmlzaW9uIDM5NDk3KQorKysgcnVudGltZS9TdHJ1Y3R1 cmUuaAkod29ya2luZyBjb3B5KQpAQCAtMzQsOSArMzQsNiBAQAogI2luY2x1ZGUgIlN0cnVjdHVy ZVRyYW5zaXRpb25UYWJsZS5oIgogI2luY2x1ZGUgIlR5cGVJbmZvLmgiCiAjaW5jbHVkZSAiVVN0 cmluZy5oIgotI2luY2x1ZGUgPHd0Zi9IYXNoRnVuY3Rpb25zLmg+Ci0jaW5jbHVkZSA8d3RmL0hh c2hUcmFpdHMuaD4KLSNpbmNsdWRlIDx3dGYvT3duQXJyYXlQdHIuaD4KICNpbmNsdWRlIDx3dGYv UGFzc1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAKQEAgLTEwMCw3ICs5 Nyw3IEBAIG5hbWVzcGFjZSBKU0MgewogCiAgICAgICAgIHZvaWQgZ3Jvd1Byb3BlcnR5U3RvcmFn ZUNhcGFjaXR5KCk7CiAgICAgICAgIHNpemVfdCBwcm9wZXJ0eVN0b3JhZ2VDYXBhY2l0eSgpIGNv bnN0IHsgcmV0dXJuIG1fcHJvcGVydHlTdG9yYWdlQ2FwYWNpdHk7IH0KLSAgICAgICAgc2l6ZV90 IHByb3BlcnR5U3RvcmFnZVNpemUoKSBjb25zdCB7IHJldHVybiBtX3Byb3BlcnR5VGFibGUgPyBt X3Byb3BlcnR5VGFibGUtPmtleUNvdW50ICsgbV9kZWxldGVkT2Zmc2V0cy5zaXplKCkgOiBtX29m ZnNldCArIDE7IH0KKyAgICAgICAgc2l6ZV90IHByb3BlcnR5U3RvcmFnZVNpemUoKSBjb25zdCB7 IHJldHVybiBtX3Byb3BlcnR5VGFibGUgPyBtX3Byb3BlcnR5VGFibGUtPmtleUNvdW50ICsgKG1f cHJvcGVydHlUYWJsZS0+ZGVsZXRlZE9mZnNldHMgPyBtX3Byb3BlcnR5VGFibGUtPmRlbGV0ZWRP ZmZzZXRzLT5zaXplKCkgOiAwKSA6IG1fb2Zmc2V0ICsgMTsgfQogCiAgICAgICAgIHNpemVfdCBn ZXQoY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lKTsKICAgICAgICAgc2l6ZV90IGdldChj b25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIHVuc2lnbmVkJiBhdHRyaWJ1dGVzKTsKQEAg LTE2Myw3ICsxNjAsNiBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgUmVmUHRyPFByb3BlcnR5 TmFtZUFycmF5RGF0YT4gbV9jYWNoZWRQcm9wZXJ0eU5hbWVBcnJheURhdGE7CiAKICAgICAgICAg UHJvcGVydHlNYXBIYXNoVGFibGUqIG1fcHJvcGVydHlUYWJsZTsKLSAgICAgICAgVmVjdG9yPHVu c2lnbmVkPiBtX2RlbGV0ZWRPZmZzZXRzOwogCiAgICAgICAgIHNpemVfdCBtX3Byb3BlcnR5U3Rv cmFnZUNhcGFjaXR5OwogICAgICAgICBzaXplX3QgbV9vZmZzZXQ7Cg==