Merge branch 'develop-virt-2.11.2' into develop

Author: TiarkRompf

src/common/Structs.scala

@@ -31,7 +31,7 @@ trait StructTags {
   case class ClassTag[T](name: String) extends StructTag[T]
   case class NestClassTag[C[_],T](elem: StructTag[T]) extends StructTag[C[T]]
   case class AnonTag[T](fields: RefinedManifest[T]) extends StructTag[T]
-  case class MapTag[T] extends StructTag[T]
+  case class MapTag[T]() extends StructTag[T]
 }
 
 trait StructExp extends StructOps with StructTags with BaseExp with EffectExp with VariablesExp with ObjectOpsExp with StringOpsExp with OverloadHack {

test-out/epfl/test14-queries3.check

@@ -61,7 +61,7 @@ x2551
   End of Generated Code                  
 *******************************************/
 
-warning: there were 9 feature warning(s); re-run with -feature for details
+warning: there were 9 feature warnings; re-run with -feature for details
 one warning found
 compilation: ok
 expertise("abstract"):

test-out/epfl/test14-queries4.check

@@ -61,7 +61,7 @@ x2551
   End of Generated Code                  
 *******************************************/
 
-warning: there were 9 feature warning(s); re-run with -feature for details
+warning: there were 9 feature warnings; re-run with -feature for details
 one warning found
 compilation: ok
 expertise2("abstract"):

test-src/epfl/test12-collections/TestList.scala

@@ -22,7 +22,7 @@ class TestList extends FileDiffSuite {
       xs ++ List(unit(1), unit(2), unit(3))
 
     def emptyLeft(xs: Rep[List[Int]]): Rep[List[Int]] =
-      List() ++ xs
+      List[Int]() ++ xs // VIRT 2.11: need type annotation
 
     def emptyRight(xs: Rep[List[Int]]): Rep[List[Int]] =
       xs ++ List()

test-src/epfl/test14-scratch/TestQueries.scala

@@ -799,7 +799,8 @@ trait StagedExp extends Staged with ScalaOpsPkgExp with BooleanOpsExpOpt with St
 */
     case (Empty(),Empty())       => List()
     case (IfThen(c,a),Empty())   => if (cond && c) a else List()
-    case (For(l,f),Empty())      => for (x <- l if cond; y <- f(x)) yield y
+    case (For(l,f),Empty())      => implicit def unsafe[T] = manifest[Any].asInstanceOf[Manifest[T]] // FIXME: get manifest (for result type) from somewhere else
+                                    for (x <- l if cond; y <- f(x)) yield y
     case (Concat(a,b),Empty())   => (if (cond) a else List()) ++ (if (cond) b else List())
     case _                       => super.ifThenElse(cond,thenp,elsep)
   }).asInstanceOf[Exp[T]]