From 00d651711a759d87130b8c2a7dc92975e1b746da Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 8 Jul 2016 17:09:26 +0200
Subject: [PATCH] fix incompatibility with ASM 6: don't call getReturnType() on
 a type which is not a method type (IDEA-158090)

---
 .../org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index 4072dce44f3..9011f07e1db 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -659,7 +659,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
                 Type type = typeMapper.mapType(propertyDescriptor.getType());
                 String fieldName = ((FieldOwnerContext) context.getParentContext()).getFieldName(propertyDescriptor, false);
                 iv.getfield(classAsmType.getInternalName(), fieldName, type.getDescriptor());
-                return type.getReturnType();
+                return type;
             }
             else {
                 //noinspection ConstantConditions