azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use internal names in multifile class metadata

Browse Source 
To reuse the strings already existing in the constant pool of the class file
This commit is contained in:
Alexander Udalov
2015-10-01 20:59:56 +03:00
parent e1ccb92438
commit bdd69d9e46
6 changed files with 14 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+3 -18
View File
@@ -198,7 +198,8 @@ public class IncrementalCacheImpl(
inlineFunctionsMap.process(kotlinClass)
}
header.isCompatibleMultifileClassKind() -> {
val partNames = getFullNamesOfMultifileClassParts(kotlinClass)
val partNames = kotlinClass.classHeader.filePartClassNames?.toList()
?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}")
multifileClassFacadeMap.add(className, partNames)
// TODO NO_CHANGES? (delegates only, see package facade)
@@ -208,8 +209,7 @@ public class IncrementalCacheImpl(
header.isCompatibleMultifileClassPartKind() -> {
assert(sourceFiles.size() == 1) { "Multifile class part from several source files: $sourceFiles" }
packagePartMap.addPackagePart(className)
val facadeClassName = getInternalNameOfTopLevelClassInTheSamePackage(kotlinClass, header.multifileClassName!!)
multifileClassPartMap.add(className.internalName, facadeClassName)
multifileClassPartMap.add(className.internalName, header.multifileClassName!!)
protoMap.process(kotlinClass, isPackage = true) +
constantsMap.process(kotlinClass) +
@@ -698,21 +698,6 @@ private fun ByteArray.md5(): Long {
)
}
private fun getInternalNameOfTopLevelClassInTheSamePackage(kotlinClass: KotlinJvmBinaryClass, simpleName: String): String {
val classFqName = kotlinClass.classId.packageFqName.child(Name.identifier(simpleName))
return JvmClassName.byFqNameWithoutInnerClasses(classFqName).internalName
}
private fun getFullNamesOfMultifileClassParts(kotlinClass: LocalFileKotlinClass): List<String> {
val classHeader = kotlinClass.classHeader
val partClassNames = classHeader.filePartClassNames ?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}")
val fullNames = arrayListOf<String>()
for (shortName in partClassNames) {
fullNames.add(getInternalNameOfTopLevelClassInTheSamePackage(kotlinClass, shortName))
}
return fullNames
}
private abstract class StringMapExternalizer<T> : DataExternalizer<Map<String, T>> {
override fun save(out: DataOutput, map: Map<String, T>?) {
out.writeInt(map!!.size())