Skip to content

Commit 0b90430

Browse files
authored
Merge pull request #5515 from dotty-staging/fix-pickling-various
Various fixes to reduce the size of the pickling blackliist
2 parents fd6f62a + 334dffd commit 0b90430

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

compiler/src/dotty/tools/dotc/core/Symbols.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ trait Symbols { this: Context =>
265265
newConstructor(cls, EmptyFlags, Nil, Nil)
266266

267267
/** Create a synthetic lazy implicit value */
268-
def newLazyImplicit(info: Type): TermSymbol =
269-
newSymbol(owner, LazyImplicitName.fresh(), Lazy, info)
268+
def newLazyImplicit(info: Type, coord: Coord): TermSymbol =
269+
newSymbol(owner, LazyImplicitName.fresh(), Lazy, info, coord = coord)
270270

271271
/** Create a symbol representing a selftype declaration for class `cls`. */
272272
def newSelfSym(cls: ClassSymbol, name: TermName = nme.WILDCARD, selfInfo: Type = NoType): TermSymbol =

compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,7 @@ object TastyFormat {
526526
case STATIC => "STATIC"
527527
case OBJECT => "OBJECT"
528528
case TRAIT => "TRAIT"
529+
case ENUM => "ENUM"
529530
case LOCAL => "LOCAL"
530531
case SYNTHETIC => "SYNTHETIC"
531532
case ARTIFACT => "ARTIFACT"

compiler/src/dotty/tools/dotc/typer/Implicits.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ trait Implicits { self: Typer =>
671671
*/
672672
val (formalValue, lazyImplicit, argCtx) = formal match {
673673
case ExprType(fv) =>
674-
val lazyImplicit = ctx.newLazyImplicit(fv)
674+
val lazyImplicit = ctx.newLazyImplicit(fv, pos)
675675
(fv, lazyImplicit, lazyImplicitCtx(lazyImplicit))
676676
case _ => (formal, NoSymbol, ctx)
677677
}

compiler/src/dotty/tools/dotc/typer/Typer.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,6 @@ class Typer extends Namer
12901290
case _ =>
12911291
}
12921292
if (desugaredArg.isType) {
1293-
var res = typed(desugaredArg, argPt)
12941293
arg match {
12951294
case TypeBoundsTree(EmptyTree, EmptyTree)
12961295
if tparam.paramInfo.isLambdaSub &&
@@ -1302,10 +1301,10 @@ class Typer extends Namer
13021301
// type parameter in `C`.
13031302
// The transform does not apply for patterns, where empty bounds translate to
13041303
// wildcard identifiers `_` instead.
1305-
res = res.withType(tparamBounds)
1304+
TypeTree(tparamBounds).withPos(arg.pos)
13061305
case _ =>
1306+
typed(desugaredArg, argPt)
13071307
}
1308-
res
13091308
}
13101309
else desugaredArg.withType(UnspecifiedErrorType)
13111310
}

compiler/test/dotc/pos-test-pickling.blacklist

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ i1812.scala
44
i1867.scala
55
i3067.scala
66
i3149.scala
7-
i3542-1.scala
8-
i3585.scala
97
i3692.scala
10-
i3976.scala
118
i4125.scala
129
implicit-dep.scala
1310
inline-access-levels

0 commit comments

Comments
 (0)