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

Mark enum entry names as name ids for incremental compilation purposes

Browse Source
This commit is contained in:
Alexander Udalov
2015-12-25 19:31:45 +03:00
parent 3513a64351
commit 697228eae0
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
+10 -9
View File
@@ -21667,15 +21667,15 @@ public final class DebugProtoBuf {
"ins.kotlin.serialization.Type\022\017\n\007type_id", "ins.kotlin.serialization.Type\022\017\n\007type_id",
"\030\005 \001(\005\022E\n\023vararg_element_type\030\004 \001(\0132(.or" + "\030\005 \001(\005\022E\n\023vararg_element_type\030\004 \001(\0132(.or" +
"g.jetbrains.kotlin.serialization.Type\022\036\n" + "g.jetbrains.kotlin.serialization.Type\022\036\n" +
"\026vararg_element_type_id\030\006 \001(\005*\005\010d\020\310\001\" \n\t" + "\026vararg_element_type_id\030\006 \001(\005*\005\010d\020\310\001\"&\n\t" +
"EnumEntry\022\014\n\004name\030\001 \001(\005*\005\010d\020\310\001*9\n\010Modali" + "EnumEntry\022\022\n\004name\030\001 \001(\005B\004\210\265\030\001*\005\010d\020\310\001*9\n\010" +
"ty\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002\022\n\n" + "Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRAC" +
"\006SEALED\020\003*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n" + "T\020\002\022\n\n\006SEALED\020\003*b\n\nVisibility\022\014\n\010INTERNA" +
"\007PRIVATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n" + "L\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLI" +
"\017PRIVATE_TO_THIS\020\004\022\t\n\005LOCAL\020\005*Q\n\nMemberK" + "C\020\003\022\023\n\017PRIVATE_TO_THIS\020\004\022\t\n\005LOCAL\020\005*Q\n\nM" +
"ind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERRIDE\020\001\022" + "emberKind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERR" +
"\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003B\022B\rDebu", "IDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003B\022",
"gProtoBuf\210\001\000" "B\rDebugProtoBuf\210\001\000"
}; };
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -21801,6 +21801,7 @@ public final class DebugProtoBuf {
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable); registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable); registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable); registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
return registry; return registry;
} }
}; };
core/deserialization/src/descriptors.proto
+1 -1
View File
@@ -321,7 +321,7 @@ message ValueParameter {
} }
message EnumEntry { message EnumEntry {
optional int32 name = 1; optional int32 name = 1 [(name_id_in_table) = true];
extensions 100 to 199; extensions 100 to 199;
} }
jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
+2 -2
View File
@@ -388,7 +388,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
open fun checkEquals(old: ProtoBuf.EnumEntry, new: ProtoBuf.EnumEntry): Boolean { open fun checkEquals(old: ProtoBuf.EnumEntry, new: ProtoBuf.EnumEntry): Boolean {
if (old.hasName() != new.hasName()) return false if (old.hasName() != new.hasName()) return false
if (old.hasName()) { if (old.hasName()) {
if (old.name != new.name) return false if (!checkStringEquals(old.name, new.name)) return false
} }
return true return true
@@ -1075,7 +1075,7 @@ public fun ProtoBuf.EnumEntry.hashCode(stringIndexes: (Int) -> Int, fqNameIndexe
var hashCode = 1 var hashCode = 1
if (hasName()) { if (hasName()) {
hashCode = 31 * hashCode + name hashCode = 31 * hashCode + stringIndexes(name)
} }
return hashCode return hashCode