Don't write field signatures when not necessary

This commit is contained in:
Alexander Udalov
2015-10-07 19:42:35 +03:00
parent 864926ee2e
commit 934ffed944
10 changed files with 120 additions and 135 deletions
@@ -2673,19 +2673,19 @@ public final class DebugJvmProtoBuf {
public interface JvmFieldSignatureOrBuilder
extends com.google.protobuf.MessageOrBuilder {
// required int32 name = 1;
// optional int32 name = 1;
/**
* <code>required int32 name = 1;</code>
* <code>optional int32 name = 1;</code>
*/
boolean hasName();
/**
* <code>required int32 name = 1;</code>
* <code>optional int32 name = 1;</code>
*/
int getName();
// required int32 desc = 2;
// optional int32 desc = 2;
/**
* <code>required int32 desc = 2;</code>
* <code>optional int32 desc = 2;</code>
*
* <pre>
* JVM descriptor of the field type, e.g. 'Ljava/lang/String;'
@@ -2693,7 +2693,7 @@ public final class DebugJvmProtoBuf {
*/
boolean hasDesc();
/**
* <code>required int32 desc = 2;</code>
* <code>optional int32 desc = 2;</code>
*
* <pre>
* JVM descriptor of the field type, e.g. 'Ljava/lang/String;'
@@ -2827,27 +2827,27 @@ public final class DebugJvmProtoBuf {
}
private int bitField0_;
// required int32 name = 1;
// optional int32 name = 1;
public static final int NAME_FIELD_NUMBER = 1;
private int name_;
/**
* <code>required int32 name = 1;</code>
* <code>optional int32 name = 1;</code>
*/
public boolean hasName() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>required int32 name = 1;</code>
* <code>optional int32 name = 1;</code>
*/
public int getName() {
return name_;
}
// required int32 desc = 2;
// optional int32 desc = 2;
public static final int DESC_FIELD_NUMBER = 2;
private int desc_;
/**
* <code>required int32 desc = 2;</code>
* <code>optional int32 desc = 2;</code>
*
* <pre>
* JVM descriptor of the field type, e.g. 'Ljava/lang/String;'
@@ -2857,7 +2857,7 @@ public final class DebugJvmProtoBuf {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>required int32 desc = 2;</code>
* <code>optional int32 desc = 2;</code>
*
* <pre>
* JVM descriptor of the field type, e.g. 'Ljava/lang/String;'
@@ -2903,14 +2903,6 @@ public final class DebugJvmProtoBuf {
byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1;
if (!hasName()) {
memoizedIsInitialized = 0;
return false;
}
if (!hasDesc()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1;
return true;
}
@@ -3140,14 +3132,6 @@ public final class DebugJvmProtoBuf {
}
public final boolean isInitialized() {
if (!hasName()) {
return false;
}
if (!hasDesc()) {
return false;
}
return true;
}
@@ -3170,22 +3154,22 @@ public final class DebugJvmProtoBuf {
}
private int bitField0_;
// required int32 name = 1;
// optional int32 name = 1;
private int name_ ;
/**
* <code>required int32 name = 1;</code>
* <code>optional int32 name = 1;</code>
*/
public boolean hasName() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>required int32 name = 1;</code>
* <code>optional int32 name = 1;</code>
*/
public int getName() {
return name_;
}
/**
* <code>required int32 name = 1;</code>
* <code>optional int32 name = 1;</code>
*/
public Builder setName(int value) {
bitField0_ |= 0x00000001;
@@ -3194,7 +3178,7 @@ public final class DebugJvmProtoBuf {
return this;
}
/**
* <code>required int32 name = 1;</code>
* <code>optional int32 name = 1;</code>
*/
public Builder clearName() {
bitField0_ = (bitField0_ & ~0x00000001);
@@ -3203,10 +3187,10 @@ public final class DebugJvmProtoBuf {
return this;
}
// required int32 desc = 2;
// optional int32 desc = 2;
private int desc_ ;
/**
* <code>required int32 desc = 2;</code>
* <code>optional int32 desc = 2;</code>
*
* <pre>
* JVM descriptor of the field type, e.g. 'Ljava/lang/String;'
@@ -3216,7 +3200,7 @@ public final class DebugJvmProtoBuf {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>required int32 desc = 2;</code>
* <code>optional int32 desc = 2;</code>
*
* <pre>
* JVM descriptor of the field type, e.g. 'Ljava/lang/String;'
@@ -3226,7 +3210,7 @@ public final class DebugJvmProtoBuf {
return desc_;
}
/**
* <code>required int32 desc = 2;</code>
* <code>optional int32 desc = 2;</code>
*
* <pre>
* JVM descriptor of the field type, e.g. 'Ljava/lang/String;'
@@ -3239,7 +3223,7 @@ public final class DebugJvmProtoBuf {
return this;
}
/**
* <code>required int32 desc = 2;</code>
* <code>optional int32 desc = 2;</code>
*
* <pre>
* JVM descriptor of the field type, e.g. 'Ljava/lang/String;'
@@ -3641,12 +3625,6 @@ public final class DebugJvmProtoBuf {
byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1;
if (hasField()) {
if (!getField().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
memoizedIsInitialized = 1;
return true;
}
@@ -3928,12 +3906,6 @@ public final class DebugJvmProtoBuf {
}
public final boolean isInitialized() {
if (hasField()) {
if (!getField().isInitialized()) {
return false;
}
}
return true;
}
@@ -4621,8 +4593,8 @@ public final class DebugJvmProtoBuf {
"\022\030\n\024INTERNAL_TO_CLASS_ID\020\001\022\024\n\020DESC_TO_CL" +
"ASS_ID\020\002\"<\n\022JvmMethodSignature\022\022\n\004name\030\001" +
" \001(\005B\004\230\265\030\001\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"^\n\021JvmFie" +
"ldSignature\022\022\n\004name\030\001 \002(\005B\004\230\265\030\001\022\022\n\004desc\030" +
"\002 \002(\005B\004\230\265\030\001\022!\n\022is_static_in_outer\030\003 \001(\010:" +
"ldSignature\022\022\n\004name\030\001 \001(\005B\004\230\265\030\001\022\022\n\004desc\030" +
"\002 \001(\005B\004\230\265\030\001\022!\n\022is_static_in_outer\030\003 \001(\010:" +
"\005false\"\316\002\n\024JvmPropertySignature\022H\n\005field",
"\030\001 \001(\01329.org.jetbrains.kotlin.serializat" +
"ion.jvm.JvmFieldSignature\022T\n\020synthetic_m" +