nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[-cxx-abi microsoft] Mangle UUIDs correctly, stick them in the proper section

Browse Source 
We mangled them like:
L___uuid_12345678-1234-1234-1234-123456789abc

We should've mangled them like:
__GUID_12345678_1234_1234_1234_123456789abc

Furthermore, they are external symbols.

llvm-svn: 188053
This commit is contained in:
David Majnemer
2013-08-09 05:09:04 +00:00
parent 908606d0a9
commit 94a76b64e0
3 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/CodeGen/CodeGenModule.cpp
View File

@@ -1059,7 +1059,8 @@ llvm::Constant *CodeGenModule::GetAddrOfUuidDescriptor(
else
Uuid = "00000000-0000-0000-0000-000000000000";
}
std::string Name = "__uuid_" + Uuid.str();
std::string Name = "_GUID_" + Uuid.lower();
std::replace(Name.begin(), Name.end(), '-', '_');
// Look for an existing global.
if (llvm::GlobalVariable *GV = getModule().getNamedGlobal(Name))
@@ -1082,7 +1083,7 @@ llvm::Constant *CodeGenModule::GetAddrOfUuidDescriptor(
}
llvm::GlobalVariable *GV = new llvm::GlobalVariable(getModule(), GuidType,
/*isConstant=*/true, llvm::GlobalValue::PrivateLinkage, Init, Name);
/*isConstant=*/true, llvm::GlobalValue::ExternalLinkage, Init, Name);
GV->setUnnamedAddr(true);
return GV;
}