From 0830e480299665f9200048d248043c07d89e343d Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 23 Jul 2015 17:21:19 +0300 Subject: [PATCH] Minor: FakePureImplementationsProvider does not need builtins, just fq names --- .../kotlin/load/java/FakePureImplementationsProvider.kt | 8 +++----- .../src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt index b416ae514f7..117b7c25f9f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt @@ -28,11 +28,9 @@ public object FakePureImplementationsProvider { else -> null } - private val kotlinBuiltins = KotlinBuiltIns.getInstance() - - private val MUTABLE_LIST_FQ_NAME = DescriptorUtils.getFqNameSafe(kotlinBuiltins.getMutableList()) - private val MUTABLE_SET_FQ_NAME = DescriptorUtils.getFqNameSafe(kotlinBuiltins.getMutableSet()) - private val MUTABLE_MAP_FQ_NAME = DescriptorUtils.getFqNameSafe(kotlinBuiltins.getMutableMap()) + private val MUTABLE_LIST_FQ_NAME = KotlinBuiltIns.FQ_NAMES.mutableList + private val MUTABLE_SET_FQ_NAME = KotlinBuiltIns.FQ_NAMES.mutableSet + private val MUTABLE_MAP_FQ_NAME = KotlinBuiltIns.FQ_NAMES.mutableMap private val MUTABLE_LISTS_IMPLEMENTATIONS = setOfFqNames("java.util.ArrayList", "java.util.LinkedList") private val MUTABLE_MAPS_IMPLEMENTATIONS = setOfFqNames( diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index 9bdda77c684..4a4169dedf0 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -181,6 +181,10 @@ public class KotlinBuiltIns { public final FqName annotationTarget = annotationName("AnnotationTarget"); public final FqName annotationRetention = annotationName("AnnotationRetention"); + public final FqName mutableList = fqName("MutableList"); + public final FqName mutableSet = fqName("MutableSet"); + public final FqName mutableMap = fqName("MutableMap"); + public final FqNameUnsafe kClass = new FqName("kotlin.reflect.KClass").toUnsafe(); public final Map fqNameToPrimitiveType;