6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-01 00:33:09 +00:00
Code Issues Projects Releases Wiki Activity

LexicalScopes: use unique_ptr to own LexicalScope objects.

Browse Source 
Ownership of abstract scopes coming soon.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207724 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2014-04-30 23:40:59 +00:00
parent 3589c24c08
commit b5b0db911b
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
#include "llvm/IR/Metadata.h"
#include "llvm/IR/ValueHandle.h"
#include <utility>
#include <memory>
namespace llvm {
class MachineInstr;
@ -100,7 +101,8 @@ public:
/// findLexicalScope - Find regular lexical scope or return NULL.
LexicalScope *findLexicalScope(const MDNode *N) {
return LexicalScopeMap.lookup(N);
auto I = LexicalScopeMap.find(N);
return I != LexicalScopeMap.end() ? I->second.get() : nullptr;
}
/// dump - Print data structures to dbgs().
@ -134,7 +136,7 @@ private:
/// LexicalScopeMap - Tracks the scopes in the current function. Owns the
/// contained LexicalScope*s.
DenseMap<const MDNode *, LexicalScope *> LexicalScopeMap;
DenseMap<const MDNode *, std::unique_ptr<LexicalScope>> LexicalScopeMap;
/// InlinedLexicalScopeMap - Tracks inlined function scopes in current
/// function.

32
lib/CodeGen/LexicalScopes.cpp
View File

@ -33,7 +33,6 @@ LexicalScopes::~LexicalScopes() { reset(); }
void LexicalScopes::reset() {
MF = nullptr;
CurrentFnLexicalScope = nullptr;
DeleteContainerSeconds(LexicalScopeMap);
DeleteContainerSeconds(AbstractScopeMap);
InlinedLexicalScopeMap.clear();
AbstractScopesList.clear();
@ -124,7 +123,8 @@ LexicalScope *LexicalScopes::findLexicalScope(DebugLoc DL) {
if (IA)
return InlinedLexicalScopeMap.lookup(DebugLoc::getFromDILocation(IA));
return LexicalScopeMap.lookup(Scope);
auto I = LexicalScopeMap.find(Scope);
return I != LexicalScopeMap.end() ? I->second.get() : nullptr;
}
/// getOrCreateLexicalScope - Find lexical scope for the given DebugLoc. If
@ -152,35 +152,35 @@ LexicalScope *LexicalScopes::getOrCreateRegularScope(MDNode *Scope) {
D = DIDescriptor(Scope);
}
LexicalScope *WScope = LexicalScopeMap.lookup(Scope);
if (WScope)
return WScope;
auto IterBool = LexicalScopeMap.insert(std::make_pair(Scope, std::unique_ptr<LexicalScope>()));
auto &MapValue = *IterBool.first;
if (!IterBool.second)
return MapValue.second.get();
LexicalScope *Parent = nullptr;
if (D.isLexicalBlock())
Parent = getOrCreateLexicalScope(DebugLoc::getFromDILexicalBlock(Scope));
WScope = new LexicalScope(Parent, DIDescriptor(Scope), nullptr, false);
LexicalScopeMap.insert(std::make_pair(Scope, WScope));
MapValue.second = make_unique<LexicalScope>(Parent, DIDescriptor(Scope), nullptr, false);
if (!Parent && DIDescriptor(Scope).isSubprogram() &&
DISubprogram(Scope).describes(MF->getFunction()))
CurrentFnLexicalScope = WScope;
CurrentFnLexicalScope = MapValue.second.get();
return WScope;
return MapValue.second.get();
}
/// getOrCreateInlinedScope - Find or create an inlined lexical scope.
LexicalScope *LexicalScopes::getOrCreateInlinedScope(MDNode *Scope,
MDNode *InlinedAt) {
LexicalScope *InlinedScope = LexicalScopeMap.lookup(InlinedAt);
if (InlinedScope)
return InlinedScope;
auto IterBool = LexicalScopeMap.insert(std::make_pair(InlinedAt, std::unique_ptr<LexicalScope>()));
auto &MapValue = *IterBool.first;
if (!IterBool.second)
return MapValue.second.get();
DebugLoc InlinedLoc = DebugLoc::getFromDILocation(InlinedAt);
InlinedScope = new LexicalScope(getOrCreateLexicalScope(InlinedLoc),
MapValue.second = make_unique<LexicalScope>(getOrCreateLexicalScope(InlinedLoc),
DIDescriptor(Scope), InlinedAt, false);
InlinedLexicalScopeMap[InlinedLoc] = InlinedScope;
LexicalScopeMap[InlinedAt] = InlinedScope;
return InlinedScope;
InlinedLexicalScopeMap[InlinedLoc] = MapValue.second.get();
return MapValue.second.get();
}
/// getOrCreateAbstractScope - Find or create an abstract lexical scope.