Merge remote-tracking branch 'origin/master' into incremental

compiler/testData/loadJava/compiledJava/PrivateMembers.txt

@@ -0,0 +1,31 @@
+package test
+
+public open class PrivateMembers : java.lang.Object {
+    private constructor PrivateMembers()
+    private final var field: kotlin.Int
+    private open fun method(): kotlin.Unit
+    private final /*synthesized*/ fun samAdapter(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
+    private open fun samAdapter(/*0*/ p0: test.PrivateMembers.SamInterface?): kotlin.Unit
+
+    private open inner class Inner : java.lang.Object {
+        private constructor Inner()
+    }
+
+    private open class Nested : java.lang.Object {
+        private constructor Nested()
+    }
+
+    private trait SamInterface : java.lang.Object {
+        public abstract fun foo(): kotlin.Unit
+    }
+}
+
+package test.PrivateMembers {
+    private var staticField: kotlin.Int
+    private /*synthesized*/ fun SamInterface(/*0*/ function: () -> kotlin.Unit): test.PrivateMembers.SamInterface
+    private open fun staticMethod(): kotlin.Unit
+
+    package test.PrivateMembers.Nested {
+        private open fun staticMethodInNested(): kotlin.Unit
+    }
+}