diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/Interner.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/Interner.kt index 162f830a1d7..68c43d1dd5a 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/Interner.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/Interner.kt @@ -5,8 +5,10 @@ package org.jetbrains.kotlin.descriptors.commonizer.utils -class Interner { - private val pool = com.intellij.util.containers.Interner.createWeakInterner() +import com.intellij.util.containers.OpenTHashSet - fun intern(value: T): T = pool.intern(value) +class Interner { + private val pool = OpenTHashSet() + + fun intern(value: T): T = pool.getOrAdd(value) } diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/Interner.kt.201 b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/Interner.kt.201 deleted file mode 100644 index fa4aa613141..00000000000 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/Interner.kt.201 +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.descriptors.commonizer.utils - -import com.intellij.util.containers.WeakInterner - -class Interner { - private val pool = WeakInterner() - - fun intern(value: T): T = pool.intern(value) -} diff --git a/prepare/compiler/compiler.pro b/prepare/compiler/compiler.pro index e722ff84f68..614ac11bc66 100644 --- a/prepare/compiler/compiler.pro +++ b/prepare/compiler/compiler.pro @@ -166,6 +166,7 @@ -keep class com.intellij.util.containers.hash.EqualityPolicy { *; } -keep class com.intellij.util.containers.hash.EqualityPolicy.* { *; } -keep class com.intellij.util.containers.Interner { *; } +-keep class com.intellij.util.containers.OpenTHashSet { *; } -keep class gnu.trove.TIntHashSet { *; } -keep class gnu.trove.TIntIterator { *; } -keep class org.iq80.snappy.SlowMemory { *; }