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

Update konan.proto to be consistent with kotlin-native repo

Browse Source 
See https://github.com/JetBrains/kotlin-native/pull/2278
This commit is contained in:
Alexander Udalov
2018-10-31 13:19:01 +01:00
parent 9bc1dbb5bc
commit 38aad20231
3 changed files with 510 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/test/org/jetbrains/kotlin/metadata/konan/DebugKonanProtoBuf.java
+284 -71
View File
@@ -13,6 +13,7 @@ public final class DebugKonanProtoBuf {
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.inlineConstructorIrBody);
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.functionAnnotation);
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.inlineIrBody);
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.functionFile);
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.propertyAnnotation);
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.propertyGetterAnnotation);
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.propertySetterAnnotation);
@@ -21,6 +22,7 @@ public final class DebugKonanProtoBuf {
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.compileTimeValue);
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.inlineGetterIrBody);
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.inlineSetterIrBody);
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.propertyFile);
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.enumEntryAnnotation);
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.enumEntryOrdinal);
registry.add(org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.parameterAnnotation);
@@ -3060,6 +3062,25 @@ public final class DebugKonanProtoBuf {
*/
org.jetbrains.kotlin.protobuf.ByteString
getEmptyPackageBytes(int index);
/**
* <code>repeated string file = 4;</code>
*/
org.jetbrains.kotlin.protobuf.ProtocolStringList
getFileList();
/**
* <code>repeated string file = 4;</code>
*/
int getFileCount();
/**
* <code>repeated string file = 4;</code>
*/
java.lang.String getFile(int index);
/**
* <code>repeated string file = 4;</code>
*/
org.jetbrains.kotlin.protobuf.ByteString
getFileBytes(int index);
}
/**
* Protobuf type {@code org.jetbrains.kotlin.metadata.konan.LinkDataLibrary}
@@ -3137,6 +3158,15 @@ public final class DebugKonanProtoBuf {
emptyPackage_.add(bs);
break;
}
case 34: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
file_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000008;
}
file_.add(bs);
break;
}
}
}
} catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
@@ -3151,6 +3181,9 @@ public final class DebugKonanProtoBuf {
if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
emptyPackage_ = emptyPackage_.getUnmodifiableView();
}
if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
file_ = file_.getUnmodifiableView();
}
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
@@ -3283,10 +3316,40 @@ public final class DebugKonanProtoBuf {
return emptyPackage_.getByteString(index);
}
public static final int FILE_FIELD_NUMBER = 4;
private org.jetbrains.kotlin.protobuf.LazyStringList file_;
/**
* <code>repeated string file = 4;</code>
*/
public org.jetbrains.kotlin.protobuf.ProtocolStringList
getFileList() {
return file_;
}
/**
* <code>repeated string file = 4;</code>
*/
public int getFileCount() {
return file_.size();
}
/**
* <code>repeated string file = 4;</code>
*/
public java.lang.String getFile(int index) {
return file_.get(index);
}
/**
* <code>repeated string file = 4;</code>
*/
public org.jetbrains.kotlin.protobuf.ByteString
getFileBytes(int index) {
return file_.getByteString(index);
}
private void initFields() {
moduleName_ = "";
packageFragmentName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
emptyPackage_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
file_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -3314,6 +3377,9 @@ public final class DebugKonanProtoBuf {
for (int i = 0; i < emptyPackage_.size(); i++) {
output.writeBytes(3, emptyPackage_.getByteString(i));
}
for (int i = 0; i < file_.size(); i++) {
output.writeBytes(4, file_.getByteString(i));
}
getUnknownFields().writeTo(output);
}
@@ -3345,6 +3411,15 @@ public final class DebugKonanProtoBuf {
size += dataSize;
size += 1 * getEmptyPackageList().size();
}
{
int dataSize = 0;
for (int i = 0; i < file_.size(); i++) {
dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeBytesSizeNoTag(file_.getByteString(i));
}
size += dataSize;
size += 1 * getFileList().size();
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -3468,6 +3543,8 @@ public final class DebugKonanProtoBuf {
bitField0_ = (bitField0_ & ~0x00000002);
emptyPackage_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000004);
file_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
@@ -3510,6 +3587,11 @@ public final class DebugKonanProtoBuf {
bitField0_ = (bitField0_ & ~0x00000004);
}
result.emptyPackage_ = emptyPackage_;
if (((bitField0_ & 0x00000008) == 0x00000008)) {
file_ = file_.getUnmodifiableView();
bitField0_ = (bitField0_ & ~0x00000008);
}
result.file_ = file_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -3551,6 +3633,16 @@ public final class DebugKonanProtoBuf {
}
onChanged();
}
if (!other.file_.isEmpty()) {
if (file_.isEmpty()) {
file_ = other.file_;
bitField0_ = (bitField0_ & ~0x00000008);
} else {
ensureFileIsMutable();
file_.addAll(other.file_);
}
onChanged();
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -3844,6 +3936,99 @@ public final class DebugKonanProtoBuf {
return this;
}
private org.jetbrains.kotlin.protobuf.LazyStringList file_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureFileIsMutable() {
if (!((bitField0_ & 0x00000008) == 0x00000008)) {
file_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(file_);
bitField0_ |= 0x00000008;
}
}
/**
* <code>repeated string file = 4;</code>
*/
public org.jetbrains.kotlin.protobuf.ProtocolStringList
getFileList() {
return file_.getUnmodifiableView();
}
/**
* <code>repeated string file = 4;</code>
*/
public int getFileCount() {
return file_.size();
}
/**
* <code>repeated string file = 4;</code>
*/
public java.lang.String getFile(int index) {
return file_.get(index);
}
/**
* <code>repeated string file = 4;</code>
*/
public org.jetbrains.kotlin.protobuf.ByteString
getFileBytes(int index) {
return file_.getByteString(index);
}
/**
* <code>repeated string file = 4;</code>
*/
public Builder setFile(
int index, java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
ensureFileIsMutable();
file_.set(index, value);
onChanged();
return this;
}
/**
* <code>repeated string file = 4;</code>
*/
public Builder addFile(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
ensureFileIsMutable();
file_.add(value);
onChanged();
return this;
}
/**
* <code>repeated string file = 4;</code>
*/
public Builder addAllFile(
java.lang.Iterable<java.lang.String> values) {
ensureFileIsMutable();
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, file_);
onChanged();
return this;
}
/**
* <code>repeated string file = 4;</code>
*/
public Builder clearFile() {
file_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000008);
onChanged();
return this;
}
/**
* <code>repeated string file = 4;</code>
*/
public Builder addFileBytes(
org.jetbrains.kotlin.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
ensureFileIsMutable();
file_.add(value);
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.konan.LinkDataLibrary)
}
@@ -3921,6 +4106,17 @@ public final class DebugKonanProtoBuf {
.newFileScopedGeneratedExtension(
org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.InlineIrBody.class,
org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.InlineIrBody.getDefaultInstance());
public static final int FUNCTION_FILE_FIELD_NUMBER = 172;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Function { ... }</code>
*/
public static final
org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
org.jetbrains.kotlin.metadata.DebugProtoBuf.Function,
java.lang.Integer> functionFile = org.jetbrains.kotlin.protobuf.GeneratedMessage
.newFileScopedGeneratedExtension(
java.lang.Integer.class,
null);
public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 170;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
@@ -3932,7 +4128,7 @@ public final class DebugKonanProtoBuf {
.newFileScopedGeneratedExtension(
org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
public static final int PROPERTY_GETTER_ANNOTATION_FIELD_NUMBER = 176;
public static final int PROPERTY_GETTER_ANNOTATION_FIELD_NUMBER = 177;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
*/
@@ -3943,7 +4139,7 @@ public final class DebugKonanProtoBuf {
.newFileScopedGeneratedExtension(
org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
public static final int PROPERTY_SETTER_ANNOTATION_FIELD_NUMBER = 177;
public static final int PROPERTY_SETTER_ANNOTATION_FIELD_NUMBER = 178;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
*/
@@ -4009,6 +4205,17 @@ public final class DebugKonanProtoBuf {
.newFileScopedGeneratedExtension(
org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.InlineIrBody.class,
org.jetbrains.kotlin.metadata.konan.DebugKonanProtoBuf.InlineIrBody.getDefaultInstance());
public static final int PROPERTY_FILE_FIELD_NUMBER = 176;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
*/
public static final
org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
java.lang.Integer> propertyFile = org.jetbrains.kotlin.protobuf.GeneratedMessage
.newFileScopedGeneratedExtension(
java.lang.Integer.class,
null);
public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 170;
/**
* <code>extend .org.jetbrains.kotlin.metadata.EnumEntry { ... }</code>
@@ -4122,63 +4329,67 @@ public final class DebugKonanProtoBuf {
"\0132*.org.jetbrains.kotlin.metadata.String" +
"Table\"\\\n\017LinkDataClasses\022\022\n\nclass_name\030\001" +
" \003(\005\0225\n\007classes\030\002 \003(\0132$.org.jetbrains.ko" +
"tlin.metadata.Class\"\\\n\017LinkDataLibrary\022\023" +
"tlin.metadata.Class\"j\n\017LinkDataLibrary\022\023" +
"\n\013module_name\030\001 \002(\t\022\035\n\025package_fragment_" +
"name\030\002 \003(\t\022\025\n\rempty_package\030\003 \003(\t:@\n\017pac" +
"kage_fq_name\022&.org.jetbrains.kotlin.meta" +
"data.Package\030\253\001 \001(\005:j\n\020class_annotation\022" +
"$.org.jetbrains.kotlin.metadata.Class\030\252\001",
" \003(\0132).org.jetbrains.kotlin.metadata.Ann" +
"otation:v\n\026constructor_annotation\022*.org." +
"jetbrains.kotlin.metadata.Constructor\030\252\001" +
" \003(\0132).org.jetbrains.kotlin.metadata.Ann" +
"otation:\202\001\n\032inline_constructor_ir_body\022*" +
".org.jetbrains.kotlin.metadata.Construct" +
"or\030\253\001 \001(\01321.org.jetbrains.kotlin.metadat" +
"a.konan.InlineIrBody:p\n\023function_annotat" +
"ion\022\'.org.jetbrains.kotlin.metadata.Func" +
"tion\030\252\001 \003(\0132).org.jetbrains.kotlin.metad",
"ata.Annotation:s\n\016inline_ir_body\022\'.org.j" +
"etbrains.kotlin.metadata.Function\030\253\001 \001(\013" +
"21.org.jetbrains.kotlin.metadata.konan.I" +
"nlineIrBody:p\n\023property_annotation\022\'.org" +
".jetbrains.kotlin.metadata.Property\030\252\001 \003" +
"name\030\002 \003(\t\022\025\n\rempty_package\030\003 \003(\t\022\014\n\004fil" +
"e\030\004 \003(\t:@\n\017package_fq_name\022&.org.jetbrai" +
"ns.kotlin.metadata.Package\030\253\001 \001(\005:j\n\020cla" +
"ss_annotation\022$.org.jetbrains.kotlin.met",
"adata.Class\030\252\001 \003(\0132).org.jetbrains.kotli" +
"n.metadata.Annotation:v\n\026constructor_ann" +
"otation\022*.org.jetbrains.kotlin.metadata." +
"Constructor\030\252\001 \003(\0132).org.jetbrains.kotli" +
"n.metadata.Annotation:\202\001\n\032inline_constru" +
"ctor_ir_body\022*.org.jetbrains.kotlin.meta" +
"data.Constructor\030\253\001 \001(\01321.org.jetbrains." +
"kotlin.metadata.konan.InlineIrBody:p\n\023fu" +
"nction_annotation\022\'.org.jetbrains.kotlin" +
".metadata.Function\030\252\001 \003(\0132).org.jetbrain",
"s.kotlin.metadata.Annotation:s\n\016inline_i" +
"r_body\022\'.org.jetbrains.kotlin.metadata.F" +
"unction\030\253\001 \001(\01321.org.jetbrains.kotlin.me" +
"tadata.konan.InlineIrBody:?\n\rfunction_fi" +
"le\022\'.org.jetbrains.kotlin.metadata.Funct" +
"ion\030\254\001 \001(\005:p\n\023property_annotation\022\'.org." +
"jetbrains.kotlin.metadata.Property\030\252\001 \003(" +
"\0132).org.jetbrains.kotlin.metadata.Annota" +
"tion:w\n\032property_getter_annotation\022\'.org" +
".jetbrains.kotlin.metadata.Property\030\261\001 \003",
"(\0132).org.jetbrains.kotlin.metadata.Annot" +
"ation:w\n\032property_getter_annotation\022\'.or" +
"g.jetbrains.kotlin.metadata.Property\030\260\001 " +
"ation:w\n\032property_setter_annotation\022\'.or" +
"g.jetbrains.kotlin.metadata.Property\030\262\001 " +
"\003(\0132).org.jetbrains.kotlin.metadata.Anno" +
"tation:w\n\032property_setter_annotation\022\'.o",
"rg.jetbrains.kotlin.metadata.Property\030\261\001" +
" \003(\0132).org.jetbrains.kotlin.metadata.Ann" +
"otation:C\n\021has_backing_field\022\'.org.jetbr" +
"ains.kotlin.metadata.Property\030\253\001 \001(\010:B\n\020" +
"used_as_variable\022\'.org.jetbrains.kotlin." +
"metadata.Property\030\254\001 \001(\010:~\n\022compile_time" +
"_value\022\'.org.jetbrains.kotlin.metadata.P" +
"roperty\030\255\001 \001(\01328.org.jetbrains.kotlin.me" +
"tadata.Annotation.Argument.Value:z\n\025inli" +
"ne_getter_ir_body\022\'.org.jetbrains.kotlin",
".metadata.Property\030\256\001 \001(\01321.org.jetbrain" +
"s.kotlin.metadata.konan.InlineIrBody:z\n\025" +
"inline_setter_ir_body\022\'.org.jetbrains.ko" +
"tlin.metadata.Property\030\257\001 \001(\01321.org.jetb" +
"rains.kotlin.metadata.konan.InlineIrBody" +
":s\n\025enum_entry_annotation\022(.org.jetbrain" +
"s.kotlin.metadata.EnumEntry\030\252\001 \003(\0132).org" +
".jetbrains.kotlin.metadata.Annotation:E\n" +
"\022enum_entry_ordinal\022(.org.jetbrains.kotl" +
"in.metadata.EnumEntry\030\253\001 \001(\005:w\n\024paramete",
"r_annotation\022-.org.jetbrains.kotlin.meta" +
"data.ValueParameter\030\252\001 \003(\0132).org.jetbrai" +
"ns.kotlin.metadata.Annotation:h\n\017type_an" +
"notation\022#.org.jetbrains.kotlin.metadata" +
".Type\030\252\001 \003(\0132).org.jetbrains.kotlin.meta" +
"data.Annotation:7\n\ttype_text\022#.org.jetbr" +
"ains.kotlin.metadata.Type\030\254\001 \001(\t:{\n\031type" +
"_parameter_annotation\022,.org.jetbrains.ko" +
"tlin.metadata.TypeParameter\030\252\001 \003(\0132).org" +
".jetbrains.kotlin.metadata.AnnotationB\024B",
"\022DebugKonanProtoBuf"
"tation:C\n\021has_backing_field\022\'.org.jetbra" +
"ins.kotlin.metadata.Property\030\253\001 \001(\010:B\n\020u" +
"sed_as_variable\022\'.org.jetbrains.kotlin.m" +
"etadata.Property\030\254\001 \001(\010:~\n\022compile_time_" +
"value\022\'.org.jetbrains.kotlin.metadata.Pr" +
"operty\030\255\001 \001(\01328.org.jetbrains.kotlin.met",
"adata.Annotation.Argument.Value:z\n\025inlin" +
"e_getter_ir_body\022\'.org.jetbrains.kotlin." +
"metadata.Property\030\256\001 \001(\01321.org.jetbrains" +
".kotlin.metadata.konan.InlineIrBody:z\n\025i" +
"nline_setter_ir_body\022\'.org.jetbrains.kot" +
"lin.metadata.Property\030\257\001 \001(\01321.org.jetbr" +
"ains.kotlin.metadata.konan.InlineIrBody:" +
"?\n\rproperty_file\022\'.org.jetbrains.kotlin." +
"metadata.Property\030\260\001 \001(\005:s\n\025enum_entry_a" +
"nnotation\022(.org.jetbrains.kotlin.metadat",
"a.EnumEntry\030\252\001 \003(\0132).org.jetbrains.kotli" +
"n.metadata.Annotation:E\n\022enum_entry_ordi" +
"nal\022(.org.jetbrains.kotlin.metadata.Enum" +
"Entry\030\253\001 \001(\005:w\n\024parameter_annotation\022-.o" +
"rg.jetbrains.kotlin.metadata.ValueParame" +
"ter\030\252\001 \003(\0132).org.jetbrains.kotlin.metada" +
"ta.Annotation:h\n\017type_annotation\022#.org.j" +
"etbrains.kotlin.metadata.Type\030\252\001 \003(\0132).o" +
"rg.jetbrains.kotlin.metadata.Annotation:" +
"7\n\ttype_text\022#.org.jetbrains.kotlin.meta",
"data.Type\030\254\001 \001(\t:{\n\031type_parameter_annot" +
"ation\022,.org.jetbrains.kotlin.metadata.Ty" +
"peParameter\030\252\001 \003(\0132).org.jetbrains.kotli" +
"n.metadata.AnnotationB\024B\022DebugKonanProto" +
"Buf"
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
@@ -4216,27 +4427,29 @@ public final class DebugKonanProtoBuf {
internal_static_org_jetbrains_kotlin_metadata_konan_LinkDataLibrary_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_metadata_konan_LinkDataLibrary_descriptor,
new java.lang.String[] { "ModuleName", "PackageFragmentName", "EmptyPackage", });
new java.lang.String[] { "ModuleName", "PackageFragmentName", "EmptyPackage", "File", });
packageFqName.internalInit(descriptor.getExtensions().get(0));
classAnnotation.internalInit(descriptor.getExtensions().get(1));
constructorAnnotation.internalInit(descriptor.getExtensions().get(2));
inlineConstructorIrBody.internalInit(descriptor.getExtensions().get(3));
functionAnnotation.internalInit(descriptor.getExtensions().get(4));
inlineIrBody.internalInit(descriptor.getExtensions().get(5));
propertyAnnotation.internalInit(descriptor.getExtensions().get(6));
propertyGetterAnnotation.internalInit(descriptor.getExtensions().get(7));
propertySetterAnnotation.internalInit(descriptor.getExtensions().get(8));
hasBackingField.internalInit(descriptor.getExtensions().get(9));
usedAsVariable.internalInit(descriptor.getExtensions().get(10));
compileTimeValue.internalInit(descriptor.getExtensions().get(11));
inlineGetterIrBody.internalInit(descriptor.getExtensions().get(12));
inlineSetterIrBody.internalInit(descriptor.getExtensions().get(13));
enumEntryAnnotation.internalInit(descriptor.getExtensions().get(14));
enumEntryOrdinal.internalInit(descriptor.getExtensions().get(15));
parameterAnnotation.internalInit(descriptor.getExtensions().get(16));
typeAnnotation.internalInit(descriptor.getExtensions().get(17));
typeText.internalInit(descriptor.getExtensions().get(18));
typeParameterAnnotation.internalInit(descriptor.getExtensions().get(19));
functionFile.internalInit(descriptor.getExtensions().get(6));
propertyAnnotation.internalInit(descriptor.getExtensions().get(7));
propertyGetterAnnotation.internalInit(descriptor.getExtensions().get(8));
propertySetterAnnotation.internalInit(descriptor.getExtensions().get(9));
hasBackingField.internalInit(descriptor.getExtensions().get(10));
usedAsVariable.internalInit(descriptor.getExtensions().get(11));
compileTimeValue.internalInit(descriptor.getExtensions().get(12));
inlineGetterIrBody.internalInit(descriptor.getExtensions().get(13));
inlineSetterIrBody.internalInit(descriptor.getExtensions().get(14));
propertyFile.internalInit(descriptor.getExtensions().get(15));
enumEntryAnnotation.internalInit(descriptor.getExtensions().get(16));
enumEntryOrdinal.internalInit(descriptor.getExtensions().get(17));
parameterAnnotation.internalInit(descriptor.getExtensions().get(18));
typeAnnotation.internalInit(descriptor.getExtensions().get(19));
typeText.internalInit(descriptor.getExtensions().get(20));
typeParameterAnnotation.internalInit(descriptor.getExtensions().get(21));
org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor();
}
konan/library-reader/src/konan.proto
+5 -3
View File
@@ -30,17 +30,19 @@ extend Constructor {
extend Function {
repeated Annotation function_annotation = 170;
optional InlineIrBody inline_ir_body = 171;
optional int32 function_file = 172;
}
extend Property {
repeated Annotation property_annotation = 170;
repeated Annotation property_getter_annotation = 176;
repeated Annotation property_setter_annotation = 177;
repeated Annotation property_getter_annotation = 177;
repeated Annotation property_setter_annotation = 178;
optional bool has_backing_field = 171;
optional bool used_as_variable = 172;
optional Annotation.Argument.Value compile_time_value = 173;
optional InlineIrBody inline_getter_ir_body = 174;
optional InlineIrBody inline_setter_ir_body = 175;
optional int32 property_file = 176;
}
extend EnumEntry {
@@ -95,5 +97,5 @@ message LinkDataLibrary {
required string module_name = 1;
repeated string package_fragment_name = 2;
repeated string empty_package = 3;
repeated string file = 4;
}
konan/library-reader/src/org/jetbrains/kotlin/metadata/konan/KonanProtoBuf.java
+221 -4
View File
@@ -13,6 +13,7 @@ public final class KonanProtoBuf {
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.inlineConstructorIrBody);
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.functionAnnotation);
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.inlineIrBody);
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.functionFile);
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.propertyAnnotation);
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.propertyGetterAnnotation);
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.propertySetterAnnotation);
@@ -21,6 +22,7 @@ public final class KonanProtoBuf {
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.compileTimeValue);
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.inlineGetterIrBody);
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.inlineSetterIrBody);
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.propertyFile);
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.enumEntryAnnotation);
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.enumEntryOrdinal);
registry.add(org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.parameterAnnotation);
@@ -2455,6 +2457,25 @@ public final class KonanProtoBuf {
*/
org.jetbrains.kotlin.protobuf.ByteString
getEmptyPackageBytes(int index);
/**
* <code>repeated string file = 4;</code>
*/
org.jetbrains.kotlin.protobuf.ProtocolStringList
getFileList();
/**
* <code>repeated string file = 4;</code>
*/
int getFileCount();
/**
* <code>repeated string file = 4;</code>
*/
java.lang.String getFile(int index);
/**
* <code>repeated string file = 4;</code>
*/
org.jetbrains.kotlin.protobuf.ByteString
getFileBytes(int index);
}
/**
* Protobuf type {@code org.jetbrains.kotlin.metadata.konan.LinkDataLibrary}
@@ -2530,6 +2551,15 @@ public final class KonanProtoBuf {
emptyPackage_.add(bs);
break;
}
case 34: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
file_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000008;
}
file_.add(bs);
break;
}
}
}
} catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
@@ -2544,6 +2574,9 @@ public final class KonanProtoBuf {
if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
emptyPackage_ = emptyPackage_.getUnmodifiableView();
}
if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
file_ = file_.getUnmodifiableView();
}
try {
unknownFieldsCodedOutput.flush();
} catch (java.io.IOException e) {
@@ -2670,10 +2703,40 @@ public final class KonanProtoBuf {
return emptyPackage_.getByteString(index);
}
public static final int FILE_FIELD_NUMBER = 4;
private org.jetbrains.kotlin.protobuf.LazyStringList file_;
/**
* <code>repeated string file = 4;</code>
*/
public org.jetbrains.kotlin.protobuf.ProtocolStringList
getFileList() {
return file_;
}
/**
* <code>repeated string file = 4;</code>
*/
public int getFileCount() {
return file_.size();
}
/**
* <code>repeated string file = 4;</code>
*/
public java.lang.String getFile(int index) {
return file_.get(index);
}
/**
* <code>repeated string file = 4;</code>
*/
public org.jetbrains.kotlin.protobuf.ByteString
getFileBytes(int index) {
return file_.getByteString(index);
}
private void initFields() {
moduleName_ = "";
packageFragmentName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
emptyPackage_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
file_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -2701,6 +2764,9 @@ public final class KonanProtoBuf {
for (int i = 0; i < emptyPackage_.size(); i++) {
output.writeBytes(3, emptyPackage_.getByteString(i));
}
for (int i = 0; i < file_.size(); i++) {
output.writeBytes(4, file_.getByteString(i));
}
output.writeRawBytes(unknownFields);
}
@@ -2732,6 +2798,15 @@ public final class KonanProtoBuf {
size += dataSize;
size += 1 * getEmptyPackageList().size();
}
{
int dataSize = 0;
for (int i = 0; i < file_.size(); i++) {
dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeBytesSizeNoTag(file_.getByteString(i));
}
size += dataSize;
size += 1 * getFileList().size();
}
size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -2832,6 +2907,8 @@ public final class KonanProtoBuf {
bitField0_ = (bitField0_ & ~0x00000002);
emptyPackage_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000004);
file_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
@@ -2869,6 +2946,11 @@ public final class KonanProtoBuf {
bitField0_ = (bitField0_ & ~0x00000004);
}
result.emptyPackage_ = emptyPackage_;
if (((bitField0_ & 0x00000008) == 0x00000008)) {
file_ = file_.getUnmodifiableView();
bitField0_ = (bitField0_ & ~0x00000008);
}
result.file_ = file_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -2899,6 +2981,16 @@ public final class KonanProtoBuf {
emptyPackage_.addAll(other.emptyPackage_);
}
}
if (!other.file_.isEmpty()) {
if (file_.isEmpty()) {
file_ = other.file_;
bitField0_ = (bitField0_ & ~0x00000008);
} else {
ensureFileIsMutable();
file_.addAll(other.file_);
}
}
setUnknownFields(
getUnknownFields().concat(other.unknownFields));
@@ -3194,6 +3286,99 @@ public final class KonanProtoBuf {
return this;
}
private org.jetbrains.kotlin.protobuf.LazyStringList file_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureFileIsMutable() {
if (!((bitField0_ & 0x00000008) == 0x00000008)) {
file_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(file_);
bitField0_ |= 0x00000008;
}
}
/**
* <code>repeated string file = 4;</code>
*/
public org.jetbrains.kotlin.protobuf.ProtocolStringList
getFileList() {
return file_.getUnmodifiableView();
}
/**
* <code>repeated string file = 4;</code>
*/
public int getFileCount() {
return file_.size();
}
/**
* <code>repeated string file = 4;</code>
*/
public java.lang.String getFile(int index) {
return file_.get(index);
}
/**
* <code>repeated string file = 4;</code>
*/
public org.jetbrains.kotlin.protobuf.ByteString
getFileBytes(int index) {
return file_.getByteString(index);
}
/**
* <code>repeated string file = 4;</code>
*/
public Builder setFile(
int index, java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
ensureFileIsMutable();
file_.set(index, value);
return this;
}
/**
* <code>repeated string file = 4;</code>
*/
public Builder addFile(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
ensureFileIsMutable();
file_.add(value);
return this;
}
/**
* <code>repeated string file = 4;</code>
*/
public Builder addAllFile(
java.lang.Iterable<java.lang.String> values) {
ensureFileIsMutable();
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, file_);
return this;
}
/**
* <code>repeated string file = 4;</code>
*/
public Builder clearFile() {
file_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
/**
* <code>repeated string file = 4;</code>
*/
public Builder addFileBytes(
org.jetbrains.kotlin.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
ensureFileIsMutable();
file_.add(value);
return this;
}
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.konan.LinkDataLibrary)
}
@@ -3301,6 +3486,22 @@ public final class KonanProtoBuf {
171,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.InlineIrBody.class);
public static final int FUNCTION_FILE_FIELD_NUMBER = 172;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Function { ... }</code>
*/
public static final
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
org.jetbrains.kotlin.metadata.ProtoBuf.Function,
java.lang.Integer> functionFile = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
.newSingularGeneratedExtension(
org.jetbrains.kotlin.metadata.ProtoBuf.Function.getDefaultInstance(),
0,
null,
null,
172,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.INT32,
java.lang.Integer.class);
public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 170;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
@@ -3317,7 +3518,7 @@ public final class KonanProtoBuf {
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false,
org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
public static final int PROPERTY_GETTER_ANNOTATION_FIELD_NUMBER = 176;
public static final int PROPERTY_GETTER_ANNOTATION_FIELD_NUMBER = 177;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
*/
@@ -3329,11 +3530,11 @@ public final class KonanProtoBuf {
org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(),
org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
null,
176,
177,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false,
org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
public static final int PROPERTY_SETTER_ANNOTATION_FIELD_NUMBER = 177;
public static final int PROPERTY_SETTER_ANNOTATION_FIELD_NUMBER = 178;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
*/
@@ -3345,7 +3546,7 @@ public final class KonanProtoBuf {
org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(),
org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
null,
177,
178,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false,
org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
@@ -3429,6 +3630,22 @@ public final class KonanProtoBuf {
175,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
org.jetbrains.kotlin.metadata.konan.KonanProtoBuf.InlineIrBody.class);
public static final int PROPERTY_FILE_FIELD_NUMBER = 176;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
*/
public static final
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
org.jetbrains.kotlin.metadata.ProtoBuf.Property,
java.lang.Integer> propertyFile = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
.newSingularGeneratedExtension(
org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(),
0,
null,
null,
176,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.INT32,
java.lang.Integer.class);
public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 170;
/**
* <code>extend .org.jetbrains.kotlin.metadata.EnumEntry { ... }</code>