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

Ensure the SourceManager outlives the RawSyntax tree to avoid deallocating strings

Browse Source
This commit is contained in:
Harlan Haskins
2017-06-19 10:17:55 -07:00
parent da87ab81c7
commit 6ad09779b7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/swift-syntax-test/swift-syntax-test.cpp
View File

@@ -104,6 +104,7 @@ void anchorForGetMainExecutable() {}
int getSyntaxTree(const char *MainExecutablePath,
const StringRef InputFilename,
CompilerInstance &Instance,
llvm::SmallVectorImpl<syntax::Syntax> &TopLevelDecls,
std::vector<std::pair<RC<syntax::TokenSyntax>,
syntax::AbsolutePosition>> &Tokens) {
@@ -115,7 +116,6 @@ int getSyntaxTree(const char *MainExecutablePath,
reinterpret_cast<void *>(&anchorForGetMainExecutable)));
Invocation.setModuleName("Test");
CompilerInstance Instance;
auto &SourceMgr = Instance.getSourceMgr();
@@ -219,8 +219,10 @@ int doFullParseRoundTrip(const char *MainExecutablePath,
llvm::SmallVector<syntax::Syntax, 10> TopLevelDecls;
std::vector<std::pair<RC<syntax::TokenSyntax>,
syntax::AbsolutePosition>> Tokens;
CompilerInstance Instance;
getSyntaxTree(MainExecutablePath, InputFilename, TopLevelDecls, Tokens);
getSyntaxTree(MainExecutablePath, InputFilename, Instance,
TopLevelDecls, Tokens);
for (auto &Node : TopLevelDecls) {
Node.print(llvm::outs());
@@ -239,8 +241,10 @@ int doSerializeRawTree(const char *MainExecutablePath,
llvm::SmallVector<syntax::Syntax, 10> TopLevelDecls;
std::vector<std::pair<RC<syntax::TokenSyntax>,
syntax::AbsolutePosition>> Tokens;
CompilerInstance Instance;
getSyntaxTree(MainExecutablePath, InputFilename, TopLevelDecls, Tokens);
getSyntaxTree(MainExecutablePath, InputFilename, Instance,
TopLevelDecls, Tokens);
for (auto &Node : TopLevelDecls) {
swift::json::Output out(llvm::outs());