added tests for bug650, bug651

4 files changed, 23 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/Flatten.scala b/src/compiler/scala/tools/nsc/transform/Flatten.scala
index f3aaadca45..38fb1d0493 100644
--- a/src/compiler/scala/tools/nsc/transform/Flatten.scala
+++ b/src/compiler/scala/tools/nsc/transform/Flatten.scala
@@ -97,7 +97,6 @@ abstract class Flatten extends InfoTransform {
         case _ =>
           tree
       }
-      assert(tree1.tpe != null, tree1)// debug
       tree1 setType flattened(tree1.tpe)
     }
 
diff --git a/test/files/neg/bug650.check b/test/files/neg/bug650.check
new file mode 100644
index 0000000000..3f491f7a21
--- /dev/null
+++ b/test/files/neg/bug650.check
@@ -0,0 +1,4 @@
+bug650.scala:4 error: missing type arguments
+trait Test2 extends LinkedList;
+                    ^
+one error found
diff --git a/test/files/neg/bug650.scala b/test/files/neg/bug650.scala
new file mode 100644
index 0000000000..cdb4b3da47
--- /dev/null
+++ b/test/files/neg/bug650.scala
@@ -0,0 +1,4 @@
+// test/Test2.scala
+package test;
+import scala.collection.mutable._;
+trait Test2 extends LinkedList;
diff --git a/test/files/pos/bug651.scala b/test/files/pos/bug651.scala
new file mode 100644
index 0000000000..c146446af9
--- /dev/null
+++ b/test/files/pos/bug651.scala
@@ -0,0 +1,15 @@
+package test;
+
+trait Test3 {
+  trait MatchableImpl {
+    trait MatchImpl;
+  }
+
+  trait BracePairImpl {
+    trait BraceImpl extends MatchableImpl {
+      private object MyMatch1 extends MatchImpl;
+      protected def match0 : MatchImpl = MyMatch1;
+
+    }
+  }
+}