maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use MapVector rather than simulating it. 

llvm-svn: 179438
This commit is contained in:
Richard Smith 2013-04-13 01:28:18 +00:00
parent 389823e995
commit f21c9617f8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1748,8 +1748,6 @@ void CodeGenModule::MaybeHandleStaticInExternC(const SomeDecl *D,
// in extern "C" regions, none of them gets that name.
if (!R.second)
R.first->second = 0;
else
StaticExternCIdents.push_back(D->getIdentifier());
}
void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D) {
@ -2958,9 +2956,11 @@ static void EmitGlobalDeclMetadata(CodeGenModule &CGM,
/// to such functions with an unmangled name from inline assembly within the
/// same translation unit.
void CodeGenModule::EmitStaticExternCAliases() {
for (unsigned I = 0, N = StaticExternCIdents.size(); I != N; ++I) {
IdentifierInfo *Name = StaticExternCIdents[I];
llvm::GlobalValue *Val = StaticExternCValues[Name];
for (StaticExternCMap::iterator I = StaticExternCValues.begin(),
E = StaticExternCValues.end();
I != E; ++I) {
IdentifierInfo *Name = I->first;
llvm::GlobalValue *Val = I->second;
if (Val && !getModule().getNamedValue(Name->getName()))
AddUsedGlobal(new llvm::GlobalAlias(Val->getType(), Val->getLinkage(),
Name->getName(), Val, &getModule()));

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

@ -307,10 +307,9 @@ class CodeGenModule : public CodeGenTypeCache {
/// Map used to track internal linkage functions declared within
/// extern "C" regions.
typedef llvm::DenseMap<IdentifierInfo *,
llvm::GlobalValue *> StaticExternCMap;
typedef llvm::MapVector<IdentifierInfo *,
llvm::GlobalValue *> StaticExternCMap;
StaticExternCMap StaticExternCValues;
std::vector<IdentifierInfo*> StaticExternCIdents;
/// CXXGlobalInits - Global variables with initializers that need to run
/// before main.