averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[libSyntax] Make RawSyntaxCacheNode retain its underlying RawSyntax node

Browse Source 
Previously RawSyntaxCacheNode was not increasing the RawSyntax refCount
and accessing a cached node would fail if the node had been deleted in
the meantime. We weren't hitting this so far, because all nodes were
allocated using a bump allocator and thus the underlying memory never
freed.
This commit is contained in:
Alex Hoppen
2018-08-10 17:21:08 -07:00
parent 1529d65748
commit e5c8440fe4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Syntax/SyntaxArena.cpp
View File

@@ -75,16 +75,16 @@ class RawSyntaxCacheNode : public llvm::FoldingSetNode {
friend llvm::FoldingSetTrait<RawSyntaxCacheNode>; friend llvm::FoldingSetTrait<RawSyntaxCacheNode>;
/// Associated RawSyntax. /// Associated RawSyntax.
RawSyntax *Obj; RC<RawSyntax> Obj;
/// FoldingSet node identifier of the associated RawSyntax. /// FoldingSet node identifier of the associated RawSyntax.
llvm::FoldingSetNodeIDRef IDRef; llvm::FoldingSetNodeIDRef IDRef;
public: public:
RawSyntaxCacheNode(RawSyntax *Obj, const llvm::FoldingSetNodeIDRef IDRef) RawSyntaxCacheNode(RC<RawSyntax> Obj, const llvm::FoldingSetNodeIDRef IDRef)
: Obj(Obj), IDRef(IDRef) {} : Obj(Obj), IDRef(IDRef) {}
/// Retrieve assciated RawSyntax. /// Retrieve assciated RawSyntax.
RawSyntax *get() { return Obj; } RC<RawSyntax> get() { return Obj; }
// Only allow allocation of Node using the allocator in SyntaxArena. // Only allow allocation of Node using the allocator in SyntaxArena.
void *operator new(size_t Bytes, SyntaxArena &Arena, void *operator new(size_t Bytes, SyntaxArena &Arena,
@@ -156,7 +156,7 @@ RC<RawSyntax> RawSyntax::getToken(SyntaxArena &Arena, tok TokKind,
auto Raw = RawSyntax::make(TokKind, Text, LeadingTrivia, TrailingTrivia, auto Raw = RawSyntax::make(TokKind, Text, LeadingTrivia, TrailingTrivia,
SourcePresence::Present, &Arena); SourcePresence::Present, &Arena);
auto IDRef = ID.Intern(Arena.getAllocator()); auto IDRef = ID.Intern(Arena.getAllocator());
auto CacheNode = new (Arena) RawSyntaxCacheNode(Raw.get(), IDRef); auto CacheNode = new (Arena) RawSyntaxCacheNode(Raw, IDRef);
CachedTokens.InsertNode(CacheNode, insertPos); CachedTokens.InsertNode(CacheNode, insertPos);
return Raw; return Raw;
} }