Repair Native compilation
This commit is contained in:
committed by
TeamCityServer
parent
b79e9c9f90
commit
3a72c44184
+2
-1
@@ -58,7 +58,8 @@ internal fun Context.psiToIr(
|
||||
|
||||
val stubGenerator = DeclarationStubGeneratorImpl(
|
||||
moduleDescriptor, symbolTable,
|
||||
generatorContext.irBuiltIns
|
||||
generatorContext.irBuiltIns,
|
||||
KonanManglerDesc
|
||||
)
|
||||
val irBuiltInsOverDescriptors = generatorContext.irBuiltIns as IrBuiltInsOverDescriptors
|
||||
val functionIrClassFactory: KonanIrAbstractDescriptorBasedFunctionFactory =
|
||||
|
||||
+2
-3
@@ -11,12 +11,11 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.module
|
||||
class KonanIdSignaturer(private val mangler: KotlinMangler.DescriptorMangler) : IdSignatureDescriptor(mangler) {
|
||||
|
||||
override fun createSignatureBuilder(type: SpecialDeclarationType): DescriptorBasedSignatureBuilder =
|
||||
KonanDescriptorBasedSignatureBuilder(mangler, type)
|
||||
KonanDescriptorBasedSignatureBuilder(type)
|
||||
|
||||
private inner class KonanDescriptorBasedSignatureBuilder(
|
||||
mangler: KotlinMangler.DescriptorMangler,
|
||||
type: SpecialDeclarationType
|
||||
) : DescriptorBasedSignatureBuilder(mangler, type) {
|
||||
) : DescriptorBasedSignatureBuilder(type) {
|
||||
|
||||
/**
|
||||
* We need a way to distinguish interop declarations from usual ones
|
||||
|
||||
+2
-2
@@ -569,7 +569,7 @@ internal class KonanIrLinker(
|
||||
|
||||
private val descriptorByIdSignatureFinder = DescriptorByIdSignatureFinderImpl(
|
||||
moduleDescriptor, KonanManglerDesc,
|
||||
DescriptorByIdSignatureFinder.LookupMode.MODULE_ONLY
|
||||
DescriptorByIdSignatureFinderImpl.LookupMode.MODULE_ONLY
|
||||
)
|
||||
|
||||
private fun IdSignature.isInteropSignature() = IdSignature.Flags.IS_NATIVE_INTEROP_LIBRARY.test()
|
||||
@@ -623,7 +623,7 @@ internal class KonanIrLinker(
|
||||
|
||||
private val descriptorByIdSignatureFinder = DescriptorByIdSignatureFinderImpl(
|
||||
moduleDescriptor, KonanManglerDesc,
|
||||
DescriptorByIdSignatureFinder.LookupMode.MODULE_ONLY
|
||||
DescriptorByIdSignatureFinderImpl.LookupMode.MODULE_ONLY
|
||||
)
|
||||
|
||||
override fun contains(idSig: IdSignature) =
|
||||
|
||||
Reference in New Issue
Block a user