[IR] Supported isExpect argument (#3482)
[compiler-update] 1.3.70-dev-742
This commit is contained in:
+4
-2
@@ -71,7 +71,8 @@ internal val Context.getBoxFunction: (IrClass) -> IrSimpleFunction by Context.la
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false
|
isSuspend = false,
|
||||||
|
isExpect = false
|
||||||
).also { function ->
|
).also { function ->
|
||||||
function.valueParameters.add(WrappedValueParameterDescriptor().let {
|
function.valueParameters.add(WrappedValueParameterDescriptor().let {
|
||||||
IrValueParameterImpl(
|
IrValueParameterImpl(
|
||||||
@@ -122,7 +123,8 @@ internal val Context.getUnboxFunction: (IrClass) -> IrSimpleFunction by Context.
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false
|
isSuspend = false,
|
||||||
|
isExpect = false
|
||||||
).also { function ->
|
).also { function ->
|
||||||
function.valueParameters.add(WrappedValueParameterDescriptor().let {
|
function.valueParameters.add(WrappedValueParameterDescriptor().let {
|
||||||
IrValueParameterImpl(
|
IrValueParameterImpl(
|
||||||
|
|||||||
+2
-1
@@ -140,7 +140,8 @@ internal class SpecialDeclarationsFactory(val context: Context) : KotlinMangler
|
|||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = function.isSuspend,
|
isSuspend = function.isSuspend,
|
||||||
returnType = returnType
|
returnType = returnType,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
descriptor.bind(this)
|
descriptor.bind(this)
|
||||||
parent = function.parent
|
parent = function.parent
|
||||||
|
|||||||
+2
-1
@@ -39,7 +39,8 @@ internal fun makeEntryPoint(context: Context): IrFunction {
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false
|
isSuspend = false,
|
||||||
|
isExpect = false
|
||||||
).also { function ->
|
).also { function ->
|
||||||
function.valueParameters.add(WrappedValueParameterDescriptor().let {
|
function.valueParameters.add(WrappedValueParameterDescriptor().let {
|
||||||
IrValueParameterImpl(
|
IrValueParameterImpl(
|
||||||
|
|||||||
+4
-2
@@ -56,7 +56,8 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) {
|
|||||||
isInner = false,
|
isInner = false,
|
||||||
isData = false,
|
isData = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isInline = false
|
isInline = false,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
it.bind(this)
|
it.bind(this)
|
||||||
parent = enumClass
|
parent = enumClass
|
||||||
@@ -94,7 +95,8 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) {
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false
|
isSuspend = false,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
it.bind(this)
|
it.bind(this)
|
||||||
parent = implObject
|
parent = implObject
|
||||||
|
|||||||
+5
-4
@@ -570,7 +570,8 @@ private fun KotlinStubs.createFakeKotlinExternalFunction(
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = true,
|
isExternal = true,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false
|
isSuspend = false,
|
||||||
|
isExpect = false
|
||||||
)
|
)
|
||||||
bridgeDescriptor.bind(bridge)
|
bridgeDescriptor.bind(bridge)
|
||||||
|
|
||||||
@@ -1195,7 +1196,7 @@ private class ObjCBlockPointerValuePassing(
|
|||||||
OBJC_BLOCK_FUNCTION_IMPL, IrClassSymbolImpl(classDescriptor),
|
OBJC_BLOCK_FUNCTION_IMPL, IrClassSymbolImpl(classDescriptor),
|
||||||
Name.identifier(stubs.getUniqueKotlinFunctionReferenceClassName("BlockFunctionImpl")),
|
Name.identifier(stubs.getUniqueKotlinFunctionReferenceClassName("BlockFunctionImpl")),
|
||||||
ClassKind.CLASS, Visibilities.PRIVATE, Modality.FINAL,
|
ClassKind.CLASS, Visibilities.PRIVATE, Modality.FINAL,
|
||||||
isCompanion = false, isInner = false, isData = false, isExternal = false, isInline = false
|
isCompanion = false, isInner = false, isData = false, isExternal = false, isInline = false, isExpect = false
|
||||||
)
|
)
|
||||||
classDescriptor.bind(irClass)
|
classDescriptor.bind(irClass)
|
||||||
irClass.createParameterDeclarations()
|
irClass.createParameterDeclarations()
|
||||||
@@ -1219,7 +1220,7 @@ private class ObjCBlockPointerValuePassing(
|
|||||||
Name.special("<init>"),
|
Name.special("<init>"),
|
||||||
Visibilities.PUBLIC,
|
Visibilities.PUBLIC,
|
||||||
irClass.defaultType,
|
irClass.defaultType,
|
||||||
isInline = false, isExternal = false, isPrimary = true
|
isInline = false, isExternal = false, isPrimary = true, isExpect = false
|
||||||
)
|
)
|
||||||
constructorDescriptor.bind(constructor)
|
constructorDescriptor.bind(constructor)
|
||||||
irClass.addChild(constructor)
|
irClass.addChild(constructor)
|
||||||
@@ -1260,7 +1261,7 @@ private class ObjCBlockPointerValuePassing(
|
|||||||
overriddenInvokeMethod.name,
|
overriddenInvokeMethod.name,
|
||||||
Visibilities.PUBLIC, Modality.FINAL,
|
Visibilities.PUBLIC, Modality.FINAL,
|
||||||
returnType = functionType.arguments.last().typeOrNull!!,
|
returnType = functionType.arguments.last().typeOrNull!!,
|
||||||
isInline = false, isExternal = false, isTailrec = false, isSuspend = false
|
isInline = false, isExternal = false, isTailrec = false, isSuspend = false, isExpect = false
|
||||||
)
|
)
|
||||||
invokeMethodDescriptor.bind(invokeMethod)
|
invokeMethodDescriptor.bind(invokeMethod)
|
||||||
invokeMethod.overriddenSymbols += overriddenInvokeMethod.symbol
|
invokeMethod.overriddenSymbols += overriddenInvokeMethod.symbol
|
||||||
|
|||||||
+2
-1
@@ -115,7 +115,8 @@ private fun createKotlinBridge(
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = isExternal,
|
isExternal = isExternal,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false
|
isSuspend = false,
|
||||||
|
isExpect = false
|
||||||
)
|
)
|
||||||
bridgeDescriptor.bind(bridge)
|
bridgeDescriptor.bind(bridge)
|
||||||
if (isExternal) {
|
if (isExternal) {
|
||||||
|
|||||||
+2
-1
@@ -501,7 +501,8 @@ private val Context.getLoweredInlineClassConstructor: (IrConstructor) -> IrSimpl
|
|||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false,
|
isSuspend = false,
|
||||||
returnType = irConstructor.returnType
|
returnType = irConstructor.returnType,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
descriptor.bind(this)
|
descriptor.bind(this)
|
||||||
parent = irConstructor.parent
|
parent = irConstructor.parent
|
||||||
|
|||||||
+2
-1
@@ -82,7 +82,8 @@ internal class WorkersBridgesBuilding(val context: Context) : DeclarationContain
|
|||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false,
|
isSuspend = false,
|
||||||
returnType = context.irBuiltIns.anyNType
|
returnType = context.irBuiltIns.anyNType,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
it.bind(this)
|
it.bind(this)
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-3
@@ -162,7 +162,8 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass
|
|||||||
isInner = false,
|
isInner = false,
|
||||||
isData = false,
|
isData = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isInline = false
|
isInline = false,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
it.bind(this)
|
it.bind(this)
|
||||||
parent = this@FunctionReferenceBuilder.parent
|
parent = this@FunctionReferenceBuilder.parent
|
||||||
@@ -252,7 +253,8 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass
|
|||||||
functionReferenceClass.defaultType,
|
functionReferenceClass.defaultType,
|
||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isPrimary = true
|
isPrimary = true,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
it.bind(this)
|
it.bind(this)
|
||||||
parent = functionReferenceClass
|
parent = functionReferenceClass
|
||||||
@@ -306,7 +308,8 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = superFunction.isSuspend
|
isSuspend = superFunction.isSuspend,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
it.bind(this)
|
it.bind(this)
|
||||||
val function = this
|
val function = this
|
||||||
|
|||||||
+2
-1
@@ -122,7 +122,8 @@ internal class EnumConstructorsLowering(val context: Context) : ClassLoweringPas
|
|||||||
constructor.returnType,
|
constructor.returnType,
|
||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isPrimary = constructor.isPrimary
|
isPrimary = constructor.isPrimary,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
it.bind(this)
|
it.bind(this)
|
||||||
parent = constructor.parent
|
parent = constructor.parent
|
||||||
|
|||||||
+1
@@ -186,6 +186,7 @@ internal class FinallyBlocksLowering(val context: Context): FileLoweringPass, Ir
|
|||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
|
false,
|
||||||
false)
|
false)
|
||||||
)
|
)
|
||||||
return descriptor
|
return descriptor
|
||||||
|
|||||||
+2
-1
@@ -107,7 +107,8 @@ internal class InitializersLowering(val context: CommonBackendContext) : ClassLo
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isSuspend = false,
|
isSuspend = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false
|
isTailrec = false,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
it.bind(this)
|
it.bind(this)
|
||||||
parent = irClass
|
parent = irClass
|
||||||
|
|||||||
+4
-2
@@ -233,7 +233,8 @@ internal class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfo
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false
|
isSuspend = false,
|
||||||
|
isExpect = false
|
||||||
).also { result ->
|
).also { result ->
|
||||||
resultDescriptor.bind(result)
|
resultDescriptor.bind(result)
|
||||||
result.parent = irClass
|
result.parent = irClass
|
||||||
@@ -374,7 +375,8 @@ internal class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfo
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false
|
isSuspend = false,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
it.bind(this)
|
it.bind(this)
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-2
@@ -486,7 +486,8 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false
|
isSuspend = false,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
it.bind(this)
|
it.bind(this)
|
||||||
}
|
}
|
||||||
@@ -504,7 +505,8 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false
|
isSuspend = false,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
it.bind(this)
|
it.bind(this)
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-4
@@ -349,7 +349,8 @@ internal class TestProcessor (val context: Context) {
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false
|
isSuspend = false,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
descriptor.bind(this)
|
descriptor.bind(this)
|
||||||
parent = owner
|
parent = owner
|
||||||
@@ -385,7 +386,8 @@ internal class TestProcessor (val context: Context) {
|
|||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isTailrec = false,
|
isTailrec = false,
|
||||||
isSuspend = false
|
isSuspend = false,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
descriptor.bind(this)
|
descriptor.bind(this)
|
||||||
parent = owner
|
parent = owner
|
||||||
@@ -430,7 +432,8 @@ internal class TestProcessor (val context: Context) {
|
|||||||
testSuite.typeWithStarProjections,
|
testSuite.typeWithStarProjections,
|
||||||
isInline = false,
|
isInline = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isPrimary = true
|
isPrimary = true,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
descriptor.bind(this)
|
descriptor.bind(this)
|
||||||
parent = owner
|
parent = owner
|
||||||
@@ -485,7 +488,8 @@ internal class TestProcessor (val context: Context) {
|
|||||||
isInner = false,
|
isInner = false,
|
||||||
isData = false,
|
isData = false,
|
||||||
isExternal = false,
|
isExternal = false,
|
||||||
isInline = false
|
isInline = false,
|
||||||
|
isExpect = false
|
||||||
).apply {
|
).apply {
|
||||||
descriptor.bind(this)
|
descriptor.bind(this)
|
||||||
createParameterDeclarations()
|
createParameterDeclarations()
|
||||||
|
|||||||
+6
-6
@@ -18,12 +18,12 @@
|
|||||||
buildKotlinVersion=1.3.60-dev-2755
|
buildKotlinVersion=1.3.60-dev-2755
|
||||||
buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-2755,branch:default:any,pinned:true/artifacts/content/maven
|
buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-2755,branch:default:any,pinned:true/artifacts/content/maven
|
||||||
remoteRoot=konan_tests
|
remoteRoot=konan_tests
|
||||||
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-478,branch:default:any,pinned:true/artifacts/content/maven
|
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-742,branch:default:any,pinned:true/artifacts/content/maven
|
||||||
kotlinVersion=1.3.70-dev-478
|
kotlinVersion=1.3.70-dev-742
|
||||||
kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-478,branch:default:any,pinned:true/artifacts/content/maven
|
kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-742,branch:default:any,pinned:true/artifacts/content/maven
|
||||||
kotlinStdlibVersion=1.3.70-dev-478
|
kotlinStdlibVersion=1.3.70-dev-742
|
||||||
kotlinStdlibTestsVersion=1.3.70-dev-478
|
kotlinStdlibTestsVersion=1.3.70-dev-742
|
||||||
testKotlinCompilerVersion=1.3.70-dev-478
|
testKotlinCompilerVersion=1.3.70-dev-742
|
||||||
konanVersion=1.3.70
|
konanVersion=1.3.70
|
||||||
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
|
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
|
||||||
org.gradle.workers.max=4
|
org.gradle.workers.max=4
|
||||||
|
|||||||
Reference in New Issue
Block a user