azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support interface delegation to inline class values (KT-27318)

Browse Source
This commit is contained in:
Dmitry Petrov
2018-10-01 14:15:44 +03:00
parent 5480bf69e8
commit 6fa436911a
7 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+4 -1
View File
@@ -1582,10 +1582,13 @@ public class FunctionCodegen {
reg += argTypes[i].getSize();
}
String internalName = typeMapper.mapType(toClass).getInternalName();
String internalName = typeMapper.mapClass(toClass).getInternalName();
if (toClass.getKind() == ClassKind.INTERFACE) {
iv.invokeinterface(internalName, delegateToMethod.getName(), delegateToMethod.getDescriptor());
}
else if (toClass.isInline()) {
iv.invokestatic(internalName, delegateToMethod.getName(), delegateToMethod.getDescriptor(), false);
}
else {
iv.invokevirtual(internalName, delegateToMethod.getName(), delegateToMethod.getDescriptor(), false);
}