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

[libSyntax] Enhance incremental re-parsing testing to also check whether unexpected diagnostics were emitted

Browse Source 
Enhances `swift-syntax-test` to output the parser diagnostics so we can verify that
if the incremental parse resulted in parser diagnostics, those diagnostics were also emitted during the full parse.
This commit is contained in:
Argyrios Kyrtzidis
2020-03-18 11:52:21 -07:00
parent 802af8c436
commit 1882b50555
5 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,6 +175,10 @@ static llvm::cl::opt<std::string>
OutputFilename("output-filename",
llvm::cl::desc("Path to the output file"));
static llvm::cl::opt<std::string>
DiagsOutputFilename("diags-output-filename",
llvm::cl::desc("Path to the output file for parser diagnostics text"));
static llvm::cl::opt<bool>
PrintVisualReuseInfo("print-visual-reuse-info",
llvm::cl::desc("Print a coloured output of which parts of "
@@ -556,12 +560,17 @@ bool verifyReusedRegions(ByteBasedSourceRangeSet ExpectedReparseRegions,
return NoUnexpectedParse;
}
struct ParseInfo {
SourceFile *SF;
SyntaxParsingCache *SyntaxCache;
std::string Diags;
};
/// Parse the given input file (incrementally if an old syntax tree was
/// provided) and call the action specific callback with the new syntax tree
int parseFile(
const char *MainExecutablePath, const StringRef InputFileName,
llvm::function_ref<int(SourceFile *, SyntaxParsingCache *SyntaxCache)>
ActionSpecificCallback) {
llvm::function_ref<int(ParseInfo)> ActionSpecificCallback) {
// The cache needs to be a heap allocated pointer since we construct it inside
// an if block but need to keep it alive until the end of the function.
SyntaxParsingCache *SyntaxCache = nullptr;
@@ -608,7 +617,9 @@ int parseFile(
Invocation.setMainFileSyntaxParsingCache(SyntaxCache);
Invocation.setModuleName("Test");
PrintingDiagnosticConsumer DiagConsumer;
std::string DiagsString;
llvm::raw_string_ostream DiagOS(DiagsString);
PrintingDiagnosticConsumer DiagConsumer(DiagOS);
CompilerInstance Instance;
Instance.addDiagnosticConsumer(&DiagConsumer);
if (Instance.setup(Invocation)) {
@@ -658,7 +669,8 @@ int parseFile(
}
}
int ActionSpecificExitCode = ActionSpecificCallback(SF, SyntaxCache);
int ActionSpecificExitCode =
ActionSpecificCallback({SF, SyntaxCache, DiagOS.str()});
if (ActionSpecificExitCode != EXIT_SUCCESS) {
return ActionSpecificExitCode;
} else {
@@ -713,8 +725,8 @@ int doDumpRawTokenSyntax(const StringRef InputFile) {
int doFullParseRoundTrip(const char *MainExecutablePath,
const StringRef InputFile) {
return parseFile(MainExecutablePath, InputFile,
[](SourceFile *SF, SyntaxParsingCache *SyntaxCache) -> int {
SF->getSyntaxRoot().print(llvm::outs(), {});
[](ParseInfo info) -> int {
info.SF->getSyntaxRoot().print(llvm::outs(), {});
return EXIT_SUCCESS;
});
}
@@ -722,7 +734,9 @@ int doFullParseRoundTrip(const char *MainExecutablePath,
int doSerializeRawTree(const char *MainExecutablePath,
const StringRef InputFile) {
return parseFile(MainExecutablePath, InputFile,
[](SourceFile *SF, SyntaxParsingCache *SyntaxCache) -> int {
[](ParseInfo info) -> int {
auto SF = info.SF;
auto SyntaxCache = info.SyntaxCache;
auto Root = SF->getSyntaxRoot().getRaw();
std::unordered_set<unsigned> ReusedNodeIds;
if (options::IncrementalSerialization && SyntaxCache) {
@@ -780,6 +794,23 @@ int doSerializeRawTree(const char *MainExecutablePath,
SerializeTree(llvm::outs(), Root, SyntaxCache);
}
}
if (!options::DiagsOutputFilename.empty()) {
std::error_code errorCode;
llvm::raw_fd_ostream os(options::DiagsOutputFilename, errorCode,
llvm::sys::fs::F_None);
if (errorCode) {
llvm::errs() << "error opening file '" << options::DiagsOutputFilename
<< "': " << errorCode.message() << '\n';
return EXIT_FAILURE;
}
if (!info.Diags.empty())
os << info.Diags << '\n';
} else {
if (!info.Diags.empty())
llvm::errs() << info.Diags << '\n';
}
return EXIT_SUCCESS;
});
}
@@ -800,19 +831,19 @@ int doDeserializeRawTree(const char *MainExecutablePath,
int doParseOnly(const char *MainExecutablePath, const StringRef InputFile) {
return parseFile(MainExecutablePath, InputFile,
[](SourceFile *SF, SyntaxParsingCache *SyntaxCache) {
return SF ? EXIT_SUCCESS : EXIT_FAILURE;
[](ParseInfo info) {
return info.SF ? EXIT_SUCCESS : EXIT_FAILURE;
});
}
int dumpParserGen(const char *MainExecutablePath, const StringRef InputFile) {
return parseFile(MainExecutablePath, InputFile,
[](SourceFile *SF, SyntaxParsingCache *SyntaxCache) {
[](ParseInfo info) {
SyntaxPrintOptions Opts;
Opts.PrintSyntaxKind = options::PrintNodeKind;
Opts.Visual = options::Visual;
Opts.PrintTrivialNodeKind = options::PrintTrivialNodeKind;
SF->getSyntaxRoot().print(llvm::outs(), Opts);
info.SF->getSyntaxRoot().print(llvm::outs(), Opts);
return EXIT_SUCCESS;
});
}
@@ -820,7 +851,8 @@ int dumpParserGen(const char *MainExecutablePath, const StringRef InputFile) {
int dumpEOFSourceLoc(const char *MainExecutablePath,
const StringRef InputFile) {
return parseFile(MainExecutablePath, InputFile,
[](SourceFile *SF, SyntaxParsingCache *SyntaxCache) -> int {
[](ParseInfo info) -> int {
auto SF = info.SF;
auto BufferId = *SF->getBufferID();
auto Root = SF->getSyntaxRoot();
auto AbPos = Root.getEOFToken().getAbsolutePosition();
@@ -841,8 +873,8 @@ int dumpEOFSourceLoc(const char *MainExecutablePath,
}
}// end of anonymous namespace
int invokeCommand(const char *MainExecutablePath,
const StringRef InputSourceFilename) {
static int invokeCommand(const char *MainExecutablePath,
const StringRef InputSourceFilename) {
int ExitCode = EXIT_SUCCESS;
switch (options::Action) {