/// 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
/// 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.
void LexicalScopes::reset() {
MF = nullptr;
CurrentFnLexicalScope = nullptr;
- DeleteContainerSeconds(AbstractScopeMap);
InlinedLexicalScopeMap.clear();
AbstractScopesList.clear();
}
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()) {
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