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

[kotlin compiler][update] 1.3.30-dev-964

Browse Source
This commit is contained in:
Vasily Levchenko
2019-01-15 18:19:47 +03:00
parent cfcfecf19e
commit 4a8faa6961
5 changed files with 7 additions and 7 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/lower/DeepCopyIrTreeWithDescriptors.kt
+1 -1
View File
@@ -71,7 +71,7 @@ internal class DeepCopyIrTreeWithSymbolsForInliner(val context: Context,
} }
override fun visitField(declaration: IrField) { override fun visitField(declaration: IrField) {
(declaration.descriptor as WrappedFieldDescriptor).bind(declaration) (declaration.descriptor as? WrappedFieldDescriptor)?.bind(declaration)
declaration.acceptChildrenVoid(this) declaration.acceptChildrenVoid(this)
} }
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/DFGSerializer.kt
+1 -1
View File
@@ -947,7 +947,7 @@ internal object DFGSerializer {
val publicFunctionsMap = mutableMapOf<Long, DataFlowIR.FunctionSymbol.Public>() val publicFunctionsMap = mutableMapOf<Long, DataFlowIR.FunctionSymbol.Public>()
val functions = mutableMapOf<DataFlowIR.FunctionSymbol, DataFlowIR.Function>() val functions = mutableMapOf<DataFlowIR.FunctionSymbol, DataFlowIR.Function>()
val specifics = context.config.configuration.get(CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS)!! val specifics = context.config.configuration.get(CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS)!!
val storageManager = LockBasedStorageManager() val storageManager = LockBasedStorageManager("deserializer-$startPrivateTypeIndex-$startPrivateFunIndex")
context.librariesWithDependencies.forEach { library -> context.librariesWithDependencies.forEach { library ->
val libraryDataFlowGraph = library.dataFlowGraph val libraryDataFlowGraph = library.dataFlowGraph
extracted/konan.serializer/src/org/jetbrains/kotlin/serialization/konan/impl/KonanDeserializedModuleDescriptorFactoryImpl.kt
+1 -1
View File
@@ -109,7 +109,7 @@ internal class KonanDeserializedModuleDescriptorFactoryImpl(
NullFlexibleTypeDeserializer, NullFlexibleTypeDeserializer,
emptyList(), emptyList(),
notFoundClasses, notFoundClasses,
ContractDeserializerImpl(configuration), ContractDeserializerImpl(configuration, storageManager),
extensionRegistryLite = KonanSerializerProtocol.extensionRegistry) extensionRegistryLite = KonanSerializerProtocol.extensionRegistry)
for (packageFragment in deserializedPackageFragments) { for (packageFragment in deserializedPackageFragments) {
gradle.properties
+3 -3
View File
@@ -18,9 +18,9 @@
buildKotlinVersion=1.3.0-rc-116 buildKotlinVersion=1.3.0-rc-116
buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_130_CompilerAllPlugins),number:1.3.0-rc-116,tag:kotlin-native,pinned:true/artifacts/content/maven buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_130_CompilerAllPlugins),number:1.3.0-rc-116,tag:kotlin-native,pinned:true/artifacts/content/maven
remoteRoot=konan_tests remoteRoot=konan_tests
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-761,pinned:true/artifacts/content/maven kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-964,pinned:true/artifacts/content/maven
kotlinVersion=1.3.30-dev-761 kotlinVersion=1.3.30-dev-964
testKotlinVersion=1.3.30-dev-761 testKotlinVersion=1.3.30-dev-964
konanVersion=1.2.0 konanVersion=1.2.0
org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.jvmargs='-Dfile.encoding=UTF-8'
org.gradle.workers.max=4 org.gradle.workers.max=4
klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt
+1 -1
View File
@@ -143,7 +143,7 @@ class Library(val name: String, val requestedRepository: String?, val target: St
fun contents(output: Appendable = out) { fun contents(output: Appendable = out) {
val storageManager = LockBasedStorageManager() val storageManager = LockBasedStorageManager("klib")
val library = libraryInRepoOrCurrentDir(repository, name) val library = libraryInRepoOrCurrentDir(repository, name)
val versionSpec = LanguageVersionSettingsImpl(currentLanguageVersion, currentApiVersion) val versionSpec = LanguageVersionSettingsImpl(currentLanguageVersion, currentApiVersion)
val module = DefaultDeserializedDescriptorFactory.createDescriptorAndNewBuiltIns(library, versionSpec, storageManager) val module = DefaultDeserializedDescriptorFactory.createDescriptorAndNewBuiltIns(library, versionSpec, storageManager)