Merge pull request #4864 from dotty-staging/improve-tasty-uuid-error-message

nicolasstucki · web-flow · commit 390d98777615 · 2018-07-29T13:07:31.000+02:00
Print classfile when failing a UUID Tasty check
diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
@@ -838,7 +838,7 @@ class ClassfileParser(
             val expectedUUID = new UUID(reader.readUncompressedLong(), reader.readUncompressedLong())
             val tastyUUID = new TastyHeaderUnpickler(tastyBytes).readHeader()
             if (expectedUUID != tastyUUID)
-              ctx.error(s"Tasty UUID ($tastyUUID) file did not correspond the tasty UUID declared in the classfile ($expectedUUID).")
+              ctx.error(s"Tasty UUID ($tastyUUID) file did not correspond the tasty UUID ($expectedUUID) declared in the classfile $classfile.")
             return unpickleTASTY(tastyBytes)
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -838,7 +838,7 @@ class ClassfileParser(`
`838`	`838`	`val expectedUUID = new UUID(reader.readUncompressedLong(), reader.readUncompressedLong())`
`839`	`839`	`val tastyUUID = new TastyHeaderUnpickler(tastyBytes).readHeader()`
`840`	`840`	`if (expectedUUID != tastyUUID)`
`841`		`- ctx.error(s"Tasty UUID ($tastyUUID) file did not correspond the tasty UUID declared in the classfile ($expectedUUID).")`
	`841`	`+ ctx.error(s"Tasty UUID ($tastyUUID) file did not correspond the tasty UUID ($expectedUUID) declared in the classfile $classfile.")`
`842`	`842`	`return unpickleTASTY(tastyBytes)`
`843`	`843`	`}`
`844`	`844`	`}`