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

fix incompatibility with ASM 6: don't call getReturnType() on a type which is not a method type (IDEA-158090)

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-07-08 17:09:26 +02:00
parent 3aa1a56cb9
commit 00d651711a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+1 -1
View File
@@ -659,7 +659,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
Type type = typeMapper.mapType(propertyDescriptor.getType()); Type type = typeMapper.mapType(propertyDescriptor.getType());
String fieldName = ((FieldOwnerContext) context.getParentContext()).getFieldName(propertyDescriptor, false); String fieldName = ((FieldOwnerContext) context.getParentContext()).getFieldName(propertyDescriptor, false);
iv.getfield(classAsmType.getInternalName(), fieldName, type.getDescriptor()); iv.getfield(classAsmType.getInternalName(), fieldName, type.getDescriptor());
return type.getReturnType(); return type;
} }
else { else {
//noinspection ConstantConditions //noinspection ConstantConditions