fix KT-8648 Exception from incremental compilation

#KT-8648 Fixed
This commit is contained in:
Michael Nedzelsky
2015-07-29 13:55:39 +03:00
parent 00eaec766d
commit e9d7bbf493
8 changed files with 52 additions and 30 deletions
+2 -2
View File
@@ -76,7 +76,7 @@ message Annotation {
optional double double_value = 4;
// id in StringTable
optional int32 string_value = 5 [(name_id_in_table) = true];
optional int32 string_value = 5 [(string_id_in_table) = true];
// If type = CLASS, FQ name id of the referenced class; if type = ENUM, FQ name id of the enum class
optional int32 class_id = 6 [(fq_name_id_in_table) = true];
@@ -133,7 +133,7 @@ message Type {
// Id in the StringTable
// If this field is set, the type is flexible.
// All the other fields and extensions represent its lower bound, and flexible_upper_bound must be set and represents its upper bound.
optional int32 flexible_type_capabilities_id = 4 [(name_id_in_table) = true];
optional int32 flexible_type_capabilities_id = 4 [(string_id_in_table) = true];
// While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
// we use it mainly to save space: having a special mandatory tag on each an every type just to have an option
@@ -9,4 +9,5 @@ extend google.protobuf.FieldOptions {
optional bool skip_in_comparison = 50000;
optional bool name_id_in_table = 50001;
optional bool fq_name_id_in_table = 50002;
optional bool string_id_in_table = 50003;
}