Fixing conflicts between scala#361 and scala#394

Author: DarkDimius

src/dotty/tools/dotc/typer/TypeAssigner.scala

@@ -89,7 +89,7 @@ trait TypeAssigner {
           else tp1
         case tp: TypeVar if ctx.typerState.constraint.contains(tp) =>
           val lo = ctx.typerState.constraint.fullLowerBound(tp.origin)
-          val lo1 = avoid(lo, syms)
+          val lo1 = avoid(lo, symsToAvoid)
           if (lo1 ne lo) lo1 else tp
         case _ =>
           mapOver(tp)

test/dotc/tests.scala

@@ -27,7 +27,6 @@ class tests extends CompilerTest {
   val failedOther = List("-Ystop-before:collectEntryPoints") // some non-obvious reason. need to look deeper
   val twice = List("#runs", "2", "-YnoDoubleBindings")
   val staleSymbolError: List[String] = List()
-  val testPickling = List("-Ytest-pickler", "-Ystop-after:pickler")
 
   val allowDeepSubtypes = defaultOptions diff List("-Yno-deep-subtypes")