Skip to content

Commit 7992aca

Browse files
Merge pull request #8099 from dotty-staging/fix-7426
Fix #7426: Set correct default source for unpickling
2 parents 850b99d + e2be197 commit 7992aca

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-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
@@ -8,7 +8,7 @@ import dotty.tools.tasty.{ TastyReader, TastyHeaderUnpickler }
88
import Contexts._, Symbols._, Types._, Names._, StdNames._, NameOps._, Scopes._, Decorators._
99
import SymDenotations._, unpickleScala2.Scala2Unpickler._, Constants._, Annotations._, util.Spans._
1010
import NameKinds.DefaultGetterName
11-
import ast.tpd._
11+
import ast.tpd._, util._
1212
import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, DataInputStream, IOException }
1313

1414
import java.lang.Integer.toHexString
@@ -750,7 +750,7 @@ class ClassfileParser(
750750

751751
def unpickleTASTY(bytes: Array[Byte]): Some[Embedded] = {
752752
val unpickler = new tasty.DottyUnpickler(bytes)
753-
unpickler.enter(roots = Set(classRoot, moduleRoot, moduleRoot.sourceModule))
753+
unpickler.enter(roots = Set(classRoot, moduleRoot, moduleRoot.sourceModule))(ctx.withSource(util.NoSource))
754754
Some(unpickler)
755755
}
756756

compiler/test/dotty/tools/dotc/CompilationTests.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class CompilationTests extends ParallelTesting {
6363
compileDir("tests/pos-special/adhoc-extension", defaultOptions.and("-strict", "-feature", "-Xfatal-warnings")),
6464
compileFile("tests/pos-special/i7575.scala", defaultOptions.and("-language:dynamics")),
6565
compileFile("tests/pos-special/kind-projector.scala", defaultOptions.and("-Ykind-projector")),
66+
compileFile("tests/run/i5606.scala", defaultOptions.and("-Yretain-trees")),
6667
).checkCompile()
6768
}
6869

0 commit comments

Comments
 (0)