Skip to content

Fix byte code generation for by-name parameters #14310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2022
Merged

Fix byte code generation for by-name parameters #14310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,8 @@ object GenericSignatures {
foldOver(tp.typeParams.nonEmpty, parents)
case AnnotatedType(tpe, _) =>
foldOver(x, tpe)
case ExprType(tpe) =>
true
case tp =>
foldOver(x, tp)
}
Expand Down
18 changes: 17 additions & 1 deletion compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,22 @@ class TestBCode extends DottyBytecodeTest {
}
}

@Test def byNameParameters = {
val source = """
|class Foo {
| def byNameParam(str: => String): Unit = {}
|}
""".stripMargin

checkBCode(source) { dir =>
val clsIn = dir.lookupName("Foo.class", directory = false).input
val clsNode = loadClassNode(clsIn)
val methodNode: MethodNode = getMethod(clsNode, "byNameParam")

assert(methodNode.signature == "(Lscala/Function0<Ljava/lang/String;>;)V")
}
}

/** This test verifies that simple matches are transformed if possible
* despite no annotation
*/
Expand Down Expand Up @@ -957,7 +973,7 @@ class TestBCode extends DottyBytecodeTest {

@Test
def invocationReceivers(): Unit = {
import Opcodes._
import Opcodes.*

checkBCode(List(invocationReceiversTestCode.definitions("Object"))) { dir =>
val c1 = loadClassNode(dir.lookupName("C1.class", directory = false).input)
Expand Down