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

Update compiler to 1.3.40-dev-1842 (#2876)

Browse Source
This commit is contained in:
Pavel Punegov
2019-04-17 17:44:14 +03:00
committed by Nikolay Igotti
parent 10ade4cd35
commit 8272ca7442
5 changed files with 8 additions and 8 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/Context.kt
+2 -1
View File
@@ -10,7 +10,6 @@ import llvm.LLVMModuleRef
import org.jetbrains.kotlin.backend.common.DumpIrTreeWithDescriptorsVisitor
import org.jetbrains.kotlin.backend.common.descriptors.WrappedSimpleFunctionDescriptor
import org.jetbrains.kotlin.backend.common.descriptors.WrappedTypeParameterDescriptor
import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
import org.jetbrains.kotlin.backend.common.validateIrModule
import org.jetbrains.kotlin.backend.konan.descriptors.*
import org.jetbrains.kotlin.backend.konan.ir.KonanIr
@@ -210,6 +209,8 @@ internal class Context(config: KonanConfig) : KonanBackendContext(config) {
override val configuration get() = config.configuration
override val internalPackageFqn: FqName = RuntimeNames.kotlinNativeInternalPackageName
val phaseConfig = config.phaseConfig
private val packageScope by lazy { builtIns.builtInsModule.getPackage(KonanFqNames.internalPackageName).memberScope }
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/RuntimeNames.kt
+1
View File
@@ -10,4 +10,5 @@ object RuntimeNames {
val cCall = FqName("kotlinx.cinterop.internal.CCall")
val independent = FqName("kotlin.native.internal.Independent")
val filterExceptions = FqName("kotlin.native.internal.FilterExceptions")
val kotlinNativeInternalPackageName = FqName.fromSegments(listOf("kotlin", "native", "internal"))
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt
+1 -3
View File
@@ -60,13 +60,11 @@ internal val ClassDescriptor.isArray: Boolean
internal val ClassDescriptor.isInterface: Boolean
get() = (this.kind == ClassKind.INTERFACE)
private val kotlinNativeInternalPackageName = FqName.fromSegments(listOf("kotlin", "native", "internal"))
/**
* @return `konan.internal` member scope
*/
internal val KonanBuiltIns.kotlinNativeInternal: MemberScope
get() = this.builtInsModule.getPackage(kotlinNativeInternalPackageName).memberScope
get() = this.builtInsModule.getPackage(RuntimeNames.kotlinNativeInternalPackageName).memberScope
internal fun ClassDescriptor.isUnit() = this.defaultType.isUnit()
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt
+1 -1
View File
@@ -324,7 +324,7 @@ internal class KonanSymbols(context: Context, private val symbolTable: SymbolTab
Name.identifier("toString"), NoLookupLocation.FROM_BACKEND)
.single { it.extensionReceiverParameter?.type == builtIns.nullableAnyType})
val getContinuation = internalFunction("getContinuation")
override val getContinuation = internalFunction("getContinuation")
val returnIfSuspended = internalFunction("returnIfSuspended")
gradle.properties
+3 -3
View File
@@ -18,9 +18,9 @@
buildKotlinVersion=1.3.40-dev-431
buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.40-dev-431,pinned:true/artifacts/content/maven
remoteRoot=konan_tests
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.40-dev-1480,branch:default:true,pinned:true/artifacts/content/maven
kotlinVersion=1.3.40-dev-1480
testKotlinVersion=1.3.40-dev-1480
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.40-dev-1842,branch:default:true,pinned:true/artifacts/content/maven
kotlinVersion=1.3.40-dev-1842
testKotlinVersion=1.3.40-dev-1842
sharedRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinNativeShared_BuildAndTest),number:1.0-dev-28,branch:default:true,pinned:true/artifacts/content/maven
sharedVersion=1.0-dev-28
konanVersion=1.3.0