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

InstructionAdapter.invokeX updated to non-deprecated ones

Browse Source
This commit is contained in:
Mikhael Bogdanov
2017-01-11 17:48:21 +01:00
parent 62514e126d
commit 0f2139f27d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+3 -3
View File
@@ -1086,14 +1086,14 @@ public class FunctionCodegen {
ClassDescriptor parentClass = getSuperClassDescriptor((ClassDescriptor) descriptor.getContainingDeclaration()); ClassDescriptor parentClass = getSuperClassDescriptor((ClassDescriptor) descriptor.getContainingDeclaration());
assert parentClass != null; assert parentClass != null;
String parentInternalName = typeMapper.mapClass(parentClass).getInternalName(); String parentInternalName = typeMapper.mapClass(parentClass).getInternalName();
iv.invokespecial(parentInternalName, delegateTo.getName(), delegateTo.getDescriptor()); iv.invokespecial(parentInternalName, delegateTo.getName(), delegateTo.getDescriptor(), false);
} }
else { else {
if (isJvm8InterfaceMember(descriptor, state)) { if (isJvm8InterfaceMember(descriptor, state)) {
iv.invokeinterface(v.getThisName(), delegateTo.getName(), delegateTo.getDescriptor()); iv.invokeinterface(v.getThisName(), delegateTo.getName(), delegateTo.getDescriptor());
} }
else { else {
iv.invokevirtual(v.getThisName(), delegateTo.getName(), delegateTo.getDescriptor()); iv.invokevirtual(v.getThisName(), delegateTo.getName(), delegateTo.getDescriptor(), false);
} }
} }
@@ -1222,7 +1222,7 @@ public class FunctionCodegen {
iv.invokeinterface(internalName, delegateToMethod.getName(), delegateToMethod.getDescriptor()); iv.invokeinterface(internalName, delegateToMethod.getName(), delegateToMethod.getDescriptor());
} }
else { else {
iv.invokevirtual(internalName, delegateToMethod.getName(), delegateToMethod.getDescriptor()); iv.invokevirtual(internalName, delegateToMethod.getName(), delegateToMethod.getDescriptor(), false);
} }
StackValue stackValue = AsmUtil.genNotNullAssertions( StackValue stackValue = AsmUtil.genNotNullAssertions(