();
- mutable_bitField0_ |= 0x00000100;
+ mutable_bitField0_ |= 0x00000080;
}
while (input.getBytesUntilLimit() > 0) {
enumEntry_.add(input.readInt32());
@@ -9614,7 +9565,7 @@ public final class DebugProtoBuf {
}
case 106: {
org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder subBuilder = null;
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
subBuilder = primaryConstructor_.toBuilder();
}
primaryConstructor_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.PARSER, extensionRegistry);
@@ -9622,7 +9573,7 @@ public final class DebugProtoBuf {
subBuilder.mergeFrom(primaryConstructor_);
primaryConstructor_ = subBuilder.buildPartial();
}
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
break;
}
}
@@ -9633,19 +9584,19 @@ public final class DebugProtoBuf {
throw new com.google.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
}
- if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
supertype_ = java.util.Collections.unmodifiableList(supertype_);
}
- if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
nestedClassName_ = java.util.Collections.unmodifiableList(nestedClassName_);
}
- if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
+ if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
member_ = java.util.Collections.unmodifiableList(member_);
}
- if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
+ if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
}
this.unknownFields = unknownFields.build();
@@ -10443,61 +10394,6 @@ public final class DebugProtoBuf {
return flags_;
}
- // optional string extra_visibility = 2;
- public static final int EXTRA_VISIBILITY_FIELD_NUMBER = 2;
- private java.lang.Object extraVisibility_;
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public boolean hasExtraVisibility() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public java.lang.String getExtraVisibility() {
- java.lang.Object ref = extraVisibility_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- if (bs.isValidUtf8()) {
- extraVisibility_ = s;
- }
- return s;
- }
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public com.google.protobuf.ByteString
- getExtraVisibilityBytes() {
- java.lang.Object ref = extraVisibility_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- extraVisibility_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
// required int32 fq_name = 3;
public static final int FQ_NAME_FIELD_NUMBER = 3;
private int fqName_;
@@ -10505,7 +10401,7 @@ public final class DebugProtoBuf {
* required int32 fq_name = 3;
*/
public boolean hasFqName() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* required int32 fq_name = 3;
@@ -10525,7 +10421,7 @@ public final class DebugProtoBuf {
*
*/
public boolean hasClassObjectName() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* optional int32 class_object_name = 4;
@@ -10718,7 +10614,7 @@ public final class DebugProtoBuf {
*
*/
public boolean hasPrimaryConstructor() {
- return ((bitField0_ & 0x00000010) == 0x00000010);
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
@@ -10743,7 +10639,6 @@ public final class DebugProtoBuf {
private void initFields() {
flags_ = 0;
- extraVisibility_ = "";
fqName_ = 0;
classObjectName_ = 0;
typeParameter_ = java.util.Collections.emptyList();
@@ -10804,12 +10699,9 @@ public final class DebugProtoBuf {
output.writeInt32(1, flags_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- output.writeBytes(2, getExtraVisibilityBytes());
- }
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(3, fqName_);
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(4, classObjectName_);
}
for (int i = 0; i < typeParameter_.size(); i++) {
@@ -10827,7 +10719,7 @@ public final class DebugProtoBuf {
for (int i = 0; i < enumEntry_.size(); i++) {
output.writeInt32(12, enumEntry_.get(i));
}
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(13, primaryConstructor_);
}
extensionWriter.writeUntil(200, output);
@@ -10845,14 +10737,10 @@ public final class DebugProtoBuf {
.computeInt32Size(1, flags_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(2, getExtraVisibilityBytes());
- }
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, fqName_);
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(4, classObjectName_);
}
@@ -10886,7 +10774,7 @@ public final class DebugProtoBuf {
size += dataSize;
size += 1 * getEnumEntryList().size();
}
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(13, primaryConstructor_);
}
@@ -11013,40 +10901,38 @@ public final class DebugProtoBuf {
super.clear();
flags_ = 0;
bitField0_ = (bitField0_ & ~0x00000001);
- extraVisibility_ = "";
- bitField0_ = (bitField0_ & ~0x00000002);
fqName_ = 0;
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000002);
classObjectName_ = 0;
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000004);
if (typeParameterBuilder_ == null) {
typeParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
} else {
typeParameterBuilder_.clear();
}
if (supertypeBuilder_ == null) {
supertype_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
} else {
supertypeBuilder_.clear();
}
nestedClassName_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
if (memberBuilder_ == null) {
member_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
} else {
memberBuilder_.clear();
}
enumEntry_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
if (primaryConstructorBuilder_ == null) {
primaryConstructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
} else {
primaryConstructorBuilder_.clear();
}
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000100);
return this;
}
@@ -11082,54 +10968,50 @@ public final class DebugProtoBuf {
if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
to_bitField0_ |= 0x00000002;
}
- result.extraVisibility_ = extraVisibility_;
+ result.fqName_ = fqName_;
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
- result.fqName_ = fqName_;
- if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
- to_bitField0_ |= 0x00000008;
- }
result.classObjectName_ = classObjectName_;
if (typeParameterBuilder_ == null) {
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
}
result.typeParameter_ = typeParameter_;
} else {
result.typeParameter_ = typeParameterBuilder_.build();
}
if (supertypeBuilder_ == null) {
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
supertype_ = java.util.Collections.unmodifiableList(supertype_);
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
}
result.supertype_ = supertype_;
} else {
result.supertype_ = supertypeBuilder_.build();
}
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
nestedClassName_ = java.util.Collections.unmodifiableList(nestedClassName_);
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
}
result.nestedClassName_ = nestedClassName_;
if (memberBuilder_ == null) {
- if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
member_ = java.util.Collections.unmodifiableList(member_);
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
}
result.member_ = member_;
} else {
result.member_ = memberBuilder_.build();
}
- if (((bitField0_ & 0x00000100) == 0x00000100)) {
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
}
result.enumEntry_ = enumEntry_;
- if (((from_bitField0_ & 0x00000200) == 0x00000200)) {
- to_bitField0_ |= 0x00000010;
+ if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
+ to_bitField0_ |= 0x00000008;
}
if (primaryConstructorBuilder_ == null) {
result.primaryConstructor_ = primaryConstructor_;
@@ -11155,11 +11037,6 @@ public final class DebugProtoBuf {
if (other.hasFlags()) {
setFlags(other.getFlags());
}
- if (other.hasExtraVisibility()) {
- bitField0_ |= 0x00000002;
- extraVisibility_ = other.extraVisibility_;
- onChanged();
- }
if (other.hasFqName()) {
setFqName(other.getFqName());
}
@@ -11170,7 +11047,7 @@ public final class DebugProtoBuf {
if (!other.typeParameter_.isEmpty()) {
if (typeParameter_.isEmpty()) {
typeParameter_ = other.typeParameter_;
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
} else {
ensureTypeParameterIsMutable();
typeParameter_.addAll(other.typeParameter_);
@@ -11183,7 +11060,7 @@ public final class DebugProtoBuf {
typeParameterBuilder_.dispose();
typeParameterBuilder_ = null;
typeParameter_ = other.typeParameter_;
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
typeParameterBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getTypeParameterFieldBuilder() : null;
@@ -11196,7 +11073,7 @@ public final class DebugProtoBuf {
if (!other.supertype_.isEmpty()) {
if (supertype_.isEmpty()) {
supertype_ = other.supertype_;
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
} else {
ensureSupertypeIsMutable();
supertype_.addAll(other.supertype_);
@@ -11209,7 +11086,7 @@ public final class DebugProtoBuf {
supertypeBuilder_.dispose();
supertypeBuilder_ = null;
supertype_ = other.supertype_;
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
supertypeBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getSupertypeFieldBuilder() : null;
@@ -11221,7 +11098,7 @@ public final class DebugProtoBuf {
if (!other.nestedClassName_.isEmpty()) {
if (nestedClassName_.isEmpty()) {
nestedClassName_ = other.nestedClassName_;
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
} else {
ensureNestedClassNameIsMutable();
nestedClassName_.addAll(other.nestedClassName_);
@@ -11232,7 +11109,7 @@ public final class DebugProtoBuf {
if (!other.member_.isEmpty()) {
if (member_.isEmpty()) {
member_ = other.member_;
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
} else {
ensureMemberIsMutable();
member_.addAll(other.member_);
@@ -11245,7 +11122,7 @@ public final class DebugProtoBuf {
memberBuilder_.dispose();
memberBuilder_ = null;
member_ = other.member_;
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
memberBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getMemberFieldBuilder() : null;
@@ -11257,7 +11134,7 @@ public final class DebugProtoBuf {
if (!other.enumEntry_.isEmpty()) {
if (enumEntry_.isEmpty()) {
enumEntry_ = other.enumEntry_;
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
} else {
ensureEnumEntryIsMutable();
enumEntry_.addAll(other.enumEntry_);
@@ -11396,111 +11273,13 @@ public final class DebugProtoBuf {
return this;
}
- // optional string extra_visibility = 2;
- private java.lang.Object extraVisibility_ = "";
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public boolean hasExtraVisibility() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public java.lang.String getExtraVisibility() {
- java.lang.Object ref = extraVisibility_;
- if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- extraVisibility_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public com.google.protobuf.ByteString
- getExtraVisibilityBytes() {
- java.lang.Object ref = extraVisibility_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- extraVisibility_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public Builder setExtraVisibility(
- java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000002;
- extraVisibility_ = value;
- onChanged();
- return this;
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public Builder clearExtraVisibility() {
- bitField0_ = (bitField0_ & ~0x00000002);
- extraVisibility_ = getDefaultInstance().getExtraVisibility();
- onChanged();
- return this;
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public Builder setExtraVisibilityBytes(
- com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000002;
- extraVisibility_ = value;
- onChanged();
- return this;
- }
-
// required int32 fq_name = 3;
private int fqName_ ;
/**
* required int32 fq_name = 3;
*/
public boolean hasFqName() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* required int32 fq_name = 3;
@@ -11512,7 +11291,7 @@ public final class DebugProtoBuf {
* required int32 fq_name = 3;
*/
public Builder setFqName(int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
fqName_ = value;
onChanged();
return this;
@@ -11521,7 +11300,7 @@ public final class DebugProtoBuf {
* required int32 fq_name = 3;
*/
public Builder clearFqName() {
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000002);
fqName_ = 0;
onChanged();
return this;
@@ -11537,7 +11316,7 @@ public final class DebugProtoBuf {
*
*/
public boolean hasClassObjectName() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* optional int32 class_object_name = 4;
@@ -11557,7 +11336,7 @@ public final class DebugProtoBuf {
*
*/
public Builder setClassObjectName(int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
classObjectName_ = value;
onChanged();
return this;
@@ -11570,7 +11349,7 @@ public final class DebugProtoBuf {
*
*/
public Builder clearClassObjectName() {
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000004);
classObjectName_ = 0;
onChanged();
return this;
@@ -11580,9 +11359,9 @@ public final class DebugProtoBuf {
private java.util.List typeParameter_ =
java.util.Collections.emptyList();
private void ensureTypeParameterIsMutable() {
- if (!((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (!((bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = new java.util.ArrayList(typeParameter_);
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
}
}
@@ -11731,7 +11510,7 @@ public final class DebugProtoBuf {
public Builder clearTypeParameter() {
if (typeParameterBuilder_ == null) {
typeParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
onChanged();
} else {
typeParameterBuilder_.clear();
@@ -11808,7 +11587,7 @@ public final class DebugProtoBuf {
typeParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder>(
typeParameter_,
- ((bitField0_ & 0x00000010) == 0x00000010),
+ ((bitField0_ & 0x00000008) == 0x00000008),
getParentForChildren(),
isClean());
typeParameter_ = null;
@@ -11820,9 +11599,9 @@ public final class DebugProtoBuf {
private java.util.List supertype_ =
java.util.Collections.emptyList();
private void ensureSupertypeIsMutable() {
- if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (!((bitField0_ & 0x00000010) == 0x00000010)) {
supertype_ = new java.util.ArrayList(supertype_);
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
}
}
@@ -11971,7 +11750,7 @@ public final class DebugProtoBuf {
public Builder clearSupertype() {
if (supertypeBuilder_ == null) {
supertype_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
onChanged();
} else {
supertypeBuilder_.clear();
@@ -12048,7 +11827,7 @@ public final class DebugProtoBuf {
supertypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
supertype_,
- ((bitField0_ & 0x00000020) == 0x00000020),
+ ((bitField0_ & 0x00000010) == 0x00000010),
getParentForChildren(),
isClean());
supertype_ = null;
@@ -12059,9 +11838,9 @@ public final class DebugProtoBuf {
// repeated int32 nested_class_name = 7;
private java.util.List nestedClassName_ = java.util.Collections.emptyList();
private void ensureNestedClassNameIsMutable() {
- if (!((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (!((bitField0_ & 0x00000020) == 0x00000020)) {
nestedClassName_ = new java.util.ArrayList(nestedClassName_);
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
}
}
/**
@@ -12152,7 +11931,7 @@ public final class DebugProtoBuf {
*/
public Builder clearNestedClassName() {
nestedClassName_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
onChanged();
return this;
}
@@ -12161,9 +11940,9 @@ public final class DebugProtoBuf {
private java.util.List member_ =
java.util.Collections.emptyList();
private void ensureMemberIsMutable() {
- if (!((bitField0_ & 0x00000080) == 0x00000080)) {
+ if (!((bitField0_ & 0x00000040) == 0x00000040)) {
member_ = new java.util.ArrayList(member_);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
}
}
@@ -12312,7 +12091,7 @@ public final class DebugProtoBuf {
public Builder clearMember() {
if (memberBuilder_ == null) {
member_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
onChanged();
} else {
memberBuilder_.clear();
@@ -12389,7 +12168,7 @@ public final class DebugProtoBuf {
memberBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder>(
member_,
- ((bitField0_ & 0x00000080) == 0x00000080),
+ ((bitField0_ & 0x00000040) == 0x00000040),
getParentForChildren(),
isClean());
member_ = null;
@@ -12400,9 +12179,9 @@ public final class DebugProtoBuf {
// repeated int32 enum_entry = 12;
private java.util.List enumEntry_ = java.util.Collections.emptyList();
private void ensureEnumEntryIsMutable() {
- if (!((bitField0_ & 0x00000100) == 0x00000100)) {
+ if (!((bitField0_ & 0x00000080) == 0x00000080)) {
enumEntry_ = new java.util.ArrayList(enumEntry_);
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
}
}
/**
@@ -12458,7 +12237,7 @@ public final class DebugProtoBuf {
*/
public Builder clearEnumEntry() {
enumEntry_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
onChanged();
return this;
}
@@ -12475,7 +12254,7 @@ public final class DebugProtoBuf {
*
*/
public boolean hasPrimaryConstructor() {
- return ((bitField0_ & 0x00000200) == 0x00000200);
+ return ((bitField0_ & 0x00000100) == 0x00000100);
}
/**
* optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
@@ -12508,7 +12287,7 @@ public final class DebugProtoBuf {
} else {
primaryConstructorBuilder_.setMessage(value);
}
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000100;
return this;
}
/**
@@ -12526,7 +12305,7 @@ public final class DebugProtoBuf {
} else {
primaryConstructorBuilder_.setMessage(builderForValue.build());
}
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000100;
return this;
}
/**
@@ -12538,7 +12317,7 @@ public final class DebugProtoBuf {
*/
public Builder mergePrimaryConstructor(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor value) {
if (primaryConstructorBuilder_ == null) {
- if (((bitField0_ & 0x00000200) == 0x00000200) &&
+ if (((bitField0_ & 0x00000100) == 0x00000100) &&
primaryConstructor_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) {
primaryConstructor_ =
org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.newBuilder(primaryConstructor_).mergeFrom(value).buildPartial();
@@ -12549,7 +12328,7 @@ public final class DebugProtoBuf {
} else {
primaryConstructorBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000100;
return this;
}
/**
@@ -12566,7 +12345,7 @@ public final class DebugProtoBuf {
} else {
primaryConstructorBuilder_.clear();
}
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000100);
return this;
}
/**
@@ -12577,7 +12356,7 @@ public final class DebugProtoBuf {
*
*/
public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder getPrimaryConstructorBuilder() {
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000100;
onChanged();
return getPrimaryConstructorFieldBuilder().getBuilder();
}
@@ -13366,33 +13145,6 @@ public final class DebugProtoBuf {
*/
int getFlags();
- // optional string extra_visibility = 2;
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- boolean hasExtraVisibility();
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- java.lang.String getExtraVisibility();
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- com.google.protobuf.ByteString
- getExtraVisibilityBytes();
-
// optional int32 getter_flags = 9;
/**
* optional int32 getter_flags = 9;
@@ -13601,22 +13353,17 @@ public final class DebugProtoBuf {
flags_ = input.readInt32();
break;
}
- case 18: {
- bitField0_ |= 0x00000002;
- extraVisibility_ = input.readBytes();
- break;
- }
case 34: {
- if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+ if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000010;
+ mutable_bitField0_ |= 0x00000008;
}
typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
break;
}
case 42: {
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
subBuilder = receiverType_.toBuilder();
}
receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
@@ -13624,25 +13371,25 @@ public final class DebugProtoBuf {
subBuilder.mergeFrom(receiverType_);
receiverType_ = subBuilder.buildPartial();
}
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
break;
}
case 48: {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
name_ = input.readInt32();
break;
}
case 58: {
- if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
+ if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
valueParameter_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000080;
+ mutable_bitField0_ |= 0x00000040;
}
valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.PARSER, extensionRegistry));
break;
}
case 66: {
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
subBuilder = returnType_.toBuilder();
}
returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
@@ -13650,16 +13397,16 @@ public final class DebugProtoBuf {
subBuilder.mergeFrom(returnType_);
returnType_ = subBuilder.buildPartial();
}
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
break;
}
case 72: {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
getterFlags_ = input.readInt32();
break;
}
case 80: {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
setterFlags_ = input.readInt32();
break;
}
@@ -13671,10 +13418,10 @@ public final class DebugProtoBuf {
throw new com.google.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
}
- if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
+ if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_);
}
this.unknownFields = unknownFields.build();
@@ -14957,61 +14704,6 @@ public final class DebugProtoBuf {
return flags_;
}
- // optional string extra_visibility = 2;
- public static final int EXTRA_VISIBILITY_FIELD_NUMBER = 2;
- private java.lang.Object extraVisibility_;
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public boolean hasExtraVisibility() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public java.lang.String getExtraVisibility() {
- java.lang.Object ref = extraVisibility_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- if (bs.isValidUtf8()) {
- extraVisibility_ = s;
- }
- return s;
- }
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public com.google.protobuf.ByteString
- getExtraVisibilityBytes() {
- java.lang.Object ref = extraVisibility_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- extraVisibility_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
// optional int32 getter_flags = 9;
public static final int GETTER_FLAGS_FIELD_NUMBER = 9;
private int getterFlags_;
@@ -15027,7 +14719,7 @@ public final class DebugProtoBuf {
*
*/
public boolean hasGetterFlags() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* optional int32 getter_flags = 9;
@@ -15051,7 +14743,7 @@ public final class DebugProtoBuf {
* optional int32 setter_flags = 10;
*/
public boolean hasSetterFlags() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* optional int32 setter_flags = 10;
@@ -15103,7 +14795,7 @@ public final class DebugProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
public boolean hasReceiverType() {
- return ((bitField0_ & 0x00000010) == 0x00000010);
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
@@ -15129,7 +14821,7 @@ public final class DebugProtoBuf {
*
*/
public boolean hasName() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* required int32 name = 6;
@@ -15205,7 +14897,7 @@ public final class DebugProtoBuf {
* required .org.jetbrains.kotlin.serialization.Type return_type = 8;
*/
public boolean hasReturnType() {
- return ((bitField0_ & 0x00000040) == 0x00000040);
+ return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
* required .org.jetbrains.kotlin.serialization.Type return_type = 8;
@@ -15222,7 +14914,6 @@ public final class DebugProtoBuf {
private void initFields() {
flags_ = 0;
- extraVisibility_ = "";
getterFlags_ = 0;
setterFlags_ = 0;
typeParameter_ = java.util.Collections.emptyList();
@@ -15283,28 +14974,25 @@ public final class DebugProtoBuf {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeInt32(1, flags_);
}
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- output.writeBytes(2, getExtraVisibilityBytes());
- }
for (int i = 0; i < typeParameter_.size(); i++) {
output.writeMessage(4, typeParameter_.get(i));
}
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(5, receiverType_);
}
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeInt32(6, name_);
}
for (int i = 0; i < valueParameter_.size(); i++) {
output.writeMessage(7, valueParameter_.get(i));
}
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
output.writeMessage(8, returnType_);
}
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(9, getterFlags_);
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(10, setterFlags_);
}
extensionWriter.writeUntil(200, output);
@@ -15321,19 +15009,15 @@ public final class DebugProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(1, flags_);
}
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(2, getExtraVisibilityBytes());
- }
for (int i = 0; i < typeParameter_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, typeParameter_.get(i));
}
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, receiverType_);
}
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(6, name_);
}
@@ -15341,15 +15025,15 @@ public final class DebugProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(7, valueParameter_.get(i));
}
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(8, returnType_);
}
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(9, getterFlags_);
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(10, setterFlags_);
}
@@ -15476,15 +15160,13 @@ public final class DebugProtoBuf {
super.clear();
flags_ = 0;
bitField0_ = (bitField0_ & ~0x00000001);
- extraVisibility_ = "";
- bitField0_ = (bitField0_ & ~0x00000002);
getterFlags_ = 0;
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000002);
setterFlags_ = 0;
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000004);
if (typeParameterBuilder_ == null) {
typeParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
} else {
typeParameterBuilder_.clear();
}
@@ -15493,12 +15175,12 @@ public final class DebugProtoBuf {
} else {
receiverTypeBuilder_.clear();
}
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
name_ = 0;
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
if (valueParameterBuilder_ == null) {
valueParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
} else {
valueParameterBuilder_.clear();
}
@@ -15507,7 +15189,7 @@ public final class DebugProtoBuf {
} else {
returnTypeBuilder_.clear();
}
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
return this;
}
@@ -15543,47 +15225,43 @@ public final class DebugProtoBuf {
if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
to_bitField0_ |= 0x00000002;
}
- result.extraVisibility_ = extraVisibility_;
+ result.getterFlags_ = getterFlags_;
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
- result.getterFlags_ = getterFlags_;
- if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
- to_bitField0_ |= 0x00000008;
- }
result.setterFlags_ = setterFlags_;
if (typeParameterBuilder_ == null) {
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
}
result.typeParameter_ = typeParameter_;
} else {
result.typeParameter_ = typeParameterBuilder_.build();
}
- if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
- to_bitField0_ |= 0x00000010;
+ if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+ to_bitField0_ |= 0x00000008;
}
if (receiverTypeBuilder_ == null) {
result.receiverType_ = receiverType_;
} else {
result.receiverType_ = receiverTypeBuilder_.build();
}
- if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
- to_bitField0_ |= 0x00000020;
+ if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+ to_bitField0_ |= 0x00000010;
}
result.name_ = name_;
if (valueParameterBuilder_ == null) {
- if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_);
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
}
result.valueParameter_ = valueParameter_;
} else {
result.valueParameter_ = valueParameterBuilder_.build();
}
- if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
- to_bitField0_ |= 0x00000040;
+ if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
+ to_bitField0_ |= 0x00000020;
}
if (returnTypeBuilder_ == null) {
result.returnType_ = returnType_;
@@ -15609,11 +15287,6 @@ public final class DebugProtoBuf {
if (other.hasFlags()) {
setFlags(other.getFlags());
}
- if (other.hasExtraVisibility()) {
- bitField0_ |= 0x00000002;
- extraVisibility_ = other.extraVisibility_;
- onChanged();
- }
if (other.hasGetterFlags()) {
setGetterFlags(other.getGetterFlags());
}
@@ -15624,7 +15297,7 @@ public final class DebugProtoBuf {
if (!other.typeParameter_.isEmpty()) {
if (typeParameter_.isEmpty()) {
typeParameter_ = other.typeParameter_;
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
} else {
ensureTypeParameterIsMutable();
typeParameter_.addAll(other.typeParameter_);
@@ -15637,7 +15310,7 @@ public final class DebugProtoBuf {
typeParameterBuilder_.dispose();
typeParameterBuilder_ = null;
typeParameter_ = other.typeParameter_;
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
typeParameterBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getTypeParameterFieldBuilder() : null;
@@ -15656,7 +15329,7 @@ public final class DebugProtoBuf {
if (!other.valueParameter_.isEmpty()) {
if (valueParameter_.isEmpty()) {
valueParameter_ = other.valueParameter_;
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
} else {
ensureValueParameterIsMutable();
valueParameter_.addAll(other.valueParameter_);
@@ -15669,7 +15342,7 @@ public final class DebugProtoBuf {
valueParameterBuilder_.dispose();
valueParameterBuilder_ = null;
valueParameter_ = other.valueParameter_;
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
valueParameterBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getValueParameterFieldBuilder() : null;
@@ -15824,104 +15497,6 @@ public final class DebugProtoBuf {
return this;
}
- // optional string extra_visibility = 2;
- private java.lang.Object extraVisibility_ = "";
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public boolean hasExtraVisibility() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public java.lang.String getExtraVisibility() {
- java.lang.Object ref = extraVisibility_;
- if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- extraVisibility_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public com.google.protobuf.ByteString
- getExtraVisibilityBytes() {
- java.lang.Object ref = extraVisibility_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- extraVisibility_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public Builder setExtraVisibility(
- java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000002;
- extraVisibility_ = value;
- onChanged();
- return this;
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public Builder clearExtraVisibility() {
- bitField0_ = (bitField0_ & ~0x00000002);
- extraVisibility_ = getDefaultInstance().getExtraVisibility();
- onChanged();
- return this;
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public Builder setExtraVisibilityBytes(
- com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000002;
- extraVisibility_ = value;
- onChanged();
- return this;
- }
-
// optional int32 getter_flags = 9;
private int getterFlags_ ;
/**
@@ -15936,7 +15511,7 @@ public final class DebugProtoBuf {
*
*/
public boolean hasGetterFlags() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* optional int32 getter_flags = 9;
@@ -15964,7 +15539,7 @@ public final class DebugProtoBuf {
*
*/
public Builder setGetterFlags(int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
getterFlags_ = value;
onChanged();
return this;
@@ -15981,7 +15556,7 @@ public final class DebugProtoBuf {
*
*/
public Builder clearGetterFlags() {
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000002);
getterFlags_ = 0;
onChanged();
return this;
@@ -15993,7 +15568,7 @@ public final class DebugProtoBuf {
* optional int32 setter_flags = 10;
*/
public boolean hasSetterFlags() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* optional int32 setter_flags = 10;
@@ -16005,7 +15580,7 @@ public final class DebugProtoBuf {
* optional int32 setter_flags = 10;
*/
public Builder setSetterFlags(int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
setterFlags_ = value;
onChanged();
return this;
@@ -16014,7 +15589,7 @@ public final class DebugProtoBuf {
* optional int32 setter_flags = 10;
*/
public Builder clearSetterFlags() {
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000004);
setterFlags_ = 0;
onChanged();
return this;
@@ -16024,9 +15599,9 @@ public final class DebugProtoBuf {
private java.util.List typeParameter_ =
java.util.Collections.emptyList();
private void ensureTypeParameterIsMutable() {
- if (!((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (!((bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = new java.util.ArrayList(typeParameter_);
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
}
}
@@ -16175,7 +15750,7 @@ public final class DebugProtoBuf {
public Builder clearTypeParameter() {
if (typeParameterBuilder_ == null) {
typeParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
onChanged();
} else {
typeParameterBuilder_.clear();
@@ -16252,7 +15827,7 @@ public final class DebugProtoBuf {
typeParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder>(
typeParameter_,
- ((bitField0_ & 0x00000010) == 0x00000010),
+ ((bitField0_ & 0x00000008) == 0x00000008),
getParentForChildren(),
isClean());
typeParameter_ = null;
@@ -16268,7 +15843,7 @@ public final class DebugProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
public boolean hasReceiverType() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
@@ -16293,7 +15868,7 @@ public final class DebugProtoBuf {
} else {
receiverTypeBuilder_.setMessage(value);
}
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
return this;
}
/**
@@ -16307,7 +15882,7 @@ public final class DebugProtoBuf {
} else {
receiverTypeBuilder_.setMessage(builderForValue.build());
}
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
return this;
}
/**
@@ -16315,7 +15890,7 @@ public final class DebugProtoBuf {
*/
public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
if (receiverTypeBuilder_ == null) {
- if (((bitField0_ & 0x00000020) == 0x00000020) &&
+ if (((bitField0_ & 0x00000010) == 0x00000010) &&
receiverType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
receiverType_ =
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
@@ -16326,7 +15901,7 @@ public final class DebugProtoBuf {
} else {
receiverTypeBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
return this;
}
/**
@@ -16339,14 +15914,14 @@ public final class DebugProtoBuf {
} else {
receiverTypeBuilder_.clear();
}
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReceiverTypeBuilder() {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
onChanged();
return getReceiverTypeFieldBuilder().getBuilder();
}
@@ -16387,7 +15962,7 @@ public final class DebugProtoBuf {
*
*/
public boolean hasName() {
- return ((bitField0_ & 0x00000040) == 0x00000040);
+ return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
* required int32 name = 6;
@@ -16407,7 +15982,7 @@ public final class DebugProtoBuf {
*
*/
public Builder setName(int value) {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
name_ = value;
onChanged();
return this;
@@ -16420,7 +15995,7 @@ public final class DebugProtoBuf {
*
*/
public Builder clearName() {
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
name_ = 0;
onChanged();
return this;
@@ -16430,9 +16005,9 @@ public final class DebugProtoBuf {
private java.util.List valueParameter_ =
java.util.Collections.emptyList();
private void ensureValueParameterIsMutable() {
- if (!((bitField0_ & 0x00000080) == 0x00000080)) {
+ if (!((bitField0_ & 0x00000040) == 0x00000040)) {
valueParameter_ = new java.util.ArrayList(valueParameter_);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
}
}
@@ -16625,7 +16200,7 @@ public final class DebugProtoBuf {
public Builder clearValueParameter() {
if (valueParameterBuilder_ == null) {
valueParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
onChanged();
} else {
valueParameterBuilder_.clear();
@@ -16730,7 +16305,7 @@ public final class DebugProtoBuf {
valueParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder>(
valueParameter_,
- ((bitField0_ & 0x00000080) == 0x00000080),
+ ((bitField0_ & 0x00000040) == 0x00000040),
getParentForChildren(),
isClean());
valueParameter_ = null;
@@ -16746,7 +16321,7 @@ public final class DebugProtoBuf {
* required .org.jetbrains.kotlin.serialization.Type return_type = 8;
*/
public boolean hasReturnType() {
- return ((bitField0_ & 0x00000100) == 0x00000100);
+ return ((bitField0_ & 0x00000080) == 0x00000080);
}
/**
* required .org.jetbrains.kotlin.serialization.Type return_type = 8;
@@ -16771,7 +16346,7 @@ public final class DebugProtoBuf {
} else {
returnTypeBuilder_.setMessage(value);
}
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
return this;
}
/**
@@ -16785,7 +16360,7 @@ public final class DebugProtoBuf {
} else {
returnTypeBuilder_.setMessage(builderForValue.build());
}
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
return this;
}
/**
@@ -16793,7 +16368,7 @@ public final class DebugProtoBuf {
*/
public Builder mergeReturnType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
if (returnTypeBuilder_ == null) {
- if (((bitField0_ & 0x00000100) == 0x00000100) &&
+ if (((bitField0_ & 0x00000080) == 0x00000080) &&
returnType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
returnType_ =
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
@@ -16804,7 +16379,7 @@ public final class DebugProtoBuf {
} else {
returnTypeBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
return this;
}
/**
@@ -16817,14 +16392,14 @@ public final class DebugProtoBuf {
} else {
returnTypeBuilder_.clear();
}
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
return this;
}
/**
* required .org.jetbrains.kotlin.serialization.Type return_type = 8;
*/
public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReturnTypeBuilder() {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
onChanged();
return getReturnTypeFieldBuilder().getBuilder();
}
@@ -17001,48 +16576,46 @@ public final class DebugProtoBuf {
"in.serialization.TypeParameter.Variance:" +
"\003INV\022=\n\013upper_bound\030\005 \003(\0132(.org.jetbrain",
"s.kotlin.serialization.Type\"$\n\010Variance\022" +
- "\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\372\004\n\005Class\022\020\n\005f" +
- "lags\030\001 \001(\005:\0010\022\030\n\020extra_visibility\030\002 \001(\t\022" +
- "\017\n\007fq_name\030\003 \002(\005\022\031\n\021class_object_name\030\004 " +
- "\001(\005\022I\n\016type_parameter\030\005 \003(\01321.org.jetbra" +
- "ins.kotlin.serialization.TypeParameter\022;" +
- "\n\tsupertype\030\006 \003(\0132(.org.jetbrains.kotlin" +
- ".serialization.Type\022\031\n\021nested_class_name" +
- "\030\007 \003(\005\022<\n\006member\030\013 \003(\0132,.org.jetbrains.k" +
- "otlin.serialization.Callable\022\022\n\nenum_ent",
- "ry\030\014 \003(\005\022Y\n\023primary_constructor\030\r \001(\0132<." +
- "org.jetbrains.kotlin.serialization.Class" +
- ".PrimaryConstructor\032P\n\022PrimaryConstructo" +
- "r\022:\n\004data\030\001 \001(\0132,.org.jetbrains.kotlin.s" +
- "erialization.Callable\"p\n\004Kind\022\t\n\005CLASS\020\000" +
- "\022\t\n\005TRAIT\020\001\022\016\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTR" +
- "Y\020\003\022\024\n\020ANNOTATION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n" +
- "\014CLASS_OBJECT\020\006*\005\010d\020\310\001\"N\n\007Package\022<\n\006mem" +
- "ber\030\001 \003(\0132,.org.jetbrains.kotlin.seriali" +
- "zation.Callable*\005\010d\020\310\001\"\332\005\n\010Callable\022\r\n\005f",
- "lags\030\001 \001(\005\022\030\n\020extra_visibility\030\002 \001(\t\022\024\n\014" +
- "getter_flags\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005" +
- "\022I\n\016type_parameter\030\004 \003(\01321.org.jetbrains" +
- ".kotlin.serialization.TypeParameter\022?\n\rr" +
- "eceiver_type\030\005 \001(\0132(.org.jetbrains.kotli" +
- "n.serialization.Type\022\014\n\004name\030\006 \002(\005\022T\n\017va" +
- "lue_parameter\030\007 \003(\0132;.org.jetbrains.kotl" +
- "in.serialization.Callable.ValueParameter" +
- "\022=\n\013return_type\030\010 \002(\0132(.org.jetbrains.ko" +
- "tlin.serialization.Type\032\263\001\n\016ValueParamet",
- "er\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004type\030" +
- "\003 \002(\0132(.org.jetbrains.kotlin.serializati" +
- "on.Type\022E\n\023vararg_element_type\030\004 \001(\0132(.o" +
- "rg.jetbrains.kotlin.serialization.Type*\005" +
- "\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n\r" +
- "FAKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTH" +
- "ESIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003VAL" +
- "\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010M" +
- "odality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT" +
- "\020\002*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVAT",
- "E\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVAT" +
- "E_TO_THIS\020\004\022\t\n\005EXTRA\020\005B\022B\rDebugProtoBuf\210" +
- "\001\000"
+ "\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\340\004\n\005Class\022\020\n\005f" +
+ "lags\030\001 \001(\005:\0010\022\017\n\007fq_name\030\003 \002(\005\022\031\n\021class_" +
+ "object_name\030\004 \001(\005\022I\n\016type_parameter\030\005 \003(" +
+ "\01321.org.jetbrains.kotlin.serialization.T" +
+ "ypeParameter\022;\n\tsupertype\030\006 \003(\0132(.org.je" +
+ "tbrains.kotlin.serialization.Type\022\031\n\021nes" +
+ "ted_class_name\030\007 \003(\005\022<\n\006member\030\013 \003(\0132,.o" +
+ "rg.jetbrains.kotlin.serialization.Callab" +
+ "le\022\022\n\nenum_entry\030\014 \003(\005\022Y\n\023primary_constr",
+ "uctor\030\r \001(\0132<.org.jetbrains.kotlin.seria" +
+ "lization.Class.PrimaryConstructor\032P\n\022Pri" +
+ "maryConstructor\022:\n\004data\030\001 \001(\0132,.org.jetb" +
+ "rains.kotlin.serialization.Callable\"p\n\004K" +
+ "ind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022\016\n\nENUM_CLASS\020" +
+ "\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTATION_CLASS\020\004\022" +
+ "\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJECT\020\006*\005\010d\020\310\001\"N\n\007" +
+ "Package\022<\n\006member\030\001 \003(\0132,.org.jetbrains." +
+ "kotlin.serialization.Callable*\005\010d\020\310\001\"\300\005\n" +
+ "\010Callable\022\r\n\005flags\030\001 \001(\005\022\024\n\014getter_flags",
+ "\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005\022I\n\016type_par" +
+ "ameter\030\004 \003(\01321.org.jetbrains.kotlin.seri" +
+ "alization.TypeParameter\022?\n\rreceiver_type" +
+ "\030\005 \001(\0132(.org.jetbrains.kotlin.serializat" +
+ "ion.Type\022\014\n\004name\030\006 \002(\005\022T\n\017value_paramete" +
+ "r\030\007 \003(\0132;.org.jetbrains.kotlin.serializa" +
+ "tion.Callable.ValueParameter\022=\n\013return_t" +
+ "ype\030\010 \002(\0132(.org.jetbrains.kotlin.seriali" +
+ "zation.Type\032\263\001\n\016ValueParameter\022\r\n\005flags\030" +
+ "\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004type\030\003 \002(\0132(.org.",
+ "jetbrains.kotlin.serialization.Type\022E\n\023v" +
+ "ararg_element_type\030\004 \001(\0132(.org.jetbrains" +
+ ".kotlin.serialization.Type*\005\010d\020\310\001\"Q\n\nMem" +
+ "berKind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERRID" +
+ "E\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003\":\n\014" +
+ "CallableKind\022\007\n\003FUN\020\000\022\007\n\003VAL\020\001\022\007\n\003VAR\020\002\022" +
+ "\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010Modality\022\t\n\005F" +
+ "INAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002*W\n\nVisibi" +
+ "lity\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tPROTE" +
+ "CTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVATE_TO_THIS\020\004B",
+ "\022B\rDebugProtoBuf\210\001\000"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -17114,7 +16687,7 @@ public final class DebugProtoBuf {
internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_Class_descriptor,
- new java.lang.String[] { "Flags", "ExtraVisibility", "FqName", "ClassObjectName", "TypeParameter", "Supertype", "NestedClassName", "Member", "EnumEntry", "PrimaryConstructor", });
+ new java.lang.String[] { "Flags", "FqName", "ClassObjectName", "TypeParameter", "Supertype", "NestedClassName", "Member", "EnumEntry", "PrimaryConstructor", });
internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor =
internal_static_org_jetbrains_kotlin_serialization_Class_descriptor.getNestedTypes().get(0);
internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable = new
@@ -17132,7 +16705,7 @@ public final class DebugProtoBuf {
internal_static_org_jetbrains_kotlin_serialization_Callable_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor,
- new java.lang.String[] { "Flags", "ExtraVisibility", "GetterFlags", "SetterFlags", "TypeParameter", "ReceiverType", "Name", "ValueParameter", "ReturnType", });
+ new java.lang.String[] { "Flags", "GetterFlags", "SetterFlags", "TypeParameter", "ReceiverType", "Name", "ValueParameter", "ReturnType", });
internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_descriptor =
internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor.getNestedTypes().get(0);
internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_fieldAccessorTable = new
diff --git a/core/serialization/src/descriptors.proto b/core/serialization/src/descriptors.proto
index bcf1b344e25..232e73f1ca0 100644
--- a/core/serialization/src/descriptors.proto
+++ b/core/serialization/src/descriptors.proto
@@ -175,7 +175,6 @@ message Class {
is_inner
*/
optional int32 flags = 1 [default = 0 /*internal final class, no annotations*/];
- optional string extra_visibility = 2; // for things like java-specific visibilities
required int32 fq_name = 3;
@@ -240,7 +239,6 @@ message Callable {
hasConstant
*/
optional int32 flags = 1;
- optional string extra_visibility = 2; // for things like java-specific visibilities
/*
isNotDefault
@@ -295,5 +293,4 @@ enum Visibility {
PROTECTED = 0x02;
PUBLIC = 0x03;
PRIVATE_TO_THIS = 0x04;
- EXTRA = 0x05; // there's an extra field for the actual visibility
}
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
index 76546a31abc..6609431f02c 100644
--- a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
@@ -83,8 +83,6 @@ public class DescriptorSerializer {
classDescriptor.getModality(), classDescriptor.getKind(), classDescriptor.isInner());
builder.setFlags(flags);
- // TODO extra visibility
-
builder.setFqName(getClassId(classDescriptor));
for (TypeParameterDescriptor typeParameterDescriptor : classDescriptor.getTypeConstructor().getParameters()) {
@@ -196,7 +194,6 @@ public class DescriptorSerializer {
hasSetter,
hasConstant
));
- //TODO builder.setExtraVisibility()
for (TypeParameterDescriptor typeParameterDescriptor : descriptor.getTypeParameters()) {
builder.addTypeParameter(local.typeParameter(typeParameterDescriptor));
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java b/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java
index 017ec6ea15c..3cc618a474a 100644
--- a/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java
@@ -154,7 +154,7 @@ public class Flags {
else if (visibility == Visibilities.PROTECTED) {
return ProtoBuf.Visibility.PROTECTED;
}
- return ProtoBuf.Visibility.EXTRA;
+ throw new IllegalArgumentException("Unknown visibility: " + visibility);
}
@NotNull
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
index 6dea099c4d6..f9f698b0128 100644
--- a/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
@@ -110,14 +110,6 @@ public final class ProtoBuf {
* PRIVATE_TO_THIS = 4;
*/
PRIVATE_TO_THIS(4, 4),
- /**
- * EXTRA = 5;
- *
- *
- * there's an extra field for the actual visibility
- *
- */
- EXTRA(5, 5),
;
/**
@@ -144,14 +136,6 @@ public final class ProtoBuf {
* PRIVATE_TO_THIS = 4;
*/
public static final int PRIVATE_TO_THIS_VALUE = 4;
- /**
- * EXTRA = 5;
- *
- *
- * there's an extra field for the actual visibility
- *
- */
- public static final int EXTRA_VALUE = 5;
public final int getNumber() { return value; }
@@ -163,7 +147,6 @@ public final class ProtoBuf {
case 2: return PROTECTED;
case 3: return PUBLIC;
case 4: return PRIVATE_TO_THIS;
- case 5: return EXTRA;
default: return null;
}
}
@@ -7299,33 +7282,6 @@ public final class ProtoBuf {
*/
int getFlags();
- // optional string extra_visibility = 2;
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- boolean hasExtraVisibility();
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- java.lang.String getExtraVisibility();
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- com.google.protobuf.ByteString
- getExtraVisibilityBytes();
-
// required int32 fq_name = 3;
/**
* required int32 fq_name = 3;
@@ -7508,41 +7464,36 @@ public final class ProtoBuf {
flags_ = input.readInt32();
break;
}
- case 18: {
- bitField0_ |= 0x00000002;
- extraVisibility_ = input.readBytes();
- break;
- }
case 24: {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
fqName_ = input.readInt32();
break;
}
case 32: {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
classObjectName_ = input.readInt32();
break;
}
case 42: {
- if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+ if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000010;
+ mutable_bitField0_ |= 0x00000008;
}
typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
break;
}
case 50: {
- if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
supertype_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000020;
+ mutable_bitField0_ |= 0x00000010;
}
supertype_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry));
break;
}
case 56: {
- if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+ if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
nestedClassName_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000040;
+ mutable_bitField0_ |= 0x00000020;
}
nestedClassName_.add(input.readInt32());
break;
@@ -7550,9 +7501,9 @@ public final class ProtoBuf {
case 58: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
- if (!((mutable_bitField0_ & 0x00000040) == 0x00000040) && input.getBytesUntilLimit() > 0) {
+ if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) && input.getBytesUntilLimit() > 0) {
nestedClassName_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000040;
+ mutable_bitField0_ |= 0x00000020;
}
while (input.getBytesUntilLimit() > 0) {
nestedClassName_.add(input.readInt32());
@@ -7561,17 +7512,17 @@ public final class ProtoBuf {
break;
}
case 90: {
- if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
+ if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
member_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000080;
+ mutable_bitField0_ |= 0x00000040;
}
member_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.PARSER, extensionRegistry));
break;
}
case 96: {
- if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
+ if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
enumEntry_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000100;
+ mutable_bitField0_ |= 0x00000080;
}
enumEntry_.add(input.readInt32());
break;
@@ -7579,9 +7530,9 @@ public final class ProtoBuf {
case 98: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
- if (!((mutable_bitField0_ & 0x00000100) == 0x00000100) && input.getBytesUntilLimit() > 0) {
+ if (!((mutable_bitField0_ & 0x00000080) == 0x00000080) && input.getBytesUntilLimit() > 0) {
enumEntry_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000100;
+ mutable_bitField0_ |= 0x00000080;
}
while (input.getBytesUntilLimit() > 0) {
enumEntry_.add(input.readInt32());
@@ -7591,7 +7542,7 @@ public final class ProtoBuf {
}
case 106: {
org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.Builder subBuilder = null;
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
subBuilder = primaryConstructor_.toBuilder();
}
primaryConstructor_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.PARSER, extensionRegistry);
@@ -7599,7 +7550,7 @@ public final class ProtoBuf {
subBuilder.mergeFrom(primaryConstructor_);
primaryConstructor_ = subBuilder.buildPartial();
}
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
break;
}
}
@@ -7610,19 +7561,19 @@ public final class ProtoBuf {
throw new com.google.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
}
- if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
supertype_ = java.util.Collections.unmodifiableList(supertype_);
}
- if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
nestedClassName_ = java.util.Collections.unmodifiableList(nestedClassName_);
}
- if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
+ if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
member_ = java.util.Collections.unmodifiableList(member_);
}
- if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
+ if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
}
makeExtensionsImmutable();
@@ -8218,61 +8169,6 @@ public final class ProtoBuf {
return flags_;
}
- // optional string extra_visibility = 2;
- public static final int EXTRA_VISIBILITY_FIELD_NUMBER = 2;
- private java.lang.Object extraVisibility_;
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public boolean hasExtraVisibility() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public java.lang.String getExtraVisibility() {
- java.lang.Object ref = extraVisibility_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- if (bs.isValidUtf8()) {
- extraVisibility_ = s;
- }
- return s;
- }
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public com.google.protobuf.ByteString
- getExtraVisibilityBytes() {
- java.lang.Object ref = extraVisibility_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- extraVisibility_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
// required int32 fq_name = 3;
public static final int FQ_NAME_FIELD_NUMBER = 3;
private int fqName_;
@@ -8280,7 +8176,7 @@ public final class ProtoBuf {
* required int32 fq_name = 3;
*/
public boolean hasFqName() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* required int32 fq_name = 3;
@@ -8300,7 +8196,7 @@ public final class ProtoBuf {
*
*/
public boolean hasClassObjectName() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* optional int32 class_object_name = 4;
@@ -8493,7 +8389,7 @@ public final class ProtoBuf {
*
*/
public boolean hasPrimaryConstructor() {
- return ((bitField0_ & 0x00000010) == 0x00000010);
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
@@ -8508,7 +8404,6 @@ public final class ProtoBuf {
private void initFields() {
flags_ = 0;
- extraVisibility_ = "";
fqName_ = 0;
classObjectName_ = 0;
typeParameter_ = java.util.Collections.emptyList();
@@ -8569,12 +8464,9 @@ public final class ProtoBuf {
output.writeInt32(1, flags_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- output.writeBytes(2, getExtraVisibilityBytes());
- }
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(3, fqName_);
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(4, classObjectName_);
}
for (int i = 0; i < typeParameter_.size(); i++) {
@@ -8592,7 +8484,7 @@ public final class ProtoBuf {
for (int i = 0; i < enumEntry_.size(); i++) {
output.writeInt32(12, enumEntry_.get(i));
}
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(13, primaryConstructor_);
}
extensionWriter.writeUntil(200, output);
@@ -8609,14 +8501,10 @@ public final class ProtoBuf {
.computeInt32Size(1, flags_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(2, getExtraVisibilityBytes());
- }
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, fqName_);
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(4, classObjectName_);
}
@@ -8650,7 +8538,7 @@ public final class ProtoBuf {
size += dataSize;
size += 1 * getEnumEntryList().size();
}
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(13, primaryConstructor_);
}
@@ -8747,24 +8635,22 @@ public final class ProtoBuf {
super.clear();
flags_ = 0;
bitField0_ = (bitField0_ & ~0x00000001);
- extraVisibility_ = "";
- bitField0_ = (bitField0_ & ~0x00000002);
fqName_ = 0;
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000002);
classObjectName_ = 0;
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000004);
typeParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
supertype_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
nestedClassName_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
member_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
enumEntry_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
primaryConstructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000100);
return this;
}
@@ -8795,42 +8681,38 @@ public final class ProtoBuf {
if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
to_bitField0_ |= 0x00000002;
}
- result.extraVisibility_ = extraVisibility_;
+ result.fqName_ = fqName_;
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
- result.fqName_ = fqName_;
- if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
- to_bitField0_ |= 0x00000008;
- }
result.classObjectName_ = classObjectName_;
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
}
result.typeParameter_ = typeParameter_;
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
supertype_ = java.util.Collections.unmodifiableList(supertype_);
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
}
result.supertype_ = supertype_;
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
nestedClassName_ = java.util.Collections.unmodifiableList(nestedClassName_);
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
}
result.nestedClassName_ = nestedClassName_;
- if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
member_ = java.util.Collections.unmodifiableList(member_);
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
}
result.member_ = member_;
- if (((bitField0_ & 0x00000100) == 0x00000100)) {
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
}
result.enumEntry_ = enumEntry_;
- if (((from_bitField0_ & 0x00000200) == 0x00000200)) {
- to_bitField0_ |= 0x00000010;
+ if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
+ to_bitField0_ |= 0x00000008;
}
result.primaryConstructor_ = primaryConstructor_;
result.bitField0_ = to_bitField0_;
@@ -8842,11 +8724,6 @@ public final class ProtoBuf {
if (other.hasFlags()) {
setFlags(other.getFlags());
}
- if (other.hasExtraVisibility()) {
- bitField0_ |= 0x00000002;
- extraVisibility_ = other.extraVisibility_;
-
- }
if (other.hasFqName()) {
setFqName(other.getFqName());
}
@@ -8856,7 +8733,7 @@ public final class ProtoBuf {
if (!other.typeParameter_.isEmpty()) {
if (typeParameter_.isEmpty()) {
typeParameter_ = other.typeParameter_;
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
} else {
ensureTypeParameterIsMutable();
typeParameter_.addAll(other.typeParameter_);
@@ -8866,7 +8743,7 @@ public final class ProtoBuf {
if (!other.supertype_.isEmpty()) {
if (supertype_.isEmpty()) {
supertype_ = other.supertype_;
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
} else {
ensureSupertypeIsMutable();
supertype_.addAll(other.supertype_);
@@ -8876,7 +8753,7 @@ public final class ProtoBuf {
if (!other.nestedClassName_.isEmpty()) {
if (nestedClassName_.isEmpty()) {
nestedClassName_ = other.nestedClassName_;
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
} else {
ensureNestedClassNameIsMutable();
nestedClassName_.addAll(other.nestedClassName_);
@@ -8886,7 +8763,7 @@ public final class ProtoBuf {
if (!other.member_.isEmpty()) {
if (member_.isEmpty()) {
member_ = other.member_;
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
} else {
ensureMemberIsMutable();
member_.addAll(other.member_);
@@ -8896,7 +8773,7 @@ public final class ProtoBuf {
if (!other.enumEntry_.isEmpty()) {
if (enumEntry_.isEmpty()) {
enumEntry_ = other.enumEntry_;
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
} else {
ensureEnumEntryIsMutable();
enumEntry_.addAll(other.enumEntry_);
@@ -9034,111 +8911,13 @@ public final class ProtoBuf {
return this;
}
- // optional string extra_visibility = 2;
- private java.lang.Object extraVisibility_ = "";
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public boolean hasExtraVisibility() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public java.lang.String getExtraVisibility() {
- java.lang.Object ref = extraVisibility_;
- if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- extraVisibility_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public com.google.protobuf.ByteString
- getExtraVisibilityBytes() {
- java.lang.Object ref = extraVisibility_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- extraVisibility_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public Builder setExtraVisibility(
- java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000002;
- extraVisibility_ = value;
-
- return this;
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public Builder clearExtraVisibility() {
- bitField0_ = (bitField0_ & ~0x00000002);
- extraVisibility_ = getDefaultInstance().getExtraVisibility();
-
- return this;
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public Builder setExtraVisibilityBytes(
- com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000002;
- extraVisibility_ = value;
-
- return this;
- }
-
// required int32 fq_name = 3;
private int fqName_ ;
/**
* required int32 fq_name = 3;
*/
public boolean hasFqName() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* required int32 fq_name = 3;
@@ -9150,7 +8929,7 @@ public final class ProtoBuf {
* required int32 fq_name = 3;
*/
public Builder setFqName(int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
fqName_ = value;
return this;
@@ -9159,7 +8938,7 @@ public final class ProtoBuf {
* required int32 fq_name = 3;
*/
public Builder clearFqName() {
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000002);
fqName_ = 0;
return this;
@@ -9175,7 +8954,7 @@ public final class ProtoBuf {
*
*/
public boolean hasClassObjectName() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* optional int32 class_object_name = 4;
@@ -9195,7 +8974,7 @@ public final class ProtoBuf {
*
*/
public Builder setClassObjectName(int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
classObjectName_ = value;
return this;
@@ -9208,7 +8987,7 @@ public final class ProtoBuf {
*
*/
public Builder clearClassObjectName() {
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000004);
classObjectName_ = 0;
return this;
@@ -9218,9 +8997,9 @@ public final class ProtoBuf {
private java.util.List typeParameter_ =
java.util.Collections.emptyList();
private void ensureTypeParameterIsMutable() {
- if (!((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (!((bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = new java.util.ArrayList(typeParameter_);
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
}
}
@@ -9325,7 +9104,7 @@ public final class ProtoBuf {
*/
public Builder clearTypeParameter() {
typeParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
@@ -9343,9 +9122,9 @@ public final class ProtoBuf {
private java.util.List supertype_ =
java.util.Collections.emptyList();
private void ensureSupertypeIsMutable() {
- if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (!((bitField0_ & 0x00000010) == 0x00000010)) {
supertype_ = new java.util.ArrayList(supertype_);
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
}
}
@@ -9450,7 +9229,7 @@ public final class ProtoBuf {
*/
public Builder clearSupertype() {
supertype_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
@@ -9467,9 +9246,9 @@ public final class ProtoBuf {
// repeated int32 nested_class_name = 7;
private java.util.List nestedClassName_ = java.util.Collections.emptyList();
private void ensureNestedClassNameIsMutable() {
- if (!((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (!((bitField0_ & 0x00000020) == 0x00000020)) {
nestedClassName_ = new java.util.ArrayList(nestedClassName_);
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
}
}
/**
@@ -9560,7 +9339,7 @@ public final class ProtoBuf {
*/
public Builder clearNestedClassName() {
nestedClassName_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
return this;
}
@@ -9569,9 +9348,9 @@ public final class ProtoBuf {
private java.util.List member_ =
java.util.Collections.emptyList();
private void ensureMemberIsMutable() {
- if (!((bitField0_ & 0x00000080) == 0x00000080)) {
+ if (!((bitField0_ & 0x00000040) == 0x00000040)) {
member_ = new java.util.ArrayList(member_);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
}
}
@@ -9676,7 +9455,7 @@ public final class ProtoBuf {
*/
public Builder clearMember() {
member_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
return this;
}
@@ -9693,9 +9472,9 @@ public final class ProtoBuf {
// repeated int32 enum_entry = 12;
private java.util.List enumEntry_ = java.util.Collections.emptyList();
private void ensureEnumEntryIsMutable() {
- if (!((bitField0_ & 0x00000100) == 0x00000100)) {
+ if (!((bitField0_ & 0x00000080) == 0x00000080)) {
enumEntry_ = new java.util.ArrayList(enumEntry_);
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
}
}
/**
@@ -9751,7 +9530,7 @@ public final class ProtoBuf {
*/
public Builder clearEnumEntry() {
enumEntry_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
return this;
}
@@ -9766,7 +9545,7 @@ public final class ProtoBuf {
*
*/
public boolean hasPrimaryConstructor() {
- return ((bitField0_ & 0x00000200) == 0x00000200);
+ return ((bitField0_ & 0x00000100) == 0x00000100);
}
/**
* optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
@@ -9791,7 +9570,7 @@ public final class ProtoBuf {
}
primaryConstructor_ = value;
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000100;
return this;
}
/**
@@ -9805,7 +9584,7 @@ public final class ProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.Builder builderForValue) {
primaryConstructor_ = builderForValue.build();
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000100;
return this;
}
/**
@@ -9816,7 +9595,7 @@ public final class ProtoBuf {
*
*/
public Builder mergePrimaryConstructor(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor value) {
- if (((bitField0_ & 0x00000200) == 0x00000200) &&
+ if (((bitField0_ & 0x00000100) == 0x00000100) &&
primaryConstructor_ != org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) {
primaryConstructor_ =
org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.newBuilder(primaryConstructor_).mergeFrom(value).buildPartial();
@@ -9824,7 +9603,7 @@ public final class ProtoBuf {
primaryConstructor_ = value;
}
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000100;
return this;
}
/**
@@ -9837,7 +9616,7 @@ public final class ProtoBuf {
public Builder clearPrimaryConstructor() {
primaryConstructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000100);
return this;
}
@@ -10377,33 +10156,6 @@ public final class ProtoBuf {
*/
int getFlags();
- // optional string extra_visibility = 2;
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- boolean hasExtraVisibility();
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- java.lang.String getExtraVisibility();
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- com.google.protobuf.ByteString
- getExtraVisibilityBytes();
-
// optional int32 getter_flags = 9;
/**
* optional int32 getter_flags = 9;
@@ -10568,22 +10320,17 @@ public final class ProtoBuf {
flags_ = input.readInt32();
break;
}
- case 18: {
- bitField0_ |= 0x00000002;
- extraVisibility_ = input.readBytes();
- break;
- }
case 34: {
- if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+ if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000010;
+ mutable_bitField0_ |= 0x00000008;
}
typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
break;
}
case 42: {
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
subBuilder = receiverType_.toBuilder();
}
receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
@@ -10591,25 +10338,25 @@ public final class ProtoBuf {
subBuilder.mergeFrom(receiverType_);
receiverType_ = subBuilder.buildPartial();
}
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
break;
}
case 48: {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
name_ = input.readInt32();
break;
}
case 58: {
- if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
+ if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
valueParameter_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000080;
+ mutable_bitField0_ |= 0x00000040;
}
valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.PARSER, extensionRegistry));
break;
}
case 66: {
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
subBuilder = returnType_.toBuilder();
}
returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
@@ -10617,16 +10364,16 @@ public final class ProtoBuf {
subBuilder.mergeFrom(returnType_);
returnType_ = subBuilder.buildPartial();
}
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
break;
}
case 72: {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
getterFlags_ = input.readInt32();
break;
}
case 80: {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
setterFlags_ = input.readInt32();
break;
}
@@ -10638,10 +10385,10 @@ public final class ProtoBuf {
throw new com.google.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
}
- if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
+ if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_);
}
makeExtensionsImmutable();
@@ -11645,61 +11392,6 @@ public final class ProtoBuf {
return flags_;
}
- // optional string extra_visibility = 2;
- public static final int EXTRA_VISIBILITY_FIELD_NUMBER = 2;
- private java.lang.Object extraVisibility_;
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public boolean hasExtraVisibility() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public java.lang.String getExtraVisibility() {
- java.lang.Object ref = extraVisibility_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- if (bs.isValidUtf8()) {
- extraVisibility_ = s;
- }
- return s;
- }
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public com.google.protobuf.ByteString
- getExtraVisibilityBytes() {
- java.lang.Object ref = extraVisibility_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- extraVisibility_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
// optional int32 getter_flags = 9;
public static final int GETTER_FLAGS_FIELD_NUMBER = 9;
private int getterFlags_;
@@ -11715,7 +11407,7 @@ public final class ProtoBuf {
*
*/
public boolean hasGetterFlags() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* optional int32 getter_flags = 9;
@@ -11739,7 +11431,7 @@ public final class ProtoBuf {
* optional int32 setter_flags = 10;
*/
public boolean hasSetterFlags() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* optional int32 setter_flags = 10;
@@ -11791,7 +11483,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
public boolean hasReceiverType() {
- return ((bitField0_ & 0x00000010) == 0x00000010);
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
@@ -11811,7 +11503,7 @@ public final class ProtoBuf {
*
*/
public boolean hasName() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* required int32 name = 6;
@@ -11887,7 +11579,7 @@ public final class ProtoBuf {
* required .org.jetbrains.kotlin.serialization.Type return_type = 8;
*/
public boolean hasReturnType() {
- return ((bitField0_ & 0x00000040) == 0x00000040);
+ return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
* required .org.jetbrains.kotlin.serialization.Type return_type = 8;
@@ -11898,7 +11590,6 @@ public final class ProtoBuf {
private void initFields() {
flags_ = 0;
- extraVisibility_ = "";
getterFlags_ = 0;
setterFlags_ = 0;
typeParameter_ = java.util.Collections.emptyList();
@@ -11959,28 +11650,25 @@ public final class ProtoBuf {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeInt32(1, flags_);
}
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- output.writeBytes(2, getExtraVisibilityBytes());
- }
for (int i = 0; i < typeParameter_.size(); i++) {
output.writeMessage(4, typeParameter_.get(i));
}
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(5, receiverType_);
}
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeInt32(6, name_);
}
for (int i = 0; i < valueParameter_.size(); i++) {
output.writeMessage(7, valueParameter_.get(i));
}
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
output.writeMessage(8, returnType_);
}
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(9, getterFlags_);
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(10, setterFlags_);
}
extensionWriter.writeUntil(200, output);
@@ -11996,19 +11684,15 @@ public final class ProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(1, flags_);
}
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(2, getExtraVisibilityBytes());
- }
for (int i = 0; i < typeParameter_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, typeParameter_.get(i));
}
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, receiverType_);
}
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(6, name_);
}
@@ -12016,15 +11700,15 @@ public final class ProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(7, valueParameter_.get(i));
}
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(8, returnType_);
}
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(9, getterFlags_);
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(10, setterFlags_);
}
@@ -12121,22 +11805,20 @@ public final class ProtoBuf {
super.clear();
flags_ = 0;
bitField0_ = (bitField0_ & ~0x00000001);
- extraVisibility_ = "";
- bitField0_ = (bitField0_ & ~0x00000002);
getterFlags_ = 0;
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000002);
setterFlags_ = 0;
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000004);
typeParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
name_ = 0;
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
valueParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
return this;
}
@@ -12167,35 +11849,31 @@ public final class ProtoBuf {
if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
to_bitField0_ |= 0x00000002;
}
- result.extraVisibility_ = extraVisibility_;
+ result.getterFlags_ = getterFlags_;
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
- result.getterFlags_ = getterFlags_;
- if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
- to_bitField0_ |= 0x00000008;
- }
result.setterFlags_ = setterFlags_;
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
}
result.typeParameter_ = typeParameter_;
+ if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+ to_bitField0_ |= 0x00000008;
+ }
+ result.receiverType_ = receiverType_;
if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
to_bitField0_ |= 0x00000010;
}
- result.receiverType_ = receiverType_;
- if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
- to_bitField0_ |= 0x00000020;
- }
result.name_ = name_;
- if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_);
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
}
result.valueParameter_ = valueParameter_;
- if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
- to_bitField0_ |= 0x00000040;
+ if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
+ to_bitField0_ |= 0x00000020;
}
result.returnType_ = returnType_;
result.bitField0_ = to_bitField0_;
@@ -12207,11 +11885,6 @@ public final class ProtoBuf {
if (other.hasFlags()) {
setFlags(other.getFlags());
}
- if (other.hasExtraVisibility()) {
- bitField0_ |= 0x00000002;
- extraVisibility_ = other.extraVisibility_;
-
- }
if (other.hasGetterFlags()) {
setGetterFlags(other.getGetterFlags());
}
@@ -12221,7 +11894,7 @@ public final class ProtoBuf {
if (!other.typeParameter_.isEmpty()) {
if (typeParameter_.isEmpty()) {
typeParameter_ = other.typeParameter_;
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
} else {
ensureTypeParameterIsMutable();
typeParameter_.addAll(other.typeParameter_);
@@ -12237,7 +11910,7 @@ public final class ProtoBuf {
if (!other.valueParameter_.isEmpty()) {
if (valueParameter_.isEmpty()) {
valueParameter_ = other.valueParameter_;
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
} else {
ensureValueParameterIsMutable();
valueParameter_.addAll(other.valueParameter_);
@@ -12389,104 +12062,6 @@ public final class ProtoBuf {
return this;
}
- // optional string extra_visibility = 2;
- private java.lang.Object extraVisibility_ = "";
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public boolean hasExtraVisibility() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public java.lang.String getExtraVisibility() {
- java.lang.Object ref = extraVisibility_;
- if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- extraVisibility_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public com.google.protobuf.ByteString
- getExtraVisibilityBytes() {
- java.lang.Object ref = extraVisibility_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- extraVisibility_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public Builder setExtraVisibility(
- java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000002;
- extraVisibility_ = value;
-
- return this;
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public Builder clearExtraVisibility() {
- bitField0_ = (bitField0_ & ~0x00000002);
- extraVisibility_ = getDefaultInstance().getExtraVisibility();
-
- return this;
- }
- /**
- * optional string extra_visibility = 2;
- *
- *
- * for things like java-specific visibilities
- *
- */
- public Builder setExtraVisibilityBytes(
- com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000002;
- extraVisibility_ = value;
-
- return this;
- }
-
// optional int32 getter_flags = 9;
private int getterFlags_ ;
/**
@@ -12501,7 +12076,7 @@ public final class ProtoBuf {
*
*/
public boolean hasGetterFlags() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* optional int32 getter_flags = 9;
@@ -12529,7 +12104,7 @@ public final class ProtoBuf {
*
*/
public Builder setGetterFlags(int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
getterFlags_ = value;
return this;
@@ -12546,7 +12121,7 @@ public final class ProtoBuf {
*
*/
public Builder clearGetterFlags() {
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000002);
getterFlags_ = 0;
return this;
@@ -12558,7 +12133,7 @@ public final class ProtoBuf {
* optional int32 setter_flags = 10;
*/
public boolean hasSetterFlags() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* optional int32 setter_flags = 10;
@@ -12570,7 +12145,7 @@ public final class ProtoBuf {
* optional int32 setter_flags = 10;
*/
public Builder setSetterFlags(int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
setterFlags_ = value;
return this;
@@ -12579,7 +12154,7 @@ public final class ProtoBuf {
* optional int32 setter_flags = 10;
*/
public Builder clearSetterFlags() {
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000004);
setterFlags_ = 0;
return this;
@@ -12589,9 +12164,9 @@ public final class ProtoBuf {
private java.util.List typeParameter_ =
java.util.Collections.emptyList();
private void ensureTypeParameterIsMutable() {
- if (!((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (!((bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = new java.util.ArrayList(typeParameter_);
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
}
}
@@ -12696,7 +12271,7 @@ public final class ProtoBuf {
*/
public Builder clearTypeParameter() {
typeParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
@@ -12716,7 +12291,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
public boolean hasReceiverType() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
@@ -12733,7 +12308,7 @@ public final class ProtoBuf {
}
receiverType_ = value;
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
return this;
}
/**
@@ -12743,14 +12318,14 @@ public final class ProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
receiverType_ = builderForValue.build();
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
return this;
}
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
- if (((bitField0_ & 0x00000020) == 0x00000020) &&
+ if (((bitField0_ & 0x00000010) == 0x00000010) &&
receiverType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
receiverType_ =
org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
@@ -12758,7 +12333,7 @@ public final class ProtoBuf {
receiverType_ = value;
}
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
return this;
}
/**
@@ -12767,7 +12342,7 @@ public final class ProtoBuf {
public Builder clearReceiverType() {
receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
@@ -12781,7 +12356,7 @@ public final class ProtoBuf {
*
*/
public boolean hasName() {
- return ((bitField0_ & 0x00000040) == 0x00000040);
+ return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
* required int32 name = 6;
@@ -12801,7 +12376,7 @@ public final class ProtoBuf {
*
*/
public Builder setName(int value) {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
name_ = value;
return this;
@@ -12814,7 +12389,7 @@ public final class ProtoBuf {
*
*/
public Builder clearName() {
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
name_ = 0;
return this;
@@ -12824,9 +12399,9 @@ public final class ProtoBuf {
private java.util.List valueParameter_ =
java.util.Collections.emptyList();
private void ensureValueParameterIsMutable() {
- if (!((bitField0_ & 0x00000080) == 0x00000080)) {
+ if (!((bitField0_ & 0x00000040) == 0x00000040)) {
valueParameter_ = new java.util.ArrayList(valueParameter_);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
}
}
@@ -12975,7 +12550,7 @@ public final class ProtoBuf {
*/
public Builder clearValueParameter() {
valueParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
return this;
}
@@ -12999,7 +12574,7 @@ public final class ProtoBuf {
* required .org.jetbrains.kotlin.serialization.Type return_type = 8;
*/
public boolean hasReturnType() {
- return ((bitField0_ & 0x00000100) == 0x00000100);
+ return ((bitField0_ & 0x00000080) == 0x00000080);
}
/**
* required .org.jetbrains.kotlin.serialization.Type return_type = 8;
@@ -13016,7 +12591,7 @@ public final class ProtoBuf {
}
returnType_ = value;
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
return this;
}
/**
@@ -13026,14 +12601,14 @@ public final class ProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
returnType_ = builderForValue.build();
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
return this;
}
/**
* required .org.jetbrains.kotlin.serialization.Type return_type = 8;
*/
public Builder mergeReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
- if (((bitField0_ & 0x00000100) == 0x00000100) &&
+ if (((bitField0_ & 0x00000080) == 0x00000080) &&
returnType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
returnType_ =
org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
@@ -13041,7 +12616,7 @@ public final class ProtoBuf {
returnType_ = value;
}
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
return this;
}
/**
@@ -13050,7 +12625,7 @@ public final class ProtoBuf {
public Builder clearReturnType() {
returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
return this;
}
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
index 64d17b4df98..a29fd7fab0a 100644
--- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
@@ -43,7 +43,6 @@ fun visibility(visibility: ProtoBuf.Visibility) = when (visibility) {
ProtoBuf.Visibility.PRIVATE_TO_THIS -> Visibilities.PRIVATE_TO_THIS
ProtoBuf.Visibility.PROTECTED -> Visibilities.PROTECTED
ProtoBuf.Visibility.PUBLIC -> Visibilities.PUBLIC
- ProtoBuf.Visibility.EXTRA -> throw UnsupportedOperationException("Extra visibilities are not supported yet")
}
public fun classKind(kind: ProtoBuf.Class.Kind): ClassKind = when (kind) {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
index 61156db965b..0343d1dd495 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
@@ -17,27 +17,21 @@
package org.jetbrains.kotlin.idea.decompiler.stubBuilder
import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
+import org.jetbrains.kotlin.psi.stubs.impl.*
import org.jetbrains.kotlin.psi.JetPackageDirective
import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes
import com.intellij.psi.stubs.StubElement
import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl
import org.jetbrains.kotlin.psi.JetDotQualifiedExpression
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub
import org.jetbrains.kotlin.name.SpecialNames
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinUserTypeStubImpl
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.lexer.JetTokens
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl
-import org.jetbrains.kotlin.psi.stubs.impl.ModifierMaskUtils
import org.jetbrains.kotlin.serialization.ProtoBuf
import com.intellij.util.io.StringRef
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinAnnotationEntryStubImpl
import org.jetbrains.kotlin.psi.JetConstructorCalleeExpression
import org.jetbrains.kotlin.psi.JetTypeReference
import org.jetbrains.kotlin.name.Name
@@ -134,7 +128,6 @@ enum class FlagsToModifiers {
ProtoBuf.Visibility.INTERNAL -> JetTokens.INTERNAL_KEYWORD
ProtoBuf.Visibility.PROTECTED -> JetTokens.PROTECTED_KEYWORD
ProtoBuf.Visibility.PUBLIC -> JetTokens.PUBLIC_KEYWORD
- //TODO: support extra visibility
else -> throw IllegalStateException("Unexpected visibility: $visibility")
}
}