chromium/src
0
Fork 0
Code Activity

Avoid the possibility of future conflict with another address-of-static due to COMDAT folding.

Browse Source 
BUG=none

Review URL: https://codereview.chromium.org/12529029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190035 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
joi@chromium.org
2013-03-23 17:24:36 +00:00
parent c1f37c839b
commit d64f2bd35f
1 changed files with 4 additions and 2 deletions

6
components/user_prefs/user_prefs.cc

@ -14,8 +14,10 @@ namespace components {
namespace {
void* UserDataKey() {
// We just need a unique constant. Use the address of this static member.
return reinterpret_cast<void*>(&UserPrefs::Get);
// We just need a unique constant. Use the address of a static that
// COMDAT folding won't touch in an optimizing linker.
static int data_key = 0;
return reinterpret_cast<void*>(&data_key);
}
} // namespace