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
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>