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

Make Objective-C blocks conform to kotlin.Function interface with -opt

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2019-10-30 14:42:36 +03:00
committed by SvyatoslavScherbina
parent 5287274ca3
commit fdde59bf52
1 changed files with 20 additions and 16 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/llvm/RTTIGenerator.kt
+20 -16
View File
@@ -68,7 +68,7 @@ internal class RTTIGenerator(override val context: Context) : ContextUtils {
inner class MethodTableRecord(val nameSignature: LocalHash, methodEntryPoint: ConstPointer?) : inner class MethodTableRecord(val nameSignature: LocalHash, methodEntryPoint: ConstPointer?) :
Struct(runtime.methodTableRecordType, nameSignature, methodEntryPoint) Struct(runtime.methodTableRecordType, nameSignature, methodEntryPoint)
inner class InterfaceTableRecord(id: Int32, vtableSize: Int32, vtable: ConstPointer) : inner class InterfaceTableRecord(id: Int32, vtableSize: Int32, vtable: ConstPointer?) :
Struct(runtime.interfaceTableRecordType, id, vtableSize, vtable) Struct(runtime.interfaceTableRecordType, id, vtableSize, vtable)
private inner class TypeInfo( private inner class TypeInfo(
@@ -466,9 +466,9 @@ internal class RTTIGenerator(override val context: Context) : ContextUtils {
val superClass = context.ir.symbols.any.owner val superClass = context.ir.symbols.any.owner
assert(superClass.implementedInterfaces.isEmpty()) assert(superClass.implementedInterfaces.isEmpty())
val interfaces = (listOf(irClass) + irClass.implementedInterfaces).map { it.typeInfoPtr } val interfaces = (listOf(irClass) + irClass.implementedInterfaces)
val interfacesPtr = staticData.placeGlobalConstArray("", val interfacesPtr = staticData.placeGlobalConstArray("",
pointerType(runtime.typeInfoType), interfaces) pointerType(runtime.typeInfoType), interfaces.map { it.typeInfoPtr })
assert(superClass.declarations.all { it !is IrProperty && it !is IrField }) assert(superClass.declarations.all { it !is IrProperty && it !is IrField })
@@ -504,17 +504,22 @@ internal class RTTIGenerator(override val context: Context) : ContextUtils {
else else
ClassGlobalHierarchyInfo(-1, -1, 0, 0) ClassGlobalHierarchyInfo(-1, -1, 0, 0)
val interfaceTable = if (!context.ghaEnabled()) emptyList() else { // TODO: interfaces (e.g. FunctionN and Function) should have different colors.
val layoutBuilder = context.getLayoutBuilder(irClass) val (interfaceTableSkeleton, interfaceTableSize) =
val vtableEntries = layoutBuilder.interfaceTableEntries.map { methodImpls[it]!!.bitcast(int8TypePtr) } if (context.ghaEnabled()) interfaceTableSkeleton(interfaces) else Pair(emptyArray(), -1)
val interfaceVTable = staticData.placeGlobalArray("", kInt8Ptr, vtableEntries)
listOf( val interfaceTable = interfaceTableSkeleton.map { layoutBuilder ->
InterfaceTableRecord( if (layoutBuilder == null) {
Int32(layoutBuilder.hierarchyInfo.interfaceId), InterfaceTableRecord(Int32(0), Int32(0), null)
Int32(layoutBuilder.interfaceTableEntries.size), } else {
interfaceVTable.pointer.getElementPtr(0) val vtableEntries = layoutBuilder.interfaceTableEntries.map { methodImpls[it]!!.bitcast(int8TypePtr) }
) val interfaceVTable = staticData.placeGlobalArray("", kInt8Ptr, vtableEntries)
) InterfaceTableRecord(
Int32(layoutBuilder.hierarchyInfo.interfaceId),
Int32(layoutBuilder.interfaceTableEntries.size),
interfaceVTable.pointer.getElementPtr(0)
)
}
} }
val interfaceTablePtr = staticData.placeGlobalConstArray("", runtime.interfaceTableRecordType, interfaceTable) val interfaceTablePtr = staticData.placeGlobalConstArray("", runtime.interfaceTableRecordType, interfaceTable)
@@ -526,8 +531,7 @@ internal class RTTIGenerator(override val context: Context) : ContextUtils {
objOffsets = objOffsetsPtr, objOffsetsCount = objOffsetsCount, objOffsets = objOffsetsPtr, objOffsetsCount = objOffsetsCount,
interfaces = interfacesPtr, interfacesCount = interfaces.size, interfaces = interfacesPtr, interfacesCount = interfaces.size,
methods = methodsPtr, methodsCount = methods.size, methods = methodsPtr, methodsCount = methods.size,
// 0 is a perfectly valid itable size (since 0 is in form of (2^k - 1). interfaceTableSize = interfaceTableSize, interfaceTable = interfaceTablePtr,
interfaceTableSize = 0, interfaceTable = interfaceTablePtr,
packageName = reflectionInfo.packageName, packageName = reflectionInfo.packageName,
relativeName = reflectionInfo.relativeName, relativeName = reflectionInfo.relativeName,
flags = flagsFromClass(irClass) or (if (immutable) TF_IMMUTABLE else 0), flags = flagsFromClass(irClass) or (if (immutable) TF_IMMUTABLE else 0),