From 6bce4f6d6a3026a58ada8f0c110fafbbae9888e2 Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Wed, 8 Jun 2016 19:39:29 +0300
Subject: [PATCH] Minor. compilation after rebase.

---
 .../org/jetbrains/kotlin/resolve/TypeAliasExpander.kt  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeAliasExpander.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeAliasExpander.kt
index 00f41d11acd..48e1d48d605 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeAliasExpander.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeAliasExpander.kt
@@ -36,10 +36,10 @@ class TypeAliasExpander(
             annotations: Annotations,
             recursionDepth: Int,
             withAbbreviatedType: Boolean
-    ): KotlinType {
+    ): SimpleType {
         val originalProjection = TypeProjectionImpl(Variance.INVARIANT, typeAliasExpansion.descriptor.underlyingType)
         val expandedProjection = expandTypeProjection(originalProjection, typeAliasExpansion, null, recursionDepth)
-        val expandedType = expandedProjection.type
+        val expandedType = expandedProjection.type.asSimpleType()
 
         if (expandedType.isError) return expandedType
 
@@ -54,7 +54,7 @@ class TypeAliasExpander(
                                                                originalProjection.type.isMarkedNullable,
                                                                MemberScope.Empty)
 
-            expandedType.withAbbreviatedType(abbreviatedType)
+            expandedType.withAbbreviation(abbreviatedType)
         }
         else {
             expandedType
@@ -111,7 +111,7 @@ class TypeAliasExpander(
             typeAliasExpansion: TypeAliasExpansion,
             recursionDepth: Int
     ): TypeProjection {
-        val type = originalProjection.type
+        val type = originalProjection.type.asSimpleType()
 
         if (type.isError || !type.requiresTypeAliasExpansion()) {
             return originalProjection
@@ -141,7 +141,7 @@ class TypeAliasExpander(
                 val expandedType = expandRecursively(nestedExpansion, type.annotations, recursionDepth + 1, false)
 
                 // 'dynamic' type can't be abbreviated - will be reported separately
-                val typeWithAbbreviation = if (expandedType.isDynamic()) expandedType else expandedType.withAbbreviatedType(type)
+                val typeWithAbbreviation = if (expandedType.isDynamic()) expandedType else expandedType.withAbbreviation(type)
 
                 return TypeProjectionImpl(originalProjection.projectionKind, typeWithAbbreviation)
             }