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

[FIR] Replace Path with String in KotlinJvmBinaryClass.containingLibrary

Browse Source 
This is needed because :core:deserialization.common.jvm uses JDK 6
This commit is contained in:
Dmitriy Novozhilov
2021-04-30 17:44:54 +03:00
committed by TeamCityServer
parent 2abed7161b
commit 28be3a0dbc
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt
+8 -2
View File
@@ -31,6 +31,8 @@ import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData
import java.nio.file.Path
import java.nio.file.Paths
@ThreadSafeMutableState @ThreadSafeMutableState
class KotlinDeserializedJvmSymbolsProvider( class KotlinDeserializedJvmSymbolsProvider(
@@ -56,7 +58,7 @@ class KotlinDeserializedJvmSymbolsProvider(
val facadeFqName = facadeName?.let { JvmClassName.byInternalName(it).fqNameForTopLevelClassMaybeWithDollars } val facadeFqName = facadeName?.let { JvmClassName.byInternalName(it).fqNameForTopLevelClassMaybeWithDollars }
val facadeBinaryClass = facadeFqName?.let { kotlinClassFinder.findKotlinClass(ClassId.topLevel(it)) } val facadeBinaryClass = facadeFqName?.let { kotlinClassFinder.findKotlinClass(ClassId.topLevel(it)) }
val moduleData = moduleDataProvider.getModuleData(kotlinJvmBinaryClass.containingLibrary) ?: return@mapNotNull null val moduleData = moduleDataProvider.getModuleData(kotlinJvmBinaryClass.containingLibrary.toPath()) ?: return@mapNotNull null
val header = kotlinJvmBinaryClass.classHeader val header = kotlinJvmBinaryClass.classHeader
val data = header.data ?: header.incompatibleData ?: return@mapNotNull null val data = header.data ?: header.incompatibleData ?: return@mapNotNull null
@@ -115,7 +117,7 @@ class KotlinDeserializedJvmSymbolsProvider(
nameResolver, nameResolver,
classProto, classProto,
JvmBinaryAnnotationDeserializer(session, kotlinClass.kotlinJvmBinaryClass, kotlinClassFinder, kotlinClass.byteContent), JvmBinaryAnnotationDeserializer(session, kotlinClass.kotlinJvmBinaryClass, kotlinClassFinder, kotlinClass.byteContent),
kotlinClass.kotlinJvmBinaryClass.containingLibrary, kotlinClass.kotlinJvmBinaryClass.containingLibrary.toPath(),
KotlinJvmBinarySourceElement(kotlinClass.kotlinJvmBinaryClass), KotlinJvmBinarySourceElement(kotlinClass.kotlinJvmBinaryClass),
classPostProcessor = { loadAnnotationsFromClassFile(kotlinClass, it) } classPostProcessor = { loadAnnotationsFromClassFile(kotlinClass, it) }
) )
@@ -165,4 +167,8 @@ class KotlinDeserializedJvmSymbolsProvider(
return classId.relativeClassName.topLevelName() !in knownNames return classId.relativeClassName.topLevelName() !in knownNames
} }
} }
private fun String?.toPath(): Path? {
return this?.let { Paths.get(it) }
}
} }
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt
+2 -4
View File
@@ -26,8 +26,6 @@ import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.util.PerformanceCounter import org.jetbrains.kotlin.util.PerformanceCounter
import java.io.FileNotFoundException import java.io.FileNotFoundException
import java.io.IOException import java.io.IOException
import java.nio.file.Path
import java.nio.file.Paths
class VirtualFileKotlinClass private constructor( class VirtualFileKotlinClass private constructor(
val file: VirtualFile, val file: VirtualFile,
@@ -40,8 +38,8 @@ class VirtualFileKotlinClass private constructor(
override val location: String override val location: String
get() = file.path get() = file.path
override val containingLibrary: Path? override val containingLibrary: String?
get() = file.path.split("!/").firstOrNull()?.let { Paths.get(it) } get() = file.path.split("!/").firstOrNull()
override fun getFileContents(): ByteArray { override fun getFileContents(): ByteArray {
try { try {
core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt
+1 -2
View File
@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.constants.ClassLiteralValue import org.jetbrains.kotlin.resolve.constants.ClassLiteralValue
import java.nio.file.Path
interface KotlinJvmBinaryClass { interface KotlinJvmBinaryClass {
val classId: ClassId val classId: ClassId
@@ -20,7 +19,7 @@ interface KotlinJvmBinaryClass {
*/ */
val location: String val location: String
val containingLibrary: Path? val containingLibrary: String?
get() = null get() = null
fun loadClassAnnotations(visitor: AnnotationVisitor, cachedContents: ByteArray?) fun loadClassAnnotations(visitor: AnnotationVisitor, cachedContents: ByteArray?)