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

[Commonizer] Read exported forward declarations for every C-interop module

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-03-09 21:52:30 +03:00
parent a7fda66fa1
commit 76d93b6dca
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/TargetProvider.kt
+6 -1
View File
@@ -18,7 +18,12 @@ interface ModulesProvider {
open class ModuleInfo(
val name: String,
val originalLocation: File,
val isCInterop: Boolean
val cInteropAttributes: CInteropModuleAttributes?
)
class CInteropModuleAttributes(
val mainPackage: String,
val exportedForwardDeclarations: Collection<String>
)
/**
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionModulesProvider.kt
+8 -3
View File
@@ -17,8 +17,8 @@ internal class NativeDistributionModulesProvider(libraries: Collection<NativeLib
name: String,
originalLocation: File,
val dependencies: Set<String>,
isCInterop: Boolean
) : ModuleInfo(name, originalLocation, isCInterop)
cInteropAttributes: ModulesProvider.CInteropModuleAttributes?
) : ModuleInfo(name, originalLocation, cInteropAttributes)
private val libraryMap: Map<String, NativeLibrary>
private val moduleInfoMap: Map<String, NativeModuleInfo>
@@ -34,8 +34,13 @@ internal class NativeDistributionModulesProvider(libraries: Collection<NativeLib
val location = File(library.library.libraryFile.path)
val dependencies = manifestData.dependencies.toSet()
val cInteropAttributes = if (manifestData.isInterop) {
val packageFqName = manifestData.packageFqName ?: error("Main package FQ name not specified for module $name")
ModulesProvider.CInteropModuleAttributes(packageFqName, manifestData.exportForwardDeclarations)
} else null
libraryMap.put(name, library)?.let { error("Duplicated libraries: $name") }
moduleInfoMap[name] = NativeModuleInfo(name, location, dependencies, manifestData.isInterop)
moduleInfoMap[name] = NativeModuleInfo(name, location, dependencies, cInteropAttributes)
}
this.libraryMap = libraryMap
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirProvidedClassifiersByModules.kt
+2 -2
View File
@@ -47,7 +47,7 @@ internal class CirProvidedClassifiersByModules private constructor(
var hasForwardDeclarations = false
modulesProvider.loadModuleInfos().forEach { moduleInfo ->
if (moduleInfo.isCInterop) {
if (moduleInfo.cInteropAttributes != null) {
// this is a C-interop module
hasForwardDeclarations = true
}
@@ -137,7 +137,7 @@ private fun readClass(
typeParameterIndexOffset = typeParameterIndexOffset
)
val visibility = ProtoEnumFlags.visibility(Flags.VISIBILITY.get(classProto.flags))
val clazz = CirProvided.Class(typeParameters, visibility)
val clazz = CirProvided.RegularClass(typeParameters, visibility)
consumer(classId, clazz)
native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt
+1 -1
View File
@@ -91,7 +91,7 @@ internal class MockModulesProvider private constructor(
return SERIALIZER.serializeModule(module)
}
private fun fakeModuleInfo(name: String) = ModuleInfo(name, File("/tmp/commonizer/mocks/$name"), false)
private fun fakeModuleInfo(name: String) = ModuleInfo(name, File("/tmp/commonizer/mocks/$name"), null)
companion object {
@JvmName("createByModuleNames")