From c5e9deb906f2382f8ceb8f6aeb6f4158959b4a4b Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 13 Nov 2012 12:43:54 +0400
Subject: [PATCH] Reverted modification in TypeTransformingVisitor in "Renamed
 & moved AllInjectorsGenerator".

It was not relevant to that commit: it was squashed accidentally during interactive rebasing.
---
 .../java/kotlinSignature/TypeTransformingVisitor.java     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
index 6f79c65a2d0..9dceb8119c8 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
@@ -124,9 +124,9 @@ class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
             TypeProjection argument = arguments.get(i);
             JetType alternativeType = computeType(argumentAlternativeTypeElement, argument.getType(), originalToAltTypeParameters);
             Variance variance = argument.getProjectionKind();
-            Variance altVariance;
             if (type instanceof JetUserType) {
                 JetTypeProjection typeProjection = ((JetUserType) type).getTypeArguments().get(i);
+                Variance altVariance = Variance.INVARIANT;
                 switch (typeProjection.getProjectionKind()) {
                     case IN:
                         altVariance = Variance.IN_VARIANCE;
@@ -137,16 +137,12 @@ class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
                     case STAR:
                         throw new AlternativeSignatureMismatchException("Star projection is not available in alternative signatures");
                     default:
-                        altVariance = Variance.INVARIANT;
                 }
                 if (altVariance != variance && variance != Variance.INVARIANT) {
                     throw new AlternativeSignatureMismatchException("Variance mismatch, actual: %s, in alternative signature: %s", variance, altVariance);
                 }
             }
-            else {
-                altVariance = variance;
-            }
-            altArguments.add(new TypeProjection(altVariance, alternativeType));
+            altArguments.add(new TypeProjection(variance, alternativeType));
         }
 
         TypeConstructor typeConstructor;