azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't write default upper bound for type parameters in protobuf

Browse Source
This commit is contained in:
Alexander Udalov
2015-09-23 16:45:51 +03:00
parent 6a8d0fbd75
commit ccf72668e0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+6 -5
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.serialization; package org.jetbrains.kotlin.serialization;
import com.google.protobuf.MessageLite; import com.google.protobuf.MessageLite;
import kotlin.KotlinPackage;
import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -34,10 +35,7 @@ import org.jetbrains.kotlin.utils.UtilsPackage;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry;
import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getSecondaryConstructors; import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getSecondaryConstructors;
@@ -320,7 +318,10 @@ public class DescriptorSerializer {
builder.setVariance(variance); builder.setVariance(variance);
} }
for (JetType upperBound : typeParameter.getUpperBounds()) { Set<JetType> upperBounds = typeParameter.getUpperBounds();
if (upperBounds.size() == 1 && KotlinBuiltIns.isDefaultBound(KotlinPackage.single(upperBounds))) return builder;
for (JetType upperBound : upperBounds) {
builder.addUpperBound(type(upperBound)); builder.addUpperBound(type(upperBound));
} }