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

[kotlin compiler][update] 1.2-20180126.115605-180 (#1269)

Browse Source 
* [kotlin compiler][update] 1.2-20180126.115605-180

kotlinScriptRuntimeVersion=1.2-20180126.115623-180
kotlinStdLibVersion=1.2-20180126.115626-180
kotlinReflectVersion=1.2-20180126.115618-180
kotlinStdLibJdk8Version=1.2-20180126.115632-180
kotlinGradlePluginVersion=1.2-20180126.115615-180

* [build] Fix upload for Kotlin dependencies
This commit is contained in:
Vasily Levchenko
2018-01-30 10:50:57 +03:00
committed by GitHub
parent 15ef5bd6c0
commit a5e8d3dfc9
12 changed files with 27 additions and 21 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/ir/KonanIr.kt
+3
View File
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.ir.symbols.IrFileSymbol
import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.types.KotlinType
//-----------------------------------------------------------------------------//
@@ -99,6 +100,8 @@ class IrFileImpl(entry: SourceManager.FileEntry) : IrFile {
//-------------------------------------------------------------------------//
override val fqName: FqName
get() = TODO("not implemented")
override val fileAnnotations: MutableList<AnnotationDescriptor>
get() = TODO("not implemented")
override val symbol: IrFileSymbol
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt
+4 -3
View File
@@ -210,9 +210,6 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass
descriptor = functionReferenceClassDescriptor
)
functionReferenceClass.createParameterDeclarations()
functionReferenceThis = functionReferenceClass.thisReceiver!!.symbol
val constructorBuilder = createConstructorBuilder()
@@ -235,6 +232,10 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass
functionReferenceClassDescriptor.initialize(
SimpleMemberScope(contributedDescriptors), setOf(constructorBuilder.symbol.descriptor), null)
functionReferenceClass.createParameterDeclarations()
functionReferenceThis = functionReferenceClass.thisReceiver!!.symbol
functionReferenceClass.addFakeOverrides()
constructorBuilder.initialize()
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DeepCopyIrTreeWithDescriptors.kt
+2 -1
View File
@@ -516,7 +516,8 @@ class DeepCopyIrTreeWithDescriptors(val targetDescriptor: FunctionDescriptor,
startOffset = expression.startOffset,
endOffset = expression.endOffset,
type = newExpressionType,
descriptor = classDescriptor
descriptor = classDescriptor,
classType = expression.classType
)
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt
+1 -1
View File
@@ -251,7 +251,6 @@ internal class EnumClassLowering(val context: Context) : ClassLoweringPass {
ClassKind.CLASS, listOf(descriptor.defaultType), SourceElement.NO_SOURCE, false)
val defaultClass = IrClassImpl(startOffset, endOffset, IrDeclarationOrigin.DEFINED, defaultClassDescriptor)
defaultClass.createParameterDeclarations()
val constructors = mutableSetOf<ClassConstructorDescriptor>()
@@ -283,6 +282,7 @@ internal class EnumClassLowering(val context: Context) : ClassLoweringPass {
.toList()
defaultClassDescriptor.initialize(SimpleMemberScope(contributedDescriptors), constructors, null)
defaultClass.createParameterDeclarations()
defaultClass.addFakeOverrides()
return defaultClass
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt
+1 -1
View File
@@ -304,7 +304,7 @@ internal class InteropLoweringPart1(val context: Context) : IrBuildingTransforme
context.interopBuiltIns.objCMethodImp.defaultType,
mapOf("selector" to selector, "encoding" to encoding)
.mapKeys { Name.identifier(it.key) }
.mapValues { StringValue(it.value, context.builtIns) },
.mapValues { StringValue(it.value) },
SourceElement.NO_SOURCE
)
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/SuspendFunctionsLowering.kt
+4 -3
View File
@@ -337,9 +337,6 @@ internal class SuspendFunctionsLowering(val context: Context): DeclarationContai
descriptor = coroutineClassDescriptor
)
coroutineClass.createParameterDeclarations()
coroutineClassThis = coroutineClass.thisReceiver!!.symbol
val overriddenMap = mutableMapOf<CallableMemberDescriptor, CallableMemberDescriptor>()
val constructors = mutableSetOf<ClassConstructorDescriptor>()
@@ -386,6 +383,10 @@ internal class SuspendFunctionsLowering(val context: Context): DeclarationContai
).filterNotNull().toList()
coroutineClassDescriptor.initialize(SimpleMemberScope(contributedDescriptors), constructors, null)
coroutineClass.createParameterDeclarations()
coroutineClassThis = coroutineClass.thisReceiver!!.symbol
coroutineClass.addFakeOverrides()
coroutineConstructorBuilder.initialize()
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanDescriptorSerializer.kt
+2 -2
View File
@@ -648,14 +648,14 @@ class KonanDescriptorSerializer private constructor(
proto.message = stringTable.getStringIndex(message)
}
val level = (args[RequireKotlinNames.LEVEL] as? EnumValue)?.value?.name?.asString()
val level = (args[RequireKotlinNames.LEVEL] as? EnumValue)?.enumEntryName?.asString()
when (level) {
DeprecationLevel.ERROR.toString() -> { /* ERROR is the default level */ }
DeprecationLevel.WARNING.toString() -> proto.level = ProtoBuf.VersionRequirement.Level.WARNING
DeprecationLevel.HIDDEN.toString() -> proto.level = ProtoBuf.VersionRequirement.Level.HIDDEN
}
val versionKind = (args[RequireKotlinNames.VERSION_KIND] as? EnumValue)?.value?.name?.asString()
val versionKind = (args[RequireKotlinNames.VERSION_KIND] as? EnumValue)?.enumEntryName?.asString()
when (versionKind) {
ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION.toString() -> { /* LANGUAGE_VERSION is the default kind */ }
ProtoBuf.VersionRequirement.VersionKind.COMPILER_VERSION.toString() ->
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializationUtil.kt
+1 -1
View File
@@ -105,7 +105,7 @@ fun createKonanPackageFragmentProvider(
LocalClassifierTypeSettings.Default,
ErrorReporter.DO_NOTHING,
LookupTracker.DO_NOTHING, NullFlexibleTypeDeserializer,
emptyList(), notFoundClasses, ContractDeserializer.DEFAULT)
emptyList(), notFoundClasses, ContractDeserializer.DEFAULT, extensionRegistryLite = KonanSerializerProtocol.extensionRegistry )
for (packageFragment in packageFragments) {
packageFragment.components = components
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt
+1 -1
View File
@@ -806,7 +806,7 @@ internal class IrDeserializer(val context: Context,
fun deserializeClassReference(proto: KonanIr.IrClassReference, start: Int, end: Int, type: KotlinType): IrClassReference {
val descriptor = deserializeDescriptor(proto.classDescriptor) as ClassifierDescriptor
return IrClassReferenceImpl(start, end, type, descriptor)
return IrClassReferenceImpl(start, end, type, descriptor, descriptor.defaultType)
}
fun deserializeCall(proto: KonanIr.IrCall, start: Int, end: Int, type: KotlinType): IrCall {
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt
+1 -1
View File
@@ -208,7 +208,7 @@ private class IrUnboundSymbolReplacer(
expression.transformChildrenVoid(this)
return with(expression) {
IrClassReferenceImpl(startOffset, endOffset, type, symbol)
IrClassReferenceImpl(startOffset, endOffset, type, symbol, symbol.descriptor.defaultType)
}
}
dependencies/build.gradle
Vendored
+1 -1
View File
@@ -129,8 +129,8 @@ uploads.each { target ->
'doc' : project.configurations.getByName("kotlin_${target}_doc").files.collect {it.path},
'pom' : project.configurations.getByName("kotlin_${target}_pom").files.collect {it.path},
'override': project.hasProperty("override") && project["override"]
]
startParameter.useEmptySettings()
}
}
gradle.properties
+6 -6
View File
@@ -23,14 +23,14 @@ testDataVersion=1226829:id
kotlinCompilerRepo=https://dl.bintray.com/jetbrains/kotlin-native-dependencies
#kotlinCompilerRepo=http://oss.sonatype.org/content/repositories/snapshots
#kotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-dev
kotlinCompilerVersion=1.2-20180115.060358-133
kotlinScriptRuntimeVersion=1.2-20180115.060416-133
kotlinStdLibVersion=1.2-20180115.060420-133
kotlinReflectVersion=1.2-20180115.060411-133
kotlinCompilerVersion=1.2-20180126.115605-180
kotlinScriptRuntimeVersion=1.2-20180126.115623-180
kotlinStdLibVersion=1.2-20180126.115626-180
kotlinReflectVersion=1.2-20180126.115618-180
konanVersion=0.5
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
##
# required for performance mesuarement tasks
kotlinStdLibJdk8Version=1.2-20180115.060426-133
kotlinGradlePluginVersion=1.2-20180115.060407-133
kotlinStdLibJdk8Version=1.2-20180126.115632-180
kotlinGradlePluginVersion=1.2-20180126.115615-180