Skip to content

Commit ed22c31

Browse files
authored
Merge pull request #3282 from dotty-staging/fix-classfileparser-diagnostics
Fix error diagnostics in ClassfileParser
2 parents 2ecd3d2 + b470867 commit ed22c31

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class ClassfileParser(
5454
private def currentIsTopLevel(implicit ctx: Context) = classRoot.owner is Flags.PackageClass
5555

5656
private def mismatchError(className: SimpleName) =
57-
throw new IOException(s"class file '${in.file.file.getAbsolutePath}' has location not matching its contents: contains class $className")
57+
throw new IOException(s"class file '${in.file.canonicalPath}' has location not matching its contents: contains class $className")
5858

5959
def run()(implicit ctx: Context): Option[Embedded] = try {
6060
ctx.debuglog("[class] >> " + classRoot.fullName)
@@ -65,7 +65,7 @@ class ClassfileParser(
6565
case e: RuntimeException =>
6666
if (ctx.debug) e.printStackTrace()
6767
throw new IOException(
68-
i"""class file ${classfile.file.getAbsolutePath} is broken, reading aborted with ${e.getClass}
68+
i"""class file ${classfile.canonicalPath} is broken, reading aborted with ${e.getClass}
6969
|${Option(e.getMessage).getOrElse("")}""")
7070
}
7171

0 commit comments

Comments
 (0)