Skip to content

Fixes #24233: Remove misleading JDK compatibility hint for TASTy errors #25171

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
tgodzik merged 7 commits into from
Feb 4, 2026
+8 −4
Merged

Fixes #24233: Remove misleading JDK compatibility hint for TASTy errors #25171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c0943f5
Fixes #24233: Remove misleading JDK compatibility hint for TASTy errors
Bbn08 Feb 2, 2026
01dd4ed
Merge branch 'main' into fix/my-first-contribution
Bbn08 Feb 2, 2026
ea313b5
Trigger CI re-run
Bbn08 Feb 2, 2026
a9e3a9e
ci: retry checks
Bbn08 Feb 2, 2026
1190f64
ci: retry checks 2
Bbn08 Feb 2, 2026
5ade6f2
ci: retry checks 3
Bbn08 Feb 2, 2026
1af2243
Merge branch 'main' into fix/my-first-contribution
Bbn08 Feb 4, 2026
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
6 changes: 4 additions & 2 deletions compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package classfile

import scala.language.unsafeNulls

import dotty.tools.tasty.{ TastyReader, TastyHeaderUnpickler }
import dotty.tools.tasty.{ TastyReader, TastyHeaderUnpickler, UnpickleException }

import Contexts.*, Symbols.*, Types.*, Names.*, StdNames.*, NameOps.*, Scopes.*, Decorators.*
import SymDenotations.*, unpickleScala2.Scala2Unpickler.*, Constants.*, Annotations.*, util.Spans.*
Expand Down Expand Up @@ -306,7 +306,9 @@ class ClassfileParser(
catch {
case e: RuntimeException =>
if (ctx.debug) e.printStackTrace()
val addendum = Header.Version.brokenVersionAddendum(classfileVersion)
val addendum = e match
case _: UnpickleException => ""
case _ => Header.Version.brokenVersionAddendum(classfileVersion)
throw new IOException(
i""" class file ${classfile.canonicalPath} is broken$addendum,
| reading aborted with ${e.getClass}:
Expand Down
6 changes: 4 additions & 2 deletions compiler/src/dotty/tools/dotc/core/classfile/ClassfileTastyUUIDParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import dotty.tools.dotc.core.Symbols.*
import dotty.tools.dotc.core.Types.*
import dotty.tools.dotc.util.*
import dotty.tools.io.AbstractFile
import dotty.tools.tasty.TastyReader
import dotty.tools.tasty.{ TastyReader, UnpickleException }

import ClassfileParser.Header

Expand All @@ -37,7 +37,9 @@ class ClassfileTastyUUIDParser(classfile: AbstractFile)(ictx: Context) {
catch {
case e: RuntimeException =>
if (ctx.debug) e.printStackTrace()
val addendum = Header.Version.brokenVersionAddendum(classfileVersion)
val addendum = e match
case _: UnpickleException => ""
case _ => Header.Version.brokenVersionAddendum(classfileVersion)
throw new IOException(
i""" class file ${classfile.canonicalPath} is broken$addendum,
| reading aborted with ${e.getClass}:
Expand Down
Loading