IR: put resolution of unbound type parameter symbols behind a languag…

…e version flag
JetBrains · Apr 15, 2020 · 284533f · 284533f
1 parent a1a2da3
commit 284533f
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/ExternalDependenciesGenerator.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/ExternalDependenciesGenerator.kt
@@ -53,21 +53,23 @@ class ExternalDependenciesGenerator(
             }
         } while (unbound.isNotEmpty())
     }
-}
 
-private val SymbolTable.allUnbound: List<IrSymbol>
-    get() {
-        val r = mutableListOf<IrSymbol>()
-        r.addAll(unboundClasses)
-        r.addAll(unboundConstructors)
-        r.addAll(unboundEnumEntries)
-        r.addAll(unboundFields)
-        r.addAll(unboundSimpleFunctions)
-        r.addAll(unboundProperties)
-        r.addAll(unboundTypeAliases)
-        r.addAll(unboundTypeParameters)
-        return r
-    }
+    private val SymbolTable.allUnbound: List<IrSymbol>
+        get() {
+            val r = mutableListOf<IrSymbol>()
+            r.addAll(unboundClasses)
+            r.addAll(unboundConstructors)
+            r.addAll(unboundEnumEntries)
+            r.addAll(unboundFields)
+            r.addAll(unboundSimpleFunctions)
+            r.addAll(unboundProperties)
+            r.addAll(unboundTypeAliases)
+            if (!languageVersionSettings.supportsFeature(LanguageFeature.NewInference)) {
+                r.addAll(unboundTypeParameters)
+            }
+            return r
+        }
+}
 
 fun List<IrProvider>.getDeclaration(symbol: IrSymbol): IrDeclaration =
     firstNotNullResult { provider ->