Fix calling toString() on ProtoContainer

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt

@@ -92,7 +92,7 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C
     ): List<A> {
         val kotlinClass = findClassWithAnnotationsAndInitializers(container, proto, nameResolver, kind)
         if (kotlinClass == null) {
-            errorReporter.reportLoadingError("Kotlin class for loading member annotations is not found: $container", null)
+            errorReporter.reportLoadingError("Kotlin class for loading member annotations is not found: ${container.getFqName(nameResolver)}", null)
             return listOf()
         }
 
@@ -127,7 +127,7 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C
 
         val kotlinClass = findClassWithAnnotationsAndInitializers(container, proto, nameResolver, kind)
         if (kotlinClass == null) {
-            errorReporter.reportLoadingError("Kotlin class for loading property constant is not found: $container", null)
+            errorReporter.reportLoadingError("Kotlin class for loading property constant is not found: ${container.getFqName(nameResolver)}", null)
             return null
         }
 

core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ProtoContainer.kt

@@ -18,9 +18,18 @@ package org.jetbrains.jet.descriptors.serialization.descriptors
 
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe
 
 public data class ProtoContainer(val classProto: ProtoBuf.Class?, val packageFqName: FqName?) {
     {
         assert(classProto != null || packageFqName != null)
+        assert(classProto == null || packageFqName == null)
+    }
+
+    fun getFqName(nameResolver: NameResolver): FqNameUnsafe {
+        if (packageFqName != null) return packageFqName.toUnsafe()
+
+        return nameResolver.getClassId(classProto!!.getFqName()).asSingleFqName()
     }
 }