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

Remove NameResolver#getFqName, replace with getClassId

Browse Source 
Original commit: 89fe54c951
This commit is contained in:
Alexander Udalov
2015-09-19 15:59:45 +03:00
parent 7e24eb8d91
commit 1e2cb13c07
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
+1 -4
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.jps.incremental package org.jetbrains.kotlin.jps.incremental
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
@@ -33,10 +32,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
public val oldClassIdIndexesMap: MutableMap<Int, Int> = hashMapOf() public val oldClassIdIndexesMap: MutableMap<Int, Int> = hashMapOf()
public val newClassIdIndexesMap: MutableMap<Int, Int> = hashMapOf() public val newClassIdIndexesMap: MutableMap<Int, Int> = hashMapOf()
private val fqNames = Interner<FqName>()
private val classIds = Interner<ClassId>() private val classIds = Interner<ClassId>()
open fun checkEquals(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { open fun checkEquals(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean {
if (!checkEqualsPackageMember(old, new)) return false if (!checkEqualsPackageMember(old, new)) return false
@@ -556,7 +553,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
public fun getIndexOfClassId(index: Int, map: MutableMap<Int, Int>, nameResolver: NameResolver): Int { public fun getIndexOfClassId(index: Int, map: MutableMap<Int, Int>, nameResolver: NameResolver): Int {
map[index]?.let { return it } map[index]?.let { return it }
val result = fqNames.intern(nameResolver.getFqName(index)) val result = classIds.intern(nameResolver.getClassId(index))
map[index] = result map[index] = result
return result return result
} }