From d474f862abdf21fed203c9cb8aa7e99b82834ee0 Mon Sep 17 00:00:00 2001 From: SvyatoslavScherbina Date: Fri, 6 Jul 2018 13:41:45 +0300 Subject: [PATCH] Don't use IR annotations to check for 'ThreadLocal' (#1771) Fix #1768 --- .../src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt index e19fdfd2a13..4d4b26f13e6 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt @@ -38,7 +38,6 @@ import org.jetbrains.kotlin.ir.symbols.* import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.util.defaultType import org.jetbrains.kotlin.ir.util.getArguments -import org.jetbrains.kotlin.ir.util.hasAnnotation import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid import org.jetbrains.kotlin.ir.visitors.acceptVoid @@ -50,7 +49,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe private val threadLocalAnnotationFqName = FqName("konan.ThreadLocal") val IrClassSymbol.objectIsShared get() = - !owner.hasAnnotation(threadLocalAnnotationFqName) + !descriptor.annotations.hasAnnotation(threadLocalAnnotationFqName) internal fun emitLLVM(context: Context) { val irModule = context.irModule!!