Update to 1.3.0-rc-6. (#2050)

This commit is contained in:
Nikolay Igotti
2018-09-13 10:20:52 +03:00
committed by GitHub
parent 27ce3b194d
commit b6a01a86f1
16 changed files with 48 additions and 66 deletions
+1
View File
@@ -183,6 +183,7 @@ targetList.each { target ->
'-Xmulti-platform', '-Xuse-experimental=kotlin.Experimental',
'-Xuse-experimental=kotlin.contracts.ExperimentalContracts',
'-Xuse-experimental=kotlin.ExperimentalMultiplatform',
'-Xallow-result-return-type',
commonSrc.absolutePath,
project(':Interop:Runtime').file('src/main/kotlin'),
project(':Interop:Runtime').file('src/native/kotlin'),
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.backend.konan.irasdescriptors
import org.jetbrains.kotlin.backend.konan.*
import org.jetbrains.kotlin.backend.konan.llvm.llvmSymbolOrigin
import org.jetbrains.kotlin.idea.MainFunctionDetector
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.types.IrType
import org.jetbrains.kotlin.ir.types.toKotlinType
@@ -38,7 +37,5 @@ internal fun IrFunction.isExternalObjCClassMethod() = this.descriptor.isExternal
internal val IrDeclaration.llvmSymbolOrigin get() = this.descriptor.llvmSymbolOrigin
internal fun IrFunction.isMain() = MainFunctionDetector.isMain(this.descriptor)
internal fun IrType.isObjCObjectType() = this.toKotlinType().isObjCObjectType()
@@ -407,7 +407,7 @@ private class DeclarationsGeneratorVisitor(override val context: Context) :
} else {
val symbolName = if (descriptor.isExported()) {
descriptor.symbolName.also {
if (!descriptor.isMain()) {
if (descriptor.name.asString() != "main") {
assert(LLVMGetNamedFunction(context.llvm.llvmModule, it) == null) { it }
} else {
// As a workaround, allow `main` functions to clash because frontend accepts this.
+1 -1
View File
@@ -43,7 +43,7 @@ repositories {
dependencies {
cli_bc project(path: ':backend.native', configuration: 'cli_bc')
update_tests (group: 'org', name: 'Kotlin_dev_CompilerAllPlugins', version: testKotlinVersion) {
update_tests (group: 'org', name: 'Kotlin_130_Compiler', version: testKotlinVersion) {
artifact {
name = 'internal/kotlin-test-data'
type = 'zip'