Skip to content

Various fixes to reduce the size of the pickling blackliist #5515

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
merged 3 commits into from
Nov 25, 2018
Merged

Various fixes to reduce the size of the pickling blackliist #5515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d668ebc
Add position to synthetic lazy implicit symbols
smarter Nov 24, 2018
8ac046d
Fix Tasty printing for ENUM
smarter Nov 24, 2018
334dffd
Properly type bounds of wildcards in hk positions
smarter Nov 24, 2018
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
4 changes: 2 additions & 2 deletions compiler/src/dotty/tools/dotc/core/Symbols.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ trait Symbols { this: Context =>
newConstructor(cls, EmptyFlags, Nil, Nil)

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

/** Create a symbol representing a selftype declaration for class `cls`. */
def newSelfSym(cls: ClassSymbol, name: TermName = nme.WILDCARD, selfInfo: Type = NoType): TermSymbol =
Expand Down
1 change: 1 addition & 0 deletions compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@ object TastyFormat {
case STATIC => "STATIC"
case OBJECT => "OBJECT"
case TRAIT => "TRAIT"
case ENUM => "ENUM"
case LOCAL => "LOCAL"
case SYNTHETIC => "SYNTHETIC"
case ARTIFACT => "ARTIFACT"
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/typer/Implicits.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ trait Implicits { self: Typer =>
*/
val (formalValue, lazyImplicit, argCtx) = formal match {
case ExprType(fv) =>
val lazyImplicit = ctx.newLazyImplicit(fv)
val lazyImplicit = ctx.newLazyImplicit(fv, pos)
(fv, lazyImplicit, lazyImplicitCtx(lazyImplicit))
case _ => (formal, NoSymbol, ctx)
}
Expand Down
5 changes: 2 additions & 3 deletions compiler/src/dotty/tools/dotc/typer/Typer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,6 @@ class Typer extends Namer
case _ =>
}
if (desugaredArg.isType) {
var res = typed(desugaredArg, argPt)
arg match {
case TypeBoundsTree(EmptyTree, EmptyTree)
if tparam.paramInfo.isLambdaSub &&
Expand All @@ -1302,10 +1301,10 @@ class Typer extends Namer
// type parameter in `C`.
// The transform does not apply for patterns, where empty bounds translate to
// wildcard identifiers `_` instead.
res = res.withType(tparamBounds)
TypeTree(tparamBounds).withPos(arg.pos)
case _ =>
typed(desugaredArg, argPt)
}
res
}
else desugaredArg.withType(UnspecifiedErrorType)
}
Expand Down
3 changes: 0 additions & 3 deletions compiler/test/dotc/pos-test-pickling.blacklist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ i1812.scala
i1867.scala
i3067.scala
i3149.scala
i3542-1.scala
i3585.scala
i3692.scala
i3976.scala
i4125.scala
implicit-dep.scala
inline-access-levels
Expand Down