fix merge

TiarkRompf · Dec 17, 2016 · 16b0ead · 16b0ead
1 parent f9da84b
commit 16b0ead
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/src/internal/Expressions.scala b/src/internal/Expressions.scala
@@ -96,8 +96,8 @@ trait Expressions extends Utils {
     case _ => None
   }
 
-  def infix_defines[A: Manifest](stm: Stm, rhs: Def[A]): Option[Sym[A]] = stm match {
-    case TP(sym: Sym[A], `rhs`) if sym.tp <:< manifest[A] => Some(sym)
+  def infix_defines[A: Typ](stm: Stm, rhs: Def[A]): Option[Sym[A]] = stm match {
+    case TP(sym: Sym[A], `rhs`) if sym.tp <:< typ[A] => Some(sym)
     case _ => None
   }
 
@@ -139,7 +139,7 @@ trait Expressions extends Utils {
     globalDefsCache.get(s)
     //globalDefs.find(x => x.defines(s).nonEmpty)
 
-  def findDefinition[T: Manifest](d: Def[T]): Option[Stm] =
+  def findDefinition[T: Typ](d: Def[T]): Option[Stm] =
     globalDefs.find(x => x.defines(d).nonEmpty)
 
   def findOrCreateDefinition[T:Typ](d: Def[T], pos: List[SourceContext]): Stm =

diff --git a/src/internal/FatExpressions.scala b/src/internal/FatExpressions.scala
@@ -24,11 +24,11 @@ trait FatExpressions extends Expressions {
     case _ => super.infix_defines(stm, sym)
   }
 
-  override def infix_defines[A: Manifest](stm: Stm, rhs: Def[A]): Option[Sym[A]] = stm match {
+  override def infix_defines[A: Typ](stm: Stm, rhs: Def[A]): Option[Sym[A]] = stm match {
     case TTP(lhs, mhs, rhs) => mhs.indexOf(rhs) match {
       case idx if idx >= 0 =>
         val sym = lhs(idx)
-        if (sym.tp <:< manifest[A])
+        if (sym.tp <:< typ[A])
           Some(sym.asInstanceOf[Sym[A]])
         else
           None

diff --git a/test-out/epfl/test9-struct3.check b/test-out/epfl/test9-struct3.check
@@ -3,7 +3,6 @@ partitions: List(TTP(List(Sym(4), Sym(5), Sym(13)),List(SimpleLoop(Const(100),Sy
 considering TP(Sym(9),ArrayIndex(Sym(5),Sym(7)))
 replace TP(Sym(9),ArrayIndex(Sym(5),Sym(7))) at 1 within TTP(List(Sym(4), Sym(5), Sym(13)),List(SimpleLoop(Const(100),Sym(1),ArrayElem(Block(Sym(1)))), SimpleLoop(Const(100),Sym(1),ArrayElem(Block(Sym(2)))), SimpleLoop(Const(100),Sym(7),ArrayElem(Block(Sym(11))))),SimpleFatLoop(Const(100),Sym(1),List(ArrayElem(Block(Sym(1))), ArrayElem(Block(Sym(2))), ArrayElem(Block(Sym(11))))))
 warning: mirroring of Sym(11)=DoubleMinus(Const(0.0),Sym(9)) type Double returned Sym(1) type Int (not a subtype)
-warning: mirroring of Sym(13)=SimpleLoop(Const(100),Sym(7),ArrayElem(Block(Sym(11)))) type Array[Double] returned Sym(4)=SimpleLoop(Const(100),Sym(1),ArrayElem(Block(Sym(1)))) type Array[Int] (not a subtype)
 try once more ...
 wtableneg: List()
 partitions: List(TTP(List(Sym(4), Sym(17)),List(SimpleLoop(Const(100),Sym(1),ArrayElem(Block(Sym(1)))), SimpleLoop(Const(100),Sym(1),ArrayElem(Block(Sym(1))))),SimpleFatLoop(Const(100),Sym(1),List(ArrayElem(Block(Sym(1))), ArrayElem(Block(Sym(1)))))))

diff --git a/test-src/epfl/test1-arith/Arrays.scala b/test-src/epfl/test1-arith/Arrays.scala
@@ -24,7 +24,7 @@ trait ArraysExp extends Arrays with BaseExp {
 
   case class ArrayApply[T:Typ](x:Rep[Array[T]], i:Int) extends Def[T]
   //case class ArrayUpdate[T](x:Rep[Array[T]], i:Int) extends Def[T]
-  case class MakeArray[T](x:List[Rep[T]])(implicit val m: Manifest[T]) extends Def[Array[T]]
+  case class MakeArray[T](x:List[Rep[T]])(implicit val m: Typ[T]) extends Def[Array[T]]
 
   def arrayApply[T:Typ](x: Rep[Array[T]], i:Int) = ArrayApply(x, i)
   //def arrayUpdate(x: Rep[Double]) = ArrayUpdate(x)

diff --git a/test-src/epfl/test2-fft/DisableOpts.scala b/test-src/epfl/test2-fft/DisableOpts.scala
@@ -5,7 +5,7 @@ package test2
 import internal._
 
 trait DisableCSE extends Expressions {
-  override def findDefinition[T: Manifest](d: Def[T]) = None
+  override def findDefinition[T: Typ](d: Def[T]) = None
 }
 
 

diff --git a/test-src/epfl/test3-parsers/Parsers.scala b/test-src/epfl/test3-parsers/Parsers.scala
@@ -7,7 +7,7 @@ trait Parsers { this: Matching with Extractors =>
   type Elem
   type Input = List[Elem]
   // Don't declare as implicit val in children, it gives problems with initialization order!
-  implicit val mE: Manifest[Elem]
+  implicit val mE: Typ[Elem]
 
   abstract class Parser {
     def apply(in: Rep[Input]): Rep[ParseResult]