After the code review.

This commit is contained in:
Alexander Gorshenev
2016-12-20 16:48:28 +03:00
committed by alexander-gorshenev
parent a1786614ea
commit 823ef031eb
3 changed files with 6 additions and 6 deletions
@@ -33,11 +33,7 @@ fun ClassDescriptor?.signature2Descriptor(methodName: Name, signature:Array<Kotl
val PropertyDescriptor.backingField: PropertyDescriptor? val PropertyDescriptor.backingField: PropertyDescriptor?
get() { get() {
val backingFieldAnnotation = FqName("konan.internal.HasBackingField") val backingFieldAnnotation = FqName("konan.internal.HasBackingField")
if (this.annotations.findAnnotation(backingFieldAnnotation) != null) { return if (this.annotations.findAnnotation(backingFieldAnnotation) != null) this else null
return this
} else {
return null
}
} }
fun DeclarationDescriptor.deepPrint() { fun DeclarationDescriptor.deepPrint() {
@@ -8,5 +8,5 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor
internal class Ir(val context: Context, val irModule: IrModuleFragment) { internal class Ir(val context: Context, val irModule: IrModuleFragment) {
val propertiesWithBackingFields = mutableSetOf<PropertyDescriptor>() val propertiesWithBackingFields = mutableSetOf<PropertyDescriptor>()
val moduleIndex = ModuleIndex(irModule!!) val moduleIndex = ModuleIndex(irModule)
} }
+4
View File
@@ -436,12 +436,16 @@ task empty_string(type: RunKonanTest) {
task intrinsic(type: UnitKonanTest) { task intrinsic(type: UnitKonanTest) {
source = "codegen/function/intrinsic.kt" source = "codegen/function/intrinsic.kt"
} }
/*
Disabled until we extract the classes that should be
always present from stdlib.kt.bc into a separate binary.
task link(type: LinkKonanTest) { task link(type: LinkKonanTest) {
goldValue = "0\n" goldValue = "0\n"
source = "link/src/bar.kt" source = "link/src/bar.kt"
lib = "link/lib" lib = "link/lib"
} }
*/
task for0(type: RunKonanTest) { task for0(type: RunKonanTest) {
goldValue = "2\n3\n4\n" goldValue = "2\n3\n4\n"