diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2013-08-09 05:56:24 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2013-08-09 05:56:24 +0000 |
| commit | a2724ae4b381dc84a7ea450514f123ace0a5aa9a (patch) | |
| tree | 9bf01635e4a9703ce9192b9db4706c60d17bb6bb /clang/lib/CodeGen/CodeGenModule.cpp | |
| parent | 215b00a66a2c3c91b8ca2abd258ac426a6d589c6 (diff) | |
| download | bcm5719-llvm-a2724ae4b381dc84a7ea450514f123ace0a5aa9a.tar.gz bcm5719-llvm-a2724ae4b381dc84a7ea450514f123ace0a5aa9a.zip | |
Revert "[-cxx-abi microsoft] Mangle UUIDs correctly, stick them in the proper section"
This commit reverts r188053.
It is breaking the build bots.
llvm-svn: 188055
Diffstat (limited to 'clang/lib/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 35c18b4c5eb..dbdf016b31b 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -1059,8 +1059,7 @@ llvm::Constant *CodeGenModule::GetAddrOfUuidDescriptor( else Uuid = "00000000-0000-0000-0000-000000000000"; } - std::string Name = "_GUID_" + Uuid.lower(); - std::replace(Name.begin(), Name.end(), '-', '_'); + std::string Name = "__uuid_" + Uuid.str(); // Look for an existing global. if (llvm::GlobalVariable *GV = getModule().getNamedGlobal(Name)) @@ -1083,7 +1082,7 @@ llvm::Constant *CodeGenModule::GetAddrOfUuidDescriptor( } llvm::GlobalVariable *GV = new llvm::GlobalVariable(getModule(), GuidType, - /*isConstant=*/true, llvm::GlobalValue::ExternalLinkage, Init, Name); + /*isConstant=*/true, llvm::GlobalValue::PrivateLinkage, Init, Name); GV->setUnnamedAddr(true); return GV; } |
