From 0aaf0ba60f3679c1a1588fa84e055ad39d27ea0d Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 22 Mar 2016 20:21:48 +0300
Subject: [PATCH] Take into account field kotlin visibility

---
 .../main/kotlin/org.jetbrains.kotlin.tools/PublicApiDump.kt   | 2 +-
 .../src/main/kotlin/org.jetbrains.kotlin.tools/asmUtils.kt    | 4 ++++
 .../src/test/resources/output/cases/special.txt               | 1 -
 .../src/test/resources/output/kotlin-stdlib.txt               | 2 --
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools/PublicApiDump.kt b/libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools/PublicApiDump.kt
index 1949228aa10..448b4b93df4 100644
--- a/libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools/PublicApiDump.kt
+++ b/libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools/PublicApiDump.kt
@@ -47,7 +47,7 @@ fun getBinaryAPI(classStreams: Sequence<InputStream>, visibilityMap: Map<String,
             val modifiers = getModifierString(effectiveAccess and Opcodes.ACC_STATIC.inv())
 
             val memberSignatures =
-                    fields.filter { it.isPublic() }
+                    fields.filter { it.isEffectivelyPublic(classVisibility) }
                             .sortedBy { it.name }
                             .map { with(it) { MemberBinarySignature(name, "${getModifierString(access)} field $name $desc", isStatic(access) ) } } +
                     methods.filter { it.isEffectivelyPublic(classVisibility) }
diff --git a/libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools/asmUtils.kt b/libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools/asmUtils.kt
index 04e97e1310e..e583f6b048d 100644
--- a/libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools/asmUtils.kt
+++ b/libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools/asmUtils.kt
@@ -46,6 +46,10 @@ fun MethodNode.isEffectivelyPublic(classVisibility: ClassVisibility?) =
                 && (classVisibility?.members?.get(MemberSignature(name, desc))?.isPublic() ?: true)
                 && !isAccessMethod()
 
+fun FieldNode.isEffectivelyPublic(classVisibility: ClassVisibility?) =
+        isPublic()
+                && (classVisibility?.members?.get(MemberSignature(name, desc))?.isPublic() ?: true)
+// TODO: lateinit exposed field
 
 
 fun ClassNode.isLocal() = innerClasses.filter { it.name == name && it.innerName == null && it.outerName == null }.count() == 1
diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/special.txt b/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/special.txt
index 02a5160cf68..3284b4c65a3 100644
--- a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/special.txt
+++ b/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/special.txt
@@ -1,5 +1,4 @@
 public final class cases/special/ClassWithLateInitMembers
-public field internalLateInit Ljava/lang/String;
 public field publicLateInitWithInternalSet Ljava/lang/String;
 public final fun getPublicLateInitWithInternalSet ()Ljava/lang/String;
 ------------------
diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/kotlin-stdlib.txt b/libraries/tools/binary-compatibility-validator/src/test/resources/output/kotlin-stdlib.txt
index 64906ed3bb4..c572d68d39e 100644
--- a/libraries/tools/binary-compatibility-validator/src/test/resources/output/kotlin-stdlib.txt
+++ b/libraries/tools/binary-compatibility-validator/src/test/resources/output/kotlin-stdlib.txt
@@ -1589,9 +1589,7 @@ public static final fun readLine ()Ljava/lang/String;
 ------------------
 
 public final class kotlin/io/ConstantsKt
-public static final field DEFAULT_BLOCK_SIZE I
 public static final field DEFAULT_BUFFER_SIZE I
-public static final field MINIMUM_BLOCK_SIZE I
 ------------------
 
 public final class kotlin/io/FileAlreadyExistsException: kotlin/io/FileSystemException