Generate field for const-val with same visibility as desciptor

Also add test checking that constant static final fields generated for them
This commit is contained in:
Denis Zharkov
2015-09-21 20:16:32 +03:00
parent ba6671edb4
commit d937a7cefc
8 changed files with 112 additions and 2 deletions
@@ -365,6 +365,8 @@ public class AsmUtil {
}
}
if (memberDescriptor instanceof PropertyDescriptor && ((PropertyDescriptor) memberDescriptor).isConst()) return null;
if (containingDeclaration instanceof PackageFragmentDescriptor) {
return ACC_PUBLIC;
}
@@ -300,10 +300,11 @@ public class PropertyCodegen {
boolean hasPublicFieldAnnotation = AnnotationsPackage.findPublicFieldAnnotation(propertyDescriptor) != null;
FieldOwnerContext backingFieldContext = context;
boolean takeVisibilityFromDescriptor = propertyDescriptor.isLateInit() || propertyDescriptor.isConst();
if (AsmUtil.isInstancePropertyWithStaticBackingField(propertyDescriptor) ) {
modifiers |= ACC_STATIC;
if (propertyDescriptor.isLateInit()) {
if (takeVisibilityFromDescriptor) {
modifiers |= getVisibilityAccessFlag(propertyDescriptor);
}
else if (hasPublicFieldAnnotation && !isDelegate) {
@@ -320,7 +321,7 @@ public class PropertyCodegen {
v.getSerializationBindings().put(STATIC_FIELD_IN_OUTER_CLASS, propertyDescriptor);
}
}
else if (propertyDescriptor.isLateInit()) {
else if (takeVisibilityFromDescriptor) {
modifiers |= getVisibilityAccessFlag(propertyDescriptor);
}
else if (!isDelegate && hasPublicFieldAnnotation) {