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

[IR] Fix rebase

Browse Source
This commit is contained in:
Roman Artemev
2019-08-08 15:39:27 +03:00
committed by romanart
parent d50eb5ce52
commit ea42eb6a5c
8 changed files with 83 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/KotlinIr.proto
+3 -3
View File
@@ -188,7 +188,7 @@ message IrSimpleType {
message IrTypeAbbreviation {
required Annotations annotations = 1;
required IrSymbol type_alias = 2;
required IrDataIndex type_alias = 2;
required bool has_question_mark = 3;
repeated IrTypeArgument argument = 4;
}
@@ -677,10 +677,10 @@ message IrClass {
message IrTypeAlias {
required IrDeclarationBase base = 1;
required String name = 2;
required IrDataIndex name = 2;
required Visibility visibility = 3;
required IrTypeParameterContainer type_parameters = 4;
required IrTypeIndex expanded_type = 5;
required IrDataIndex expanded_type = 5;
required bool is_actual = 6;
}
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
+5
View File
@@ -228,6 +228,11 @@ abstract class KotlinIrLinker(
descriptor as FunctionDescriptor?
?: WrappedSimpleFunctionDescriptor()
)
ProtoSymbolKind.TYPEALIAS_SYMBOL ->
symbolTable.referenceTypeAlias(
descriptor as TypeAliasDescriptor?
?: WrappedTypeAliasDescriptor()
)
ProtoSymbolKind.VARIABLE_SYMBOL ->
IrVariableSymbolImpl(
descriptor as VariableDescriptor?
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/DescriptorReference.java
-24
View File
@@ -348,20 +348,12 @@ public final class DescriptorReference extends
private boolean isTypeParameter_;
/**
* <code>optional bool is_type_parameter = 12 [default = false];</code>
*
* <pre>
* TODO optional bool is_type_alias = 13 [default = false];
* </pre>
*/
public boolean hasIsTypeParameter() {
return ((bitField0_ & 0x00000800) == 0x00000800);
}
/**
* <code>optional bool is_type_parameter = 12 [default = false];</code>
*
* <pre>
* TODO optional bool is_type_alias = 13 [default = false];
* </pre>
*/
public boolean getIsTypeParameter() {
return isTypeParameter_;
@@ -1273,30 +1265,18 @@ public final class DescriptorReference extends
private boolean isTypeParameter_ ;
/**
* <code>optional bool is_type_parameter = 12 [default = false];</code>
*
* <pre>
* TODO optional bool is_type_alias = 13 [default = false];
* </pre>
*/
public boolean hasIsTypeParameter() {
return ((bitField0_ & 0x00000800) == 0x00000800);
}
/**
* <code>optional bool is_type_parameter = 12 [default = false];</code>
*
* <pre>
* TODO optional bool is_type_alias = 13 [default = false];
* </pre>
*/
public boolean getIsTypeParameter() {
return isTypeParameter_;
}
/**
* <code>optional bool is_type_parameter = 12 [default = false];</code>
*
* <pre>
* TODO optional bool is_type_alias = 13 [default = false];
* </pre>
*/
public Builder setIsTypeParameter(boolean value) {
bitField0_ |= 0x00000800;
@@ -1306,10 +1286,6 @@ public final class DescriptorReference extends
}
/**
* <code>optional bool is_type_parameter = 12 [default = false];</code>
*
* <pre>
* TODO optional bool is_type_alias = 13 [default = false];
* </pre>
*/
public Builder clearIsTypeParameter() {
bitField0_ = (bitField0_ & ~0x00000800);
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/DescriptorReferenceOrBuilder.java
-8
View File
@@ -108,18 +108,10 @@ public interface DescriptorReferenceOrBuilder extends
/**
* <code>optional bool is_type_parameter = 12 [default = false];</code>
*
* <pre>
* TODO optional bool is_type_alias = 13 [default = false];
* </pre>
*/
boolean hasIsTypeParameter();
/**
* <code>optional bool is_type_parameter = 12 [default = false];</code>
*
* <pre>
* TODO optional bool is_type_alias = 13 [default = false];
* </pre>
*/
boolean getIsTypeParameter();
}
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeAbbreviation.java
+22 -22
View File
@@ -67,11 +67,11 @@ public final class IrTypeAbbreviation extends
break;
}
case 18: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol.Builder subBuilder = null;
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = typeAlias_.toBuilder();
}
typeAlias_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol.PARSER, extensionRegistry);
typeAlias_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(typeAlias_);
typeAlias_ = subBuilder.buildPartial();
@@ -145,17 +145,17 @@ public final class IrTypeAbbreviation extends
}
public static final int TYPE_ALIAS_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol typeAlias_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex typeAlias_;
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol type_alias = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code>
*/
public boolean hasTypeAlias() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol type_alias = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code>
*/
public org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol getTypeAlias() {
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getTypeAlias() {
return typeAlias_;
}
@@ -211,7 +211,7 @@ public final class IrTypeAbbreviation extends
private void initFields() {
annotations_ = org.jetbrains.kotlin.backend.common.serialization.proto.Annotations.getDefaultInstance();
typeAlias_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol.getDefaultInstance();
typeAlias_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
hasQuestionMark_ = false;
argument_ = java.util.Collections.emptyList();
}
@@ -387,7 +387,7 @@ public final class IrTypeAbbreviation extends
super.clear();
annotations_ = org.jetbrains.kotlin.backend.common.serialization.proto.Annotations.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001);
typeAlias_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol.getDefaultInstance();
typeAlias_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002);
hasQuestionMark_ = false;
bitField0_ = (bitField0_ & ~0x00000004);
@@ -572,23 +572,23 @@ public final class IrTypeAbbreviation extends
return this;
}
private org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol typeAlias_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol.getDefaultInstance();
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex typeAlias_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol type_alias = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code>
*/
public boolean hasTypeAlias() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol type_alias = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code>
*/
public org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol getTypeAlias() {
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getTypeAlias() {
return typeAlias_;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol type_alias = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code>
*/
public Builder setTypeAlias(org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol value) {
public Builder setTypeAlias(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
@@ -598,23 +598,23 @@ public final class IrTypeAbbreviation extends
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol type_alias = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code>
*/
public Builder setTypeAlias(
org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol.Builder builderForValue) {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
typeAlias_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol type_alias = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code>
*/
public Builder mergeTypeAlias(org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol value) {
public Builder mergeTypeAlias(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
typeAlias_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol.getDefaultInstance()) {
typeAlias_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
typeAlias_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol.newBuilder(typeAlias_).mergeFrom(value).buildPartial();
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(typeAlias_).mergeFrom(value).buildPartial();
} else {
typeAlias_ = value;
}
@@ -623,10 +623,10 @@ public final class IrTypeAbbreviation extends
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol type_alias = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code>
*/
public Builder clearTypeAlias() {
typeAlias_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol.getDefaultInstance();
typeAlias_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002);
return this;
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeAbbreviationOrBuilder.java
+3 -3
View File
@@ -17,13 +17,13 @@ public interface IrTypeAbbreviationOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.Annotations getAnnotations();
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol type_alias = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code>
*/
boolean hasTypeAlias();
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol type_alias = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code>
*/
org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbol getTypeAlias();
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getTypeAlias();
/**
* <code>required bool has_question_mark = 3;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeAlias.java
+44 -44
View File
@@ -67,11 +67,11 @@ public final class IrTypeAlias extends
break;
}
case 18: {
org.jetbrains.kotlin.backend.common.serialization.proto.String.Builder subBuilder = null;
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.String.PARSER, extensionRegistry);
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
@@ -106,11 +106,11 @@ public final class IrTypeAlias extends
break;
}
case 42: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex.Builder subBuilder = null;
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000010) == 0x00000010)) {
subBuilder = expandedType_.toBuilder();
}
expandedType_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex.PARSER, extensionRegistry);
expandedType_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(expandedType_);
expandedType_ = subBuilder.buildPartial();
@@ -173,17 +173,17 @@ public final class IrTypeAlias extends
}
public static final int NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.String name_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_;
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.String name = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.String name = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public org.jetbrains.kotlin.backend.common.serialization.proto.String getName() {
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() {
return name_;
}
@@ -218,17 +218,17 @@ public final class IrTypeAlias extends
}
public static final int EXPANDED_TYPE_FIELD_NUMBER = 5;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex expandedType_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expandedType_;
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex expanded_type = 5;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code>
*/
public boolean hasExpandedType() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex expanded_type = 5;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code>
*/
public org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex getExpandedType() {
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getExpandedType() {
return expandedType_;
}
@@ -249,10 +249,10 @@ public final class IrTypeAlias extends
private void initFields() {
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.String.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance();
typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameterContainer.getDefaultInstance();
expandedType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex.getDefaultInstance();
expandedType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
isActual_ = false;
}
private byte memoizedIsInitialized = -1;
@@ -459,13 +459,13 @@ public final class IrTypeAlias extends
super.clear();
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001);
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.String.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002);
visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004);
typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameterContainer.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000008);
expandedType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex.getDefaultInstance();
expandedType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000010);
isActual_ = false;
bitField0_ = (bitField0_ & ~0x00000020);
@@ -672,23 +672,23 @@ public final class IrTypeAlias extends
return this;
}
private org.jetbrains.kotlin.backend.common.serialization.proto.String name_ = org.jetbrains.kotlin.backend.common.serialization.proto.String.getDefaultInstance();
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.String name = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.String name = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public org.jetbrains.kotlin.backend.common.serialization.proto.String getName() {
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() {
return name_;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.String name = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.String value) {
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
@@ -698,23 +698,23 @@ public final class IrTypeAlias extends
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.String name = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.String.Builder builderForValue) {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.String name = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.String value) {
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.String.getDefaultInstance()) {
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.String.newBuilder(name_).mergeFrom(value).buildPartial();
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
@@ -723,10 +723,10 @@ public final class IrTypeAlias extends
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.String name = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.String.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002);
return this;
@@ -852,23 +852,23 @@ public final class IrTypeAlias extends
return this;
}
private org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex expandedType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex.getDefaultInstance();
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expandedType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex expanded_type = 5;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code>
*/
public boolean hasExpandedType() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex expanded_type = 5;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code>
*/
public org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex getExpandedType() {
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getExpandedType() {
return expandedType_;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex expanded_type = 5;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code>
*/
public Builder setExpandedType(org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex value) {
public Builder setExpandedType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
@@ -878,23 +878,23 @@ public final class IrTypeAlias extends
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex expanded_type = 5;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code>
*/
public Builder setExpandedType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex.Builder builderForValue) {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
expandedType_ = builderForValue.build();
bitField0_ |= 0x00000010;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex expanded_type = 5;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code>
*/
public Builder mergeExpandedType(org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex value) {
public Builder mergeExpandedType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000010) == 0x00000010) &&
expandedType_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex.getDefaultInstance()) {
expandedType_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
expandedType_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex.newBuilder(expandedType_).mergeFrom(value).buildPartial();
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(expandedType_).mergeFrom(value).buildPartial();
} else {
expandedType_ = value;
}
@@ -903,10 +903,10 @@ public final class IrTypeAlias extends
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex expanded_type = 5;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code>
*/
public Builder clearExpandedType() {
expandedType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex.getDefaultInstance();
expandedType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000010);
return this;
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeAliasOrBuilder.java
+6 -6
View File
@@ -17,13 +17,13 @@ public interface IrTypeAliasOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase();
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.String name = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
boolean hasName();
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.String name = 2;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
org.jetbrains.kotlin.backend.common.serialization.proto.String getName();
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName();
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.Visibility visibility = 3;</code>
@@ -44,13 +44,13 @@ public interface IrTypeAliasOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameterContainer getTypeParameters();
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex expanded_type = 5;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code>
*/
boolean hasExpandedType();
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex expanded_type = 5;</code>
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code>
*/
org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeIndex getExpandedType();
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getExpandedType();
/**
* <code>required bool is_actual = 6;</code>