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

[Interop] Perform enum and struct generation before linkage

Browse Source 
This process may generate symbols that should be bound. Thus, we need to perform it before linkage.
Also replace unsafe `irCall` with proper one.
This commit is contained in:
Sergey Bogolepov
2020-02-14 11:07:21 +07:00
committed by Sergey Bogolepov
parent 3db0cc689c
commit 5887bd54a9
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt
+5 -4
View File
@@ -208,6 +208,11 @@ internal val psiToIrPhase = konanUnitPhase(
config.configuration.languageVersionSettings
)
val irProviderForCEnumsAndCStructs = IrProviderForCEnumAndCStructStubs(generatorContext, interopBuiltIns, symbols)
// We need to run `buildAllEnumsAndStructsFrom` before `generateModuleFragment` because it adds references to symbolTable
// that should be bound.
modulesWithoutDCE
.filter(ModuleDescriptor::isFromInteropLibrary)
.forEach(irProviderForCEnumsAndCStructs::buildAllEnumsAndStructsFrom)
val irProviderForInteropStubs = IrProviderForInteropStubs(irProviderForCEnumsAndCStructs::canHandleSymbol)
val irProviders = listOf(
irProviderForCEnumsAndCStructs,
@@ -235,10 +240,6 @@ internal val psiToIrPhase = konanUnitPhase(
if (this.stdlibModule in modulesWithoutDCE) {
functionIrClassFactory.buildAllClasses()
}
modulesWithoutDCE
.filter(ModuleDescriptor::isFromInteropLibrary)
.forEach(irProviderForCEnumsAndCStructs::buildAllEnumsAndStructsFrom)
irModule = module
irModules = deserializer.modules.filterValues { llvmModuleSpecification.containsModule(it) }
ir.symbols = symbols
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt
+5 -6
View File
@@ -54,23 +54,22 @@ internal class CEnumByValueFunctionGenerator(
val values = irTemporaryVar(irCall(valuesIrFunctionSymbol))
val inductionVariable = irTemporaryVar(irInt(0))
val arrayClass = values.type.classOrNull!!
val valuesSize = irCall(symbols.arraySize.getValue(arrayClass)).also { irCall ->
val valuesSize = irCall(symbols.arraySize.getValue(arrayClass), irBuiltIns.intType).also { irCall ->
irCall.dispatchReceiver = irGet(values)
}
val getElementFn = symbols.arrayGet.getValue(arrayClass)
val plusFun = symbols.intPlusInt
val lessFunctionSymbol = irBuiltIns.lessFunByOperandType.getValue(irBuiltIns.intClass)
+irWhile().also { loop ->
loop.condition = irCall(lessFunctionSymbol).also { irCall ->
loop.condition = irCall(lessFunctionSymbol, irBuiltIns.booleanType).also { irCall ->
irCall.putValueArgument(0, irGet(inductionVariable))
irCall.putValueArgument(1, valuesSize)
}
loop.body = irBlock {
val untypedEntry = irCall(getElementFn).also { irCall ->
val entry = irTemporaryVar(irCall(getElementFn, byValueIrFunction.returnType).also { irCall ->
irCall.dispatchReceiver = irGet(values)
irCall.putValueArgument(0, irGet(inductionVariable))
}
val entry = irTemporaryVar(irImplicitCast(untypedEntry, byValueIrFunction.returnType))
})
val valueGetter = entry.type.getClass()!!.getPropertyGetter("value")!!
val entryValue = irGet(irValueParameter.type, irGet(entry), valueGetter)
+irIfThenElse(
@@ -87,7 +86,7 @@ internal class CEnumByValueFunctionGenerator(
)
}
}
+irCall(symbols.ThrowNullPointerException)
+irCall(symbols.ThrowNullPointerException, irBuiltIns.nothingType)
})
}
return byValueIrFunction