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

Don't use IR annotations to check for 'ThreadLocal' (#1771)

Browse Source 
Fix #1768
This commit is contained in:
SvyatoslavScherbina
2018-07-06 13:41:45 +03:00
committed by Nikolay Igotti
parent bc15678cd6
commit d474f862ab
1 changed files with 1 additions and 2 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/llvm/IrToBitcode.kt
+1 -2
View File
@@ -38,7 +38,6 @@ import org.jetbrains.kotlin.ir.symbols.*
import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.defaultType import org.jetbrains.kotlin.ir.util.defaultType
import org.jetbrains.kotlin.ir.util.getArguments 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.IrElementVisitorVoid
import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
import org.jetbrains.kotlin.ir.visitors.acceptVoid import org.jetbrains.kotlin.ir.visitors.acceptVoid
@@ -50,7 +49,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
private val threadLocalAnnotationFqName = FqName("konan.ThreadLocal") private val threadLocalAnnotationFqName = FqName("konan.ThreadLocal")
val IrClassSymbol.objectIsShared get() = val IrClassSymbol.objectIsShared get() =
!owner.hasAnnotation(threadLocalAnnotationFqName) !descriptor.annotations.hasAnnotation(threadLocalAnnotationFqName)
internal fun emitLLVM(context: Context) { internal fun emitLLVM(context: Context) {
val irModule = context.irModule!! val irModule = context.irModule!!