Companion public val annotated with @JvmFIeld or const

compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.kt

@@ -32,8 +32,11 @@ public class TraceBasedErrorReporter(private val trace: BindingTrace) : ErrorRep
     companion object {
         private val LOG = Logger.getInstance(TraceBasedErrorReporter::class.java)
 
+        @JvmField
         public val ABI_VERSION_ERRORS: WritableSlice<String, AbiVersionErrorData> = Slices.createCollectiveSlice()
+
         // TODO: MutableList is a workaround for KT-5792 Covariant types in Kotlin translated to wildcard types in Java
+        @JvmField
         public val INCOMPLETE_HIERARCHY: WritableSlice<ClassDescriptor, MutableList<String>> = Slices.createCollectiveSlice()
     }
 

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java

@@ -38,7 +38,7 @@ public class DefaultErrorMessagesJvm implements DefaultErrorMessages.Extension {
             for (JvmDeclarationOrigin origin : data.getSignatureOrigins()) {
                 DeclarationDescriptor descriptor = origin.getDescriptor();
                 if (descriptor != null) {
-                    renderedDescriptors.add(DescriptorRenderer.Companion.getCOMPACT().render(descriptor));
+                    renderedDescriptors.add(DescriptorRenderer.COMPACT.render(descriptor));
                 }
             }
             Collections.sort(renderedDescriptors);