Instantiate type before substituting args when inlining

src/main/scala/leon/purescala/TypeOps.scala

@@ -260,7 +260,7 @@ object TypeOps {
               (LiteralPattern(newOb,lit), (ob zip newOb).toMap)
 
             case _ =>
-              sys.error("woot!?")
+              sys.error(s"woot!? $p:$expType")
           }
 
           (srec(e), cases.map(trCase))//.copiedFrom(m)

src/main/scala/leon/utils/InliningPhase.scala

@@ -40,8 +40,8 @@ object InliningPhase extends TransformationPhase {
     for (fd <- p.definedFunctions) {
       fd.fullBody = simplify(preMap {
         case FunctionInvocation(TypedFunDef(fd, tps), args) if doInline(fd) =>
-          val newBody = replaceFromIDs(fd.params.map(_.id).zip(args).toMap, fd.fullBody)
-          Some(instantiateType(newBody, (fd.tparams zip tps).toMap, Map()))
+          val newBody = instantiateType(fd.fullBody, (fd.tparams zip tps).toMap, Map())
+          Some(replaceFromIDs(fd.params.map(_.id).zip(args).toMap, newBody))
         case _ =>
           None
       }(fd.fullBody))