From 5b8ab766131aa6d88f57e1335304f70231a36d86 Mon Sep 17 00:00:00 2001
From: "simon.ogorodnik" <simon.ogorodnik@jetbrains.com>
Date: Thu, 9 Jan 2020 17:04:57 +0300
Subject: [PATCH] [FIR] Move JvmMappedScope to fir:jvm module

---
 .../src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt | 3 ++-
 .../src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt  | 0
 .../src/org/jetbrains/kotlin/fir/resolve/FirSymbolProvider.kt  | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename compiler/fir/{resolve => jvm}/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt (97%)
 rename compiler/fir/{resolve => jvm}/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt (100%)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt
similarity index 97%
rename from compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt
rename to compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt
index 4b11fd4436d..a3cbe0960ab 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt
+++ b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * 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.
  */
 
@@ -103,6 +103,7 @@ private val unitClassId = ClassId.topLevel(FqName("kotlin.Unit"))
 private fun FirTypeRef.isVoid(): Boolean {
     return when (this) {
         is FirJavaTypeRef -> {
+            val type = type
             type is JavaPrimitiveType && type.type == null
         }
         is FirResolvedTypeRef -> {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt
similarity index 100%
rename from compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt
rename to compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirSymbolProvider.kt
index 4b34067bb72..279cd1b6cd5 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirSymbolProvider.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirSymbolProvider.kt
@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.fir.scopes.impl.FirClassUseSiteMemberScope
 import org.jetbrains.kotlin.fir.scopes.impl.FirStandardOverrideChecker
 import org.jetbrains.kotlin.fir.scopes.impl.FirSuperTypeScope
 import org.jetbrains.kotlin.fir.scopes.impl.declaredMemberScope
-import org.jetbrains.kotlin.fir.scopes.jvm.JvmMappedScope
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
 import org.jetbrains.kotlin.fir.symbols.ConeClassifierLookupTag
 import org.jetbrains.kotlin.fir.symbols.ConeClassifierLookupTagWithFixedSymbol