Commit 8adc284

committed

Prevent crash in SAM conversion with mismatched arity

rename test file fix fix test address reviews

1 parent e449935 commit 8adc284Copy full SHA for 8adc284

File tree

+29

-5

lines changed

+29

-5

lines changed

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1687,11 +1687,15 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer`
`1687`	`1687`	`val restpe = mt.resultType match`
`1688`	`1688`	`case mt: MethodType => mt.toFunctionType(isJava = samParent.classSymbol.is(JavaDefined))`
`1689`	`1689`	`case tp => tp`
`1690`		`- (formals,`
`1691`		`- if (mt.isResultDependent)`
`1692`		`- untpd.InLambdaTypeTree(isResult = true, (_, syms) => restpe.substParams(mt, syms.map(_.termRef)))`
`1693`		`- else`
`1694`		`- typeTree(restpe))`
	`1690`	`+ val tree =`
	`1691`	`+ if (mt.isResultDependent) {`
	`1692`	`+ if (formals.length != defaultArity)`
	`1693`	`+ typeTree(WildcardType)`
	`1694`	`+ else`
	`1695`	`+ untpd.InLambdaTypeTree(isResult = true, (_, syms) => restpe.substParams(mt, syms.map(_.termRef)))`
	`1696`	`+ } else`
	`1697`	`+ typeTree(restpe)`
	`1698`	`+ (formals, tree)`
`1695`	`1699`	`case _ =>`
`1696`	`1700`	`(List.tabulate(defaultArity)(alwaysWildcardType), untpd.TypeTree())`
`1697`	`1701`	`}`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,7 @@`
	`1`	`+-- [E007] Type Mismatch Error: tests/neg/i123577.scala:11:4 ------------------------------------------------------------`
	`2`	`+11 \| (msg: String) => ??? // error`
	`3`	`+ \| ^^^^^^^^^^^^^^^^^^^^`
	`4`	`+ \| Found: String => Nothing`
	`5`	`+ \| Required: MillRpcChannel`
	`6`	`+ \|`
	`7`	+ \| longer explanation available when compiling with `-explain`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,13 @@`
	`1`	`+trait MillRpcMessage {`
	`2`	`+ type Response`
	`3`	`+}`
	`4`	`+`
	`5`	`+trait MillRpcChannel {`
	`6`	`+ def apply(requestId: Long, input: MillRpcMessage): input.Response`
	`7`	`+}`
	`8`	`+`
	`9`	`+object MillRpcChannel {`
	`10`	`+ def createChannel: MillRpcChannel = {`
	`11`	`+ (msg: String) => ??? // error`
	`12`	`+ }`
	`13`	`+}`

Comments

(0)