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

DFGBuilder fix

Browse Source 
Intrinsic functions considered internal.
This commit is contained in:
Igor Chevdar
2017-11-30 16:10:03 +03:00
parent a991b51064
commit faa9986489
1 changed files with 6 additions and 3 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/optimizations/DataFlowIR.kt
+6 -3
View File
@@ -406,6 +406,8 @@ internal object DataFlowIR {
return parent.child(localName) return parent.child(localName)
} }
private val FunctionDescriptor.internalName get() = getFqName(this).asString() + "#internal"
fun mapFunction(descriptor: CallableDescriptor) = descriptor.original.let { fun mapFunction(descriptor: CallableDescriptor) = descriptor.original.let {
functionMap.getOrPut(it) { functionMap.getOrPut(it) {
when (it) { when (it) {
@@ -413,8 +415,9 @@ internal object DataFlowIR {
FunctionSymbol.Private(privateFunIndex++, module, -1, takeName { "${it.symbolName}_init" }) FunctionSymbol.Private(privateFunIndex++, module, -1, takeName { "${it.symbolName}_init" })
is FunctionDescriptor -> { is FunctionDescriptor -> {
val name = if (it.isExported()) it.symbolName else it.internalName
if (it.module != irModule.descriptor || it.externalOrIntrinsic()) if (it.module != irModule.descriptor || it.externalOrIntrinsic())
FunctionSymbol.External(it.symbolName.localHash.value, takeName { it.symbolName }) FunctionSymbol.External(name.localHash.value, takeName { name })
else { else {
val isAbstract = it.modality == Modality.ABSTRACT val isAbstract = it.modality == Modality.ABSTRACT
val classDescriptor = it.containingDeclaration as? ClassDescriptor val classDescriptor = it.containingDeclaration as? ClassDescriptor
@@ -425,9 +428,9 @@ internal object DataFlowIR {
++module.numberOfFunctions ++module.numberOfFunctions
val symbolTableIndex = if (!placeToFunctionsTable) -1 else couldBeCalledVirtuallyIndex++ val symbolTableIndex = if (!placeToFunctionsTable) -1 else couldBeCalledVirtuallyIndex++
if (it.isExported()) if (it.isExported())
FunctionSymbol.Public(it.symbolName.localHash.value, module, symbolTableIndex, takeName { it.symbolName }) FunctionSymbol.Public(name.localHash.value, module, symbolTableIndex, takeName { name })
else else
FunctionSymbol.Private(privateFunIndex++, module, symbolTableIndex, takeName { getFqName(it).asString() + "#internal" }) FunctionSymbol.Private(privateFunIndex++, module, symbolTableIndex, takeName { name })
} }
} }