Merge pull request #3514 from dotty-staging/fix-build

smarter · web-flow · commit cc43c3444da8 · 2017-11-20T19:11:17.000+01:00
Fix build failure after last merge
diff --git a/compiler/src/dotty/tools/dotc/core/Symbols.scala b/compiler/src/dotty/tools/dotc/core/Symbols.scala
@@ -615,7 +615,7 @@ object Symbols {
         assert(myTree.isEmpty)
         val body = unpickler.body(ctx.addMode(Mode.ReadPositions))
         myTree = body.headOption.getOrElse(tpd.EmptyTree)
-        if (!ctx.settings.tasty.value)
+        if (!ctx.settings.fromTasty.value)
           unpickler = null
       }
       myTree

Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@ object Symbols {`
`615`	`615`	`assert(myTree.isEmpty)`
`616`	`616`	`val body = unpickler.body(ctx.addMode(Mode.ReadPositions))`
`617`	`617`	`myTree = body.headOption.getOrElse(tpd.EmptyTree)`
`618`		`- if (!ctx.settings.tasty.value)`
	`618`	`+ if (!ctx.settings.fromTasty.value)`
`619`	`619`	`unpickler = null`
`620`	`620`	`}`
`621`	`621`	`myTree`