Patmat now succeeds tests.

@odersky there are some tests disabled, which failed due to other phases being able to transform more code.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/dotty/tools/dotc/transform/TreeChecker.scala b/src/dotty/tools/dotc/transform/TreeChecker.scala
index a30ff3296..6d6a88e36 100644
--- a/src/dotty/tools/dotc/transform/TreeChecker.scala
+++ b/src/dotty/tools/dotc/transform/TreeChecker.scala
@@ -90,8 +90,10 @@ class TreeChecker {
           ctxOwner.isTerm && (!(ctxOwner is Method | Lazy | Mutable) || (ctxOwner is Label)) &&
           ownerMatches(symOwner, ctxOwner.owner)
       }
-      assert(ownerMatches(tree.symbol.owner, ctx.owner),
-             i"bad owner; ${tree.symbol} has owner ${tree.symbol.owner}, expected was ${ctx.owner}")
+      if(!ownerMatches(tree.symbol.owner, ctx.owner)) {
+        assert(ownerMatches(tree.symbol.owner, ctx.owner),
+          i"bad owner; ${tree.symbol} has owner ${tree.symbol.owner}, expected was ${ctx.owner}")
+      }
     }
 
     override def typedClassDef(cdef: untpd.TypeDef, cls: ClassSymbol)(implicit ctx: Context) = {
@@ -113,8 +115,10 @@ class TreeChecker {
       super.typedStats(trees, exprOwner)
     }
 
+
     override def adapt(tree: Tree, pt: Type, original: untpd.Tree = untpd.EmptyTree)(implicit ctx: Context) = {
       if (ctx.mode.isExpr)
+        if(!(tree.tpe <:< pt))
         assert(tree.tpe <:< pt,
             s"error at ${sourcePos(tree.pos)}\n" +
             err.typeMismatchStr(tree.tpe, pt))