From 6345d0e6d35233e71307c7226fe65d2295bf9688 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 24 Nov 2015 23:31:12 +0300 Subject: [PATCH] Remove obsolete FallbackPaths --- .../builtins/BuiltInsSerializer.kt | 12 +++-------- .../serialization/SerializedResourcePaths.kt | 21 +++++-------------- .../DeserializedPackageFragment.kt | 5 +---- 3 files changed, 9 insertions(+), 29 deletions(-) diff --git a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt index 606dfcd4f26..7b5e3eca2c3 100644 --- a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt @@ -132,24 +132,18 @@ public class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) { val fragments = packageView.fragments val packageProto = DescriptorSerializer.createTopLevel(extension).packageProto(fragments).build() packageProto.writeTo(packageStream) - write(destDir, BuiltInsSerializedResourcePaths.getPackageFilePath(fqName), packageStream, - BuiltInsSerializedResourcePaths.fallbackPaths.getPackageFilePath(fqName)) + write(destDir, BuiltInsSerializedResourcePaths.getPackageFilePath(fqName), packageStream) val nameStream = ByteArrayOutputStream() extension.stringTable.serializeTo(nameStream) - write(destDir, BuiltInsSerializedResourcePaths.getStringTableFilePath(fqName), nameStream, - BuiltInsSerializedResourcePaths.fallbackPaths.getStringTableFilePath(fqName)) + write(destDir, BuiltInsSerializedResourcePaths.getStringTableFilePath(fqName), nameStream) } - private fun write(destDir: File, fileName: String, stream: ByteArrayOutputStream, legacyFileName: String? = null) { + private fun write(destDir: File, fileName: String, stream: ByteArrayOutputStream) { totalSize += stream.size() totalFiles++ File(destDir, fileName).parentFile.mkdirs() File(destDir, fileName).writeBytes(stream.toByteArray()) - - legacyFileName?.let { fileName -> - File(destDir, fileName).writeBytes(stream.toByteArray()) - } } private fun serializeClass( diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt index 63c4f0d3c4c..dbfa71c21eb 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt @@ -20,23 +20,12 @@ import com.google.protobuf.ExtensionRegistryLite import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName -public abstract class SerializedResourcePaths { - public abstract val extensionRegistry: ExtensionRegistryLite +abstract class SerializedResourcePaths { + abstract val extensionRegistry: ExtensionRegistryLite - public abstract fun getClassMetadataPath(classId: ClassId): String + abstract fun getClassMetadataPath(classId: ClassId): String - public abstract fun getPackageFilePath(fqName: FqName): String + abstract fun getPackageFilePath(fqName: FqName): String - public abstract fun getStringTableFilePath(fqName: FqName): String - - // TODO: remove this after M12 - public object FallbackPaths { - public fun getPackageFilePath(fqName: FqName): String = - fqName.asString().replace('.', '/') + "/.kotlin_package" - - public fun getStringTableFilePath(fqName: FqName): String = - fqName.asString().replace('.', '/') + "/.kotlin_string_table" - } - - public val fallbackPaths: FallbackPaths = FallbackPaths + abstract fun getStringTableFilePath(fqName: FqName): String } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt index cd4ec3c5bb7..95c90f28365 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt @@ -37,10 +37,7 @@ public abstract class DeserializedPackageFragment( private val loadResource: (path: String) -> InputStream? ) : PackageFragmentDescriptorImpl(module, fqName) { - val nameResolver = NameResolverImpl.read( - loadResource(serializedResourcePaths.getStringTableFilePath(fqName)) - ?: loadResourceSure(serializedResourcePaths.fallbackPaths.getStringTableFilePath(fqName)) - ) + val nameResolver = NameResolverImpl.read(loadResourceSure(serializedResourcePaths.getStringTableFilePath(fqName))) protected var components: DeserializationComponents by Delegates.notNull()