ErrorReporter is now Java-independent

core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/components/RuntimeErrorReporter.kt

@@ -20,6 +20,8 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
+import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.serialization.deserialization.ErrorReporter
 
 public object RuntimeErrorReporter : ErrorReporter {
     // TODO: specialized exceptions
@@ -27,8 +29,8 @@ public object RuntimeErrorReporter : ErrorReporter {
         throw IllegalStateException("Incomplete hierarchy for class ${descriptor.getName()}, unresolved classes $unresolvedSuperClasses")
     }
 
-    override fun reportIncompatibleAbiVersion(kotlinClass: KotlinJvmBinaryClass, actualVersion: Int) {
-        throw IllegalStateException("Incompatible ABI version of ${kotlinClass.getClassId()}: $actualVersion " +
+    override fun reportIncompatibleAbiVersion(classId: ClassId, filePath: String, actualVersion: Int) {
+        throw IllegalStateException("Incompatible ABI version of ${classId}: $actualVersion " +
                                     "(expected version is ${JvmAbi.VERSION})")
     }
 

core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt

@@ -43,7 +43,9 @@ public class ReflectKotlinClass private(
         private val klass: Class<*>,
         private val classHeader: KotlinClassHeader
 ) : KotlinJvmBinaryClass {
+
     default object Factory {
+
         public fun create(klass: Class<*>): ReflectKotlinClass? {
             val headerReader = ReadKotlinClassHeaderAnnotationVisitor()
             ReflectClassStructure.loadClassAnnotations(klass, headerReader)
@@ -51,6 +53,8 @@ public class ReflectKotlinClass private(
         }
     }
 
+    override fun getLocation() = klass.getName().replace('.', '/') + ".class"
+
     override fun getClassId() = klass.classId
 
     override fun getClassHeader() = classHeader