From 4c689bc328d3fca6d9a4f190b275396a1ff3a4cf Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Wed, 15 May 2013 20:31:49 +0400
Subject: [PATCH] Better processing of upper bounds

---
 .../serialization/DescriptorDeserializer.java          | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
index a47d37d5097..59ac544722b 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
@@ -246,14 +246,10 @@ public class DescriptorDeserializer {
     }
 
     private void addTypeParameterBounds(TypeParameter proto, TypeParameterDescriptorImpl descriptor) {
-        if (proto.getUpperBoundsCount() == 0) {
-            descriptor.addDefaultUpperBound();
-        }
-        else {
-            for (Type upperBound : proto.getUpperBoundsList()) {
-                descriptor.addUpperBound(typeDeserializer.type(upperBound));
-            }
+        for (Type upperBound : proto.getUpperBoundsList()) {
+            descriptor.addUpperBound(typeDeserializer.type(upperBound));
         }
+        descriptor.addDefaultUpperBound();
         descriptor.setInitialized();
     }