KT-1717 Don't make member visibility inherit when it is not declared explicitly

#KT-1717 Fixed
2012-04-03 19:12:29 +04:00
parent 5df7258708
commit 9b2eeb076e
45 changed files with 115 additions and 159 deletions
@@ -251,12 +251,12 @@ public abstract class CodegenContext {
            PropertyDescriptor myAccessor = new PropertyDescriptor(contextType,
                    Collections.<AnnotationDescriptor>emptyList(),
                    pd.getModality(),
+                    pd.getVisibility(),
                    pd.isVar(),
                    pd.isObjectDeclaration(),
                    pd.getName()  + "$bridge$" + accessors.size(),
                    CallableMemberDescriptor.Kind.DECLARATION
            );
-            myAccessor.setVisibility(pd.getVisibility());
            JetType receiverType = pd.getReceiverParameter().exists() ? pd.getReceiverParameter().getType() : null;
            myAccessor.setType(pd.getType(), Collections.<TypeParameterDescriptor>emptyList(), pd.getExpectedThisObject(), receiverType);