Skip to content

Output other compiler errors #14339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 25, 2022
Merged

Output other compiler errors #14339

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
00a3dbd
Output other compiler errors
nicolasstucki Jan 24, 2022
c99694f
Make errors from other compilers simpler to read
nicolasstucki Jan 25, 2022
c5d770f
Do not report warnings
nicolasstucki Jan 25, 2022
9dd77f5
Do not harcode other compile -pagewidth
nicolasstucki Jan 25, 2022
a61fec5
Properly report errors
nicolasstucki Jan 25, 2022
8b2faa5
Show broken source file errors
nicolasstucki Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 33 additions & 17 deletions compiler/test/dotty/tools/vulpix/ParallelTesting.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,20 +504,35 @@ trait ParallelTesting extends RunnerOrchestration { self =>
reporter
}

private def parseErrors(errorsText: String, compilerVersion: String) =
val errorPattern = """.*Error: (.*\.scala):(\d+):(\d+).*""".r
errorsText.linesIterator.toSeq.collect {
case errorPattern(filePath, line, column) =>
val lineNum = line.toInt
val columnNum = column.toInt
val abstractFile = AbstractFile.getFile(filePath)
val sourceFile = SourceFile(abstractFile, Codec.UTF8)
val offset = sourceFile.lineToOffset(lineNum - 1) + columnNum - 1
val span = Spans.Span(offset)
val sourcePos = SourcePosition(sourceFile, span)

Diagnostic.Error(s"Compilation of $filePath with Scala $compilerVersion failed at line: $line, column: $column. Full error output:\n\n$errorsText\n", sourcePos)
}
private def parseErrors(errorsText: String, compilerVersion: String, pageWidth: Int) =
val errorPattern = """^.*Error: (.*\.scala):(\d+):(\d+).*""".r
val summaryPattern = """\d+ (?:warning|error)s? found""".r
val indent = " "
var diagnostics = List.empty[Diagnostic.Error]
def barLine(start: Boolean) = s"$indent${if start then "╭" else "╰"}${"┄" * pageWidth}${if start then "╮" else "╯"}\n"
def errorLine(line: String) = s"$indent┆${String.format(s"%-${pageWidth}s", stripAnsi(line))}┆\n"
def stripAnsi(str: String): String = str.replaceAll("\u001b\\[\\d+m", "")
def addToLast(str: String): Unit =
diagnostics match
case head :: tail =>
diagnostics = Diagnostic.Error(s"${head.msg.rawMessage}$str", head.pos) :: tail
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we catch warnings as well, we should handle them properly too. Although I'm not sure if we really need that and if we can handle this reliably as the external compiler process might not fail if there are some warnings but no error. As far as I know, every time we want to check if a warning was raised we enable fatal warnings and check for errors instead

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added code to ignore warnings

case Nil =>
for line <- errorsText.linesIterator do
line match
case error @ errorPattern(filePath, line, column) =>
val lineNum = line.toInt
val columnNum = column.toInt
val abstractFile = AbstractFile.getFile(filePath)
val sourceFile = SourceFile(abstractFile, Codec.UTF8)
val offset = sourceFile.lineToOffset(lineNum - 1) + columnNum - 1
val span = Spans.Span(offset)
val sourcePos = SourcePosition(sourceFile, span)
addToLast(barLine(start = false))
diagnostics ::= Diagnostic.Error(s"Compilation of $filePath with Scala $compilerVersion failed at line: $line, column: $column.\nFull error output:\n${barLine(start = true)}${errorLine(error)}", sourcePos)
case summaryPattern() => // Ignored
case line => addToLast(errorLine(line))
addToLast(barLine(start = false))
diagnostics.reverse

protected def compileWithOtherCompiler(compiler: String, files: Array[JFile], flags: TestFlags, targetDir: JFile): TestReporter =
val compilerDir = getCompiler(compiler).toString
Expand All @@ -528,18 +543,19 @@ trait ParallelTesting extends RunnerOrchestration { self =>
else o
}.mkString(JFile.pathSeparator)

val pageWidth = 80
val flags1 = flags.copy(defaultClassPath = substituteClasspath(flags.defaultClassPath))
.withClasspath(targetDir.getPath)
.and("-d", targetDir.getPath)
.and("-pagewidth", pageWidth.toString)

val dummyStream = new PrintStream(new ByteArrayOutputStream())
val reporter = TestReporter.reporter(dummyStream, ERROR)
val reporter = TestReporter.reporter(System.out, ERROR)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say we don't want to show all the logs in all situations as we don't show them by default when compiling with the latest compiler inside the same process. I think it would make sense to show the logs if the external process failed but no errors were parsed or if there's a mismatch between the expected number and positions of errors and the errors that we extracted from the logs

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now errors are not printed in neg tests unless the test fails.


val command = Array(compilerDir + "/bin/scalac") ++ flags1.all ++ files.map(_.getPath)
val process = Runtime.getRuntime.exec(command)
val errorsText = Source.fromInputStream(process.getErrorStream).mkString
if process.waitFor() != 0 then
val diagnostics = parseErrors(errorsText, compiler)
val diagnostics = parseErrors(errorsText, compiler, pageWidth)
diagnostics.foreach { diag =>
val context = (new ContextBase).initialCtx
reporter.report(diag)(using context)
Expand Down