Fix the accessing to static field from Parent through Child

This commit is contained in:
Zalim Bashorov
2015-10-06 23:15:36 +03:00
parent ae2831338b
commit c8f54b3ccb
7 changed files with 67 additions and 5 deletions
@@ -2220,7 +2220,10 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
}
}
propertyDescriptor = DescriptorUtils.unwrapFakeOverride(propertyDescriptor);
if (!isStaticBackingField) {
propertyDescriptor = DescriptorUtils.unwrapFakeOverride(propertyDescriptor);
}
Type backingFieldOwner =
typeMapper.mapOwner(changeOwnerOnTypeMapping ? propertyDescriptor.getContainingDeclaration() : propertyDescriptor);