From c6cb5175a4f5147d35cf9cbb613a3a55aa7b5dca Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 25 Apr 2016 19:39:05 +0300 Subject: [PATCH] Minor. Use capability instead of capabilities. --- .../codegen/serialization/JvmSerializerExtension.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java index 0a1a2e46405..3478baefc44 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.load.java.lazy.types.RawTypeCapabilities; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.serialization.AnnotationSerializer; import org.jetbrains.kotlin.serialization.ProtoBuf; @@ -32,6 +31,7 @@ import org.jetbrains.kotlin.serialization.StringTable; import org.jetbrains.kotlin.serialization.jvm.ClassMapperLite; import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; import org.jetbrains.kotlin.types.KotlinType; +import org.jetbrains.kotlin.types.RawTypeCapability; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.Method; @@ -84,7 +84,7 @@ public class JvmSerializerExtension extends SerializerExtension { proto.addExtension(JvmProtoBuf.typeAnnotation, annotationSerializer.serializeAnnotation(annotation)); } - if (type.getCapabilities() instanceof RawTypeCapabilities) { + if (type.getCapability(RawTypeCapability.class) != null) { proto.setExtension(JvmProtoBuf.isRaw, true); } }