Skip to content

Position inlined bindings correctly and tidy up pickling test blacklists #5645

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.

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 2 commits into from
Dec 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/typer/Inliner.scala
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
*/
def newBinding(sym: TermSymbol, rhs: Tree): Unit = {
sym.info = rhs.tpe.widenTermRefExpr
bindingsBuf += ValDef(sym, constToLiteral(rhs))
bindingsBuf += ValDef(sym, constToLiteral(rhs)).withPos(sym.pos)
}

def searchImplicit(sym: TermSymbol, tpt: Tree) = {
Expand Down
36 changes: 0 additions & 36 deletions compiler/test/dotc/pos-test-pickling.blacklist
Original file line number Diff line number Diff line change
@@ -1,48 +1,12 @@
depfuntype.scala
i1753.scala
i1812.scala
i1867.scala
i3067.scala
i3149.scala
i3692.scala
i4125.scala
implicit-dep.scala
inline-access-levels
inline-rewrite.scala
inline-caseclass.scala
macro-with-array
macro-with-type
matchtype.scala
phantom-Eq2
power-macro
quote-lift-inline-params
quote-nested-object
scala2traits
sepComp
seqtype-cycle
t1029
t1942
t247.scala
t2712-5.scala
t2726
t2741
t284-pos.scala
t3249
t3419
t3452f.scala
t3486
t3612.scala
t3864
t3999
t4757
t5013
t5031_3
t5504
t6028
t6976
t7264
t7532b
t8062
typelevel0.scala
typeclass-encoding2.scala
typeclass-encoding3.scala
10 changes: 0 additions & 10 deletions compiler/test/dotc/run-test-pickling.blacklist
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
Course-2002-07.scala
eff-dependent.scala
extension-methods.scala
i5257.scala
lazy-implicit-lists.scala
lazy-implicit-nums.scala
lazy-traits.scala
t3452d
t3452e
t3452g
t7374
t8133
t8133b
tuples1.scala
tuples1a.scala
implicitMatch.scala
typeclass-derivation1.scala
typeclass-derivation2.scala