replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

LexicalScopes: Use unique_ptr to manage ownership of abstract LexicalScopes. 

llvm-svn: 207726
This commit is contained in:
David Blaikie 2014-04-30 23:46:27 +00:00
parent 998dedac98
commit 6b71cc7bac
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/include/llvm/CodeGen/LexicalScopes.h
View File

@ -90,7 +90,8 @@ public:
/// findAbstractScope - Find an abstract scope or return NULL.
LexicalScope *findAbstractScope(const MDNode *N) {
return AbstractScopeMap.lookup(N);
auto I = AbstractScopeMap.find(N);
return I != AbstractScopeMap.end() ? I->second.get() : nullptr;
}
/// findInlinedScope - Find an inlined scope for the given DebugLoc or return
@ -144,7 +145,7 @@ private:
/// AbstractScopeMap - These scopes are not included LexicalScopeMap.
/// AbstractScopes owns its LexicalScope*s.
DenseMap<const MDNode *, LexicalScope *> AbstractScopeMap;
DenseMap<const MDNode *, std::unique_ptr<LexicalScope>> AbstractScopeMap;
/// AbstractScopesList - Tracks abstract scopes constructed while processing
/// a function.

17
llvm/lib/CodeGen/LexicalScopes.cpp
View File

@ -33,7 +33,6 @@ LexicalScopes::~LexicalScopes() { reset(); }
void LexicalScopes::reset() {
MF = nullptr;
CurrentFnLexicalScope = nullptr;
DeleteContainerSeconds(AbstractScopeMap);
InlinedLexicalScopeMap.clear();
AbstractScopesList.clear();
}
@ -194,9 +193,11 @@ LexicalScope *LexicalScopes::getOrCreateAbstractScope(const MDNode *N) {
DIDescriptor Scope(N);
if (Scope.isLexicalBlockFile())
Scope = DILexicalBlockFile(Scope).getScope();
LexicalScope *AScope = AbstractScopeMap.lookup(N);
if (AScope)
return AScope;
auto IterBool = AbstractScopeMap.insert(
std::make_pair(N, std::unique_ptr<LexicalScope>()));
auto &MapEntry = *IterBool.first;
if (!IterBool.second)
return MapEntry.second.get();
LexicalScope *Parent = nullptr;
if (Scope.isLexicalBlock()) {
@ -204,11 +205,11 @@ LexicalScope *LexicalScopes::getOrCreateAbstractScope(const MDNode *N) {
DIDescriptor ParentDesc = DB.getContext();
Parent = getOrCreateAbstractScope(ParentDesc);
}
AScope = new LexicalScope(Parent, DIDescriptor(N), nullptr, true);
AbstractScopeMap[N] = AScope;
MapEntry.second =
make_unique<LexicalScope>(Parent, DIDescriptor(N), nullptr, true);
if (DIDescriptor(N).isSubprogram())
AbstractScopesList.push_back(AScope);
return AScope;
AbstractScopesList.push_back(MapEntry.second.get());
return MapEntry.second.get();
}
/// constructScopeNest