Fix rebase problem

odersky · odersky · commit ae3b12b18949 · 2016-10-10T09:16:26.000+02:00
diff --git a/src/dotty/tools/dotc/typer/Inliner.scala b/src/dotty/tools/dotc/typer/Inliner.scala
@@ -108,7 +108,7 @@ object Inliner {
 
             // Add qualifier type as leading method argument to argument `tp`
             def addQualType(tp: Type): Type = tp match {
-              case tp: PolyType => tp.derivedPolyType(tp.paramNames, tp.paramBounds, addQualType(tp.resultType))
+              case tp: PolyType => tp.derivedGenericType(tp.paramNames, tp.paramBounds, addQualType(tp.resultType))
               case tp: ExprType => addQualType(tp.resultType)
               case tp => MethodType(qualType :: Nil, tp)
             }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ object Inliner {`
`108`	`108`
`109`	`109`	// Add qualifier type as leading method argument to argument `tp`
`110`	`110`	`def addQualType(tp: Type): Type = tp match {`
`111`		`- case tp: PolyType => tp.derivedPolyType(tp.paramNames, tp.paramBounds, addQualType(tp.resultType))`
	`111`	`+ case tp: PolyType => tp.derivedGenericType(tp.paramNames, tp.paramBounds, addQualType(tp.resultType))`
`112`	`112`	`case tp: ExprType => addQualType(tp.resultType)`
`113`	`113`	`case tp => MethodType(qualType :: Nil, tp)`
`114`	`114`	`}`