aboutsummaryrefslogtreecommitdiff
path: root/compiler/src/dotty/tools/backend
diff options
context:
space:
mode:
authorodersky <odersky@gmail.com>2016-12-18 15:44:03 +0100
committerGitHub <noreply@github.com>2016-12-18 15:44:03 +0100
commit18b8daa30916b2efaa59638c21198d401a67e46a (patch)
tree09c1a3be43132c89f84605f78429d0094e8749e6 /compiler/src/dotty/tools/backend
parent5df985cc599a0c69029773e3416bbb5fc883476a (diff)
parent1f9990b58c23ba74a8d96166700e755704b78a49 (diff)
downloaddotty-18b8daa30916b2efaa59638c21198d401a67e46a.tar.gz
dotty-18b8daa30916b2efaa59638c21198d401a67e46a.tar.bz2
dotty-18b8daa30916b2efaa59638c21198d401a67e46a.zip
Merge pull request #1817 from dotty-staging/fix-#1802
Fix #1802: Make sure errors are not swept under the carpet
Diffstat (limited to 'compiler/src/dotty/tools/backend')
-rw-r--r--compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala2
-rw-r--r--compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala4
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
index ed32d2df9..123dc3450 100644
--- a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
+++ b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
@@ -1024,7 +1024,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
case JavaArrayType(elem) => elem
case _ =>
ctx.error(s"JavaSeqArray with type ${field.tpe} reached backend: $field", field.pos)
- ErrorType
+ UnspecifiedErrorType
}
def _2: List[Tree] = field.elems
}
diff --git a/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala b/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala
index eb4da5400..89831e56b 100644
--- a/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala
+++ b/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala
@@ -12,7 +12,7 @@ import dotty.tools.dotc.ast.tpd._
import dotty.tools.dotc.core.Names.TermName
import dotty.tools.dotc.core.StdNames
import dotty.tools.dotc.core.StdNames._
-import dotty.tools.dotc.core.Types.{JavaArrayType, ErrorType, Type}
+import dotty.tools.dotc.core.Types.{JavaArrayType, UnspecifiedErrorType, Type}
import scala.collection.{ mutable, immutable }
@@ -73,7 +73,7 @@ class DottyPrimitives(ctx: Context) {
case JavaArrayType(el) => el
case _ =>
ctx.error(s"expected Array $tpe")
- ErrorType
+ UnspecifiedErrorType
}
code match {