From f573b8eb43ba35557c0ee35de045f265fea1b47f Mon Sep 17 00:00:00 2001
From: Miles Sabin <miles@milessabin.com>
Date: Wed, 19 Dec 2018 10:10:55 +0000
Subject: [PATCH 1/2] Tidy up pickling test blacklists

---
 .../test/dotc/pos-test-pickling.blacklist     | 34 -------------------
 .../test/dotc/run-test-pickling.blacklist     |  8 -----
 2 files changed, 42 deletions(-)

diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist
index 5c36a10ec6f1..c7a90433139c 100644
--- a/compiler/test/dotc/pos-test-pickling.blacklist
+++ b/compiler/test/dotc/pos-test-pickling.blacklist
@@ -1,48 +1,14 @@
-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
diff --git a/compiler/test/dotc/run-test-pickling.blacklist b/compiler/test/dotc/run-test-pickling.blacklist
index c9d707d0d73f..d6a6786e9333 100644
--- a/compiler/test/dotc/run-test-pickling.blacklist
+++ b/compiler/test/dotc/run-test-pickling.blacklist
@@ -1,16 +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

From 7c5dbcabd9759823dde2a9dba82d26401f61e6ed Mon Sep 17 00:00:00 2001
From: Miles Sabin <miles@milessabin.com>
Date: Wed, 19 Dec 2018 10:47:18 +0000
Subject: [PATCH 2/2] Position inlined bindings correctly

---
 compiler/src/dotty/tools/dotc/typer/Inliner.scala | 2 +-
 compiler/test/dotc/pos-test-pickling.blacklist    | 2 --
 compiler/test/dotc/run-test-pickling.blacklist    | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala
index e010100bcc75..12e8010995d4 100644
--- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala
@@ -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) = {
diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist
index c7a90433139c..90cd8dbf757e 100644
--- a/compiler/test/dotc/pos-test-pickling.blacklist
+++ b/compiler/test/dotc/pos-test-pickling.blacklist
@@ -1,8 +1,6 @@
 i1812.scala
 i1867.scala
 i3067.scala
-inline-rewrite.scala
-inline-caseclass.scala
 matchtype.scala
 seqtype-cycle
 t247.scala
diff --git a/compiler/test/dotc/run-test-pickling.blacklist b/compiler/test/dotc/run-test-pickling.blacklist
index d6a6786e9333..aa1c42f1a07e 100644
--- a/compiler/test/dotc/run-test-pickling.blacklist
+++ b/compiler/test/dotc/run-test-pickling.blacklist
@@ -5,6 +5,4 @@ t3452g
 t7374
 tuples1.scala
 tuples1a.scala
-implicitMatch.scala
-typeclass-derivation1.scala
 typeclass-derivation2.scala