119765 2013-08-13 13:40:51 -0700 Stop using DEFINE_STATIC_LOCAL with RetainPtr 2013-08-13 16:39:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca darin oldest_to_newest 916858 0 andersca 2013-08-13 13:40:51 -0700 Stop using DEFINE_STATIC_LOCAL with RetainPtr 916860 1 208669 andersca 2013-08-13 13:43:05 -0700 Created attachment 208669 Patch 916870 2 andersca 2013-08-13 13:58:00 -0700 Committed r154021: <http://trac.webkit.org/changeset/154021> 916872 3 darin 2013-08-13 13:59:10 -0700 Can we come up with a trick that makes it a compile error to make this error? 916879 4 andersca 2013-08-13 14:16:39 -0700 (In reply to comment #3) > Can we come up with a trick that makes it a compile error to make this error? I’m not sure. There are (currently) some places where we legitimately use DEFINE_STATIC_LOCAL with smart pointer types, for example: static RetainPtr<NSEvent>& currentNSEventSlot() { DEFINE_STATIC_LOCAL(RetainPtr<NSEvent>, event, ()); return event; } I think we can just use NeverDestroyed for those cases though. 916939 5 darin 2013-08-13 16:39:55 -0700 We can use NeverDestroyed everywhere instead of DEFINE_STATIC_LOCAL; maybe that’s what we should do first. 208669 2013-08-13 13:43:05 -0700 2013-08-13 13:54:36 -0700 Patch bug-119765-20130813134304.patch text/plain 6533 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0MDEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMxZTE5MmQ3NzI2NDdk NTk5MDM0NjVkMWM2YTU0NTQ4NjU0MzE3Zi4uZGFkNWZhNGM4NWFlZTIzZjg4NGZkYjcxNDYwNTI5 ZGQwZjQ1MTczMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEzLTA4LTEzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU3RvcCB1c2luZyBE RUZJTkVfU1RBVElDX0xPQ0FMIHdpdGggUmV0YWluUHRyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk3NjUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZWVkIHRvIHdhc3RlIGhlYXAgbWVtb3J5IGFs bG9jYXRpbmcgUmV0YWluUHRycywganVzdCBzdG9yZSB0aGUgcmF3IHBvaW50ZXJzIGRpcmVjdGx5 LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbG9yTWFjLm1tOgorICAgICAg ICAoV2ViQ29yZTo6bnNDb2xvcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dy YXBoaWNzQ29udGV4dE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6Om1ha2VQYXR0ZXJuQ29sb3Ip OgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRvY3VtZW50 TWFya2VyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFN YWMubW06CisgICAgICAgIChXZWJDb3JlOjp3ZWJGYWxsYmFja0ZvbnRGYW1pbHkpOgorCisyMDEz LTA4LTEzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAg Rml4IGJ1aWxkLgogCiAgICAgICAgICogV2ViQ29yZS5leHAuaW46CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29sb3JNYWMubW0gYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29sb3JNYWMubW0KaW5kZXggM2JjM2E1Nzk4ZWUx MTQxYzE2MGQxMWIwNTAzNmExOTAzODllYjgxOC4uZjNlMzE2YTcwNDRjMzI4NjIzZTU4ZGVmYmUx MzEzNTU1NWFmYTA5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL0NvbG9yTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L21hYy9Db2xvck1hYy5tbQpAQCAtNzgsMTYgKzc4LDE2IEBAIE5TQ29sb3IgKm5zQ29sb3IoY29u c3QgQ29sb3ImIGNvbG9yKQogICAgIHN3aXRjaCAoYykgewogICAgICAgICBjYXNlIDA6IHsKICAg ICAgICAgICAgIC8vIE5lZWQgdGhpcyB0byBhdm9pZCByZXR1cm5pbmcgbmlsIGJlY2F1c2UgY2Fj aGVkUkdCQVZhbHVlcyB3aWxsIGRlZmF1bHQgdG8gMC4KLSAgICAgICAgICAgIERFRklORV9TVEFU SUNfTE9DQUwoUmV0YWluUHRyPE5TQ29sb3I+LCBjbGVhckNvbG9yLCAoW05TQ29sb3IgY29sb3JX aXRoRGV2aWNlUmVkOjAgZ3JlZW46MCBibHVlOjAgYWxwaGE6MF0pKTsKLSAgICAgICAgICAgIHJl dHVybiBjbGVhckNvbG9yLmdldCgpOworICAgICAgICAgICAgc3RhdGljIE5TQ29sb3IgKmNsZWFy Q29sb3IgPSBbW05TQ29sb3IgY29sb3JXaXRoRGV2aWNlUmVkOjAgZ3JlZW46MCBibHVlOjAgYWxw aGE6MF0gcmV0YWluXTsKKyAgICAgICAgICAgIHJldHVybiBjbGVhckNvbG9yOwogICAgICAgICB9 CiAgICAgICAgIGNhc2UgQ29sb3I6OmJsYWNrOiB7Ci0gICAgICAgICAgICBERUZJTkVfU1RBVElD X0xPQ0FMKFJldGFpblB0cjxOU0NvbG9yPiwgYmxhY2tDb2xvciwgKFtOU0NvbG9yIGNvbG9yV2l0 aERldmljZVJlZDowIGdyZWVuOjAgYmx1ZTowIGFscGhhOjFdKSk7Ci0gICAgICAgICAgICByZXR1 cm4gYmxhY2tDb2xvci5nZXQoKTsKKyAgICAgICAgICAgIHN0YXRpYyBOU0NvbG9yICpibGFja0Nv bG9yID0gW1tOU0NvbG9yIGNvbG9yV2l0aERldmljZVJlZDowIGdyZWVuOjAgYmx1ZTowIGFscGhh OjFdIHJldGFpbl07CisgICAgICAgICAgICByZXR1cm4gYmxhY2tDb2xvcjsKICAgICAgICAgfQog ICAgICAgICBjYXNlIENvbG9yOjp3aGl0ZTogewotICAgICAgICAgICAgREVGSU5FX1NUQVRJQ19M T0NBTChSZXRhaW5QdHI8TlNDb2xvcj4sIHdoaXRlQ29sb3IsIChbTlNDb2xvciBjb2xvcldpdGhE ZXZpY2VSZWQ6MSBncmVlbjoxIGJsdWU6MSBhbHBoYToxXSkpOwotICAgICAgICAgICAgcmV0dXJu IHdoaXRlQ29sb3IuZ2V0KCk7CisgICAgICAgICAgICBzdGF0aWMgTlNDb2xvciAqd2hpdGVDb2xv ciA9IFtbTlNDb2xvciBjb2xvcldpdGhEZXZpY2VSZWQ6MSBncmVlbjoxIGJsdWU6MSBhbHBoYTox XSByZXRhaW5dOworICAgICAgICAgICAgcmV0dXJuIHdoaXRlQ29sb3I7CiAgICAgICAgIH0KICAg ICAgICAgZGVmYXVsdDogewogICAgICAgICAgICAgY29uc3QgaW50IGNhY2hlU2l6ZSA9IDMyOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNz Q29udGV4dE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFw aGljc0NvbnRleHRNYWMubW0KaW5kZXggMjZiNWY3Y2ZkOGIyMzZjNTFmZDhmOTAyMWY2Y2U2NmVj YTljNzQzMS4uNWRmNzdjMmQ5OGUzOWNkYjRhYTZmZjBhMWY0M2RlNTgwNDk4NWQwYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzQ29udGV4 dE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhp Y3NDb250ZXh0TWFjLm1tCkBAIC04Myw3ICs4Myw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpk cmF3Rm9jdXNSaW5nKGNvbnN0IFZlY3RvcjxJbnRSZWN0PiYgcmVjdHMsIGludCB3aWR0aCwgaW50 CiB9CiAKIAotc3RhdGljIE5TQ29sb3IqIGNyZWF0ZVBhdHRlcm5Db2xvcihOU1N0cmluZyogZmly c3RDaG9pY2VOYW1lLCBOU1N0cmluZyogc2Vjb25kQ2hvaWNlTmFtZSwgTlNDb2xvciogZGVmYXVs dENvbG9yLCBib29sJiB1c2luZ0RvdCkKK3N0YXRpYyBOU0NvbG9yKiBtYWtlUGF0dGVybkNvbG9y KE5TU3RyaW5nKiBmaXJzdENob2ljZU5hbWUsIE5TU3RyaW5nKiBzZWNvbmRDaG9pY2VOYW1lLCBO U0NvbG9yKiBkZWZhdWx0Q29sb3IsIGJvb2wmIHVzaW5nRG90KQogewogICAgIC8vIEV2ZW50dWFs bHkgd2Ugc2hvdWxkIGJlIGFibGUgdG8gZ2V0IHJpZCBvZiB0aGUgc2Vjb25kQ2hvaWNlTmFtZS4g Rm9yIHRoZSB0aW1lIGJlaW5nIHdlIG5lZWQgYm90aCB0byBrZWVwCiAgICAgLy8gdGhpcyB3b3Jr aW5nIG9uIGFsbCBwbGF0Zm9ybXMuCkBAIC0xMTYsMTggKzExNiwxOCBAQCB2b2lkIEdyYXBoaWNz Q29udGV4dDo6ZHJhd0xpbmVGb3JEb2N1bWVudE1hcmtlcihjb25zdCBGbG9hdFBvaW50JiBwb2lu dCwgZmxvYXQgdwogICAgICAgICB7CiAgICAgICAgICAgICAvLyBDb25zdGFudHMgZm9yIHNwZWxs aW5nIHBhdHRlcm4gY29sb3IuCiAgICAgICAgICAgICBzdGF0aWMgYm9vbCB1c2luZ0RvdEZvclNw ZWxsaW5nID0gZmFsc2U7Ci0gICAgICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFJldGFpblB0 cjxOU0NvbG9yPiwgc3BlbGxpbmdQYXR0ZXJuQ29sb3IsIChjcmVhdGVQYXR0ZXJuQ29sb3IoQCJO U1NwZWxsaW5nRG90IiwgQCJTcGVsbGluZ0RvdCIsIFtOU0NvbG9yIHJlZENvbG9yXSwgdXNpbmdE b3RGb3JTcGVsbGluZykpKTsKKyAgICAgICAgICAgIHN0YXRpYyBOU0NvbG9yICpzcGVsbGluZ1Bh dHRlcm5Db2xvciA9IFttYWtlUGF0dGVybkNvbG9yKEAiTlNTcGVsbGluZ0RvdCIsIEAiU3BlbGxp bmdEb3QiLCBbTlNDb2xvciByZWRDb2xvcl0sIHVzaW5nRG90Rm9yU3BlbGxpbmcpIHJldGFpbl07 CiAgICAgICAgICAgICB1c2luZ0RvdCA9IHVzaW5nRG90Rm9yU3BlbGxpbmc7Ci0gICAgICAgICAg ICBwYXR0ZXJuQ29sb3IgPSBzcGVsbGluZ1BhdHRlcm5Db2xvci5nZXQoKTsKKyAgICAgICAgICAg IHBhdHRlcm5Db2xvciA9IHNwZWxsaW5nUGF0dGVybkNvbG9yOwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBEb2N1bWVudE1hcmtlckdyYW1tYXJMaW5lU3R5bGU6 CiAgICAgICAgIHsKICAgICAgICAgICAgIC8vIENvbnN0YW50cyBmb3IgZ3JhbW1hciBwYXR0ZXJu IGNvbG9yLgogICAgICAgICAgICAgc3RhdGljIGJvb2wgdXNpbmdEb3RGb3JHcmFtbWFyID0gZmFs c2U7Ci0gICAgICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFJldGFpblB0cjxOU0NvbG9yPiwg Z3JhbW1hclBhdHRlcm5Db2xvciwgKGNyZWF0ZVBhdHRlcm5Db2xvcihAIk5TR3JhbW1hckRvdCIs IEAiR3JhbW1hckRvdCIsIFtOU0NvbG9yIGdyZWVuQ29sb3JdLCB1c2luZ0RvdEZvckdyYW1tYXIp KSk7CisgICAgICAgICAgICBzdGF0aWMgTlNDb2xvciAqZ3JhbW1hclBhdHRlcm5Db2xvciA9IFtt YWtlUGF0dGVybkNvbG9yKEAiTlNHcmFtbWFyRG90IiwgQCJHcmFtbWFyRG90IiwgW05TQ29sb3Ig Z3JlZW5Db2xvcl0sIHVzaW5nRG90Rm9yR3JhbW1hcikgcmV0YWluXTsKICAgICAgICAgICAgIHVz aW5nRG90ID0gdXNpbmdEb3RGb3JHcmFtbWFyOwotICAgICAgICAgICAgcGF0dGVybkNvbG9yID0g Z3JhbW1hclBhdHRlcm5Db2xvci5nZXQoKTsKKyAgICAgICAgICAgIHBhdHRlcm5Db2xvciA9IGdy YW1tYXJQYXR0ZXJuQ29sb3I7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogI2lmIFBM QVRGT1JNKE1BQykgJiYgKFBMQVRGT1JNKElPUykgfHwgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMDcwKQpAQCAtMTM3LDkgKzEzNyw5IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0 OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2VyKGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCBmbG9h dCB3CiAgICAgICAgIHsKICAgICAgICAgICAgIC8vIENvbnN0YW50cyBmb3Igc3BlbGxpbmcgcGF0 dGVybiBjb2xvci4KICAgICAgICAgICAgIHN0YXRpYyBib29sIHVzaW5nRG90Rm9yU3BlbGxpbmcg PSBmYWxzZTsKLSAgICAgICAgICAgIERFRklORV9TVEFUSUNfTE9DQUwoUmV0YWluUHRyPE5TQ29s b3I+LCBzcGVsbGluZ1BhdHRlcm5Db2xvciwgKGNyZWF0ZVBhdHRlcm5Db2xvcihAIk5TQ29ycmVj dGlvbkRvdCIsIEAiQ29ycmVjdGlvbkRvdCIsIFtOU0NvbG9yIGJsdWVDb2xvcl0sIHVzaW5nRG90 Rm9yU3BlbGxpbmcpKSk7CisgICAgICAgICAgICBzdGF0aWMgTlNDb2xvciAqc3BlbGxpbmdQYXR0 ZXJuQ29sb3IgPSBbbWFrZVBhdHRlcm5Db2xvcihAIk5TQ29ycmVjdGlvbkRvdCIsIEAiQ29ycmVj dGlvbkRvdCIsIFtOU0NvbG9yIGJsdWVDb2xvcl0sIHVzaW5nRG90Rm9yU3BlbGxpbmcpIHJldGFp bl07CiAgICAgICAgICAgICB1c2luZ0RvdCA9IHVzaW5nRG90Rm9yU3BlbGxpbmc7Ci0gICAgICAg ICAgICBwYXR0ZXJuQ29sb3IgPSBzcGVsbGluZ1BhdHRlcm5Db2xvci5nZXQoKTsKKyAgICAgICAg ICAgIHBhdHRlcm5Db2xvciA9IHNwZWxsaW5nUGF0dGVybkNvbG9yOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tCmluZGV4IDViZjJhZDRiOTMx NjUyOGM4N2EzZDFiOWYwNzI0OWUwODdjYmY3NTUuLmFiZGVhMWRiZjA4ZGI4M2YzZWMyMDQ0NWMx MzFlMzQyYTAyMTQzZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL21hYy9TaW1wbGVGb250RGF0YU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0KQEAgLTc0LDggKzc0LDggQEAgc3Rh dGljIGJvb2wgaW5pdEZvbnREYXRhKFNpbXBsZUZvbnREYXRhKiBmb250RGF0YSkKIAogc3RhdGlj IE5TU3RyaW5nICp3ZWJGYWxsYmFja0ZvbnRGYW1pbHkodm9pZCkKIHsKLSAgICBERUZJTkVfU1RB VElDX0xPQ0FMKFJldGFpblB0cjxOU1N0cmluZz4sIHdlYkZhbGxiYWNrRm9udEZhbWlseSwgKFtb TlNGb250IHN5c3RlbUZvbnRPZlNpemU6MTYuMGZdIGZhbWlseU5hbWVdKSk7Ci0gICAgcmV0dXJu IHdlYkZhbGxiYWNrRm9udEZhbWlseS5nZXQoKTsKKyAgICBzdGF0aWMgTlNTdHJpbmcgKndlYkZh bGxiYWNrRm9udEZhbWlseSA9IFtbW05TRm9udCBzeXN0ZW1Gb250T2ZTaXplOjE2LjBmXSBmYW1p bHlOYW1lXSByZXRhaW5dOworICAgIHJldHVybiB3ZWJGYWxsYmFja0ZvbnRGYW1pbHk7CiB9CiAK IGNvbnN0IFNpbXBsZUZvbnREYXRhKiBTaW1wbGVGb250RGF0YTo6Z2V0Q29tcG9zaXRlRm9udFJl ZmVyZW5jZUZvbnREYXRhKE5TRm9udCAqa2V5KSBjb25zdAo=