Exclude some proto fields from proto comparison in IC
This commit is contained in:
Alexey Tsvetkov
committed by
romanart
romanart
parent
28e6219b0b
commit
ac9b7fa268
@@ -259,16 +259,6 @@ open class ProtoCompareGenerated(
|
||||
}
|
||||
}
|
||||
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.classFile) != new.hasExtension(KlibMetadataProtoBuf.classFile)) return false
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.classFile)) {
|
||||
if (old.getExtension(KlibMetadataProtoBuf.classFile) != new.getExtension(KlibMetadataProtoBuf.classFile)) return false
|
||||
}
|
||||
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.classUniqId) != new.hasExtension(KlibMetadataProtoBuf.classUniqId)) return false
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.classUniqId)) {
|
||||
if (!checkEquals(old.getExtension(KlibMetadataProtoBuf.classUniqId), new.getExtension(KlibMetadataProtoBuf.classUniqId))) return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
enum class ProtoBufClassKind {
|
||||
@@ -295,9 +285,7 @@ open class ProtoCompareGenerated(
|
||||
JS_EXT_CLASS_CONTAINING_FILE_ID,
|
||||
JAVA_EXT_IS_PACKAGE_PRIVATE_CLASS,
|
||||
BUILT_INS_EXT_CLASS_ANNOTATION_LIST,
|
||||
KLIB_EXT_CLASS_ANNOTATION_LIST,
|
||||
KLIB_EXT_CLASS_FILE,
|
||||
KLIB_EXT_CLASS_UNIQ_ID
|
||||
KLIB_EXT_CLASS_ANNOTATION_LIST
|
||||
}
|
||||
|
||||
fun difference(old: ProtoBuf.Class, new: ProtoBuf.Class): EnumSet<ProtoBufClassKind> {
|
||||
@@ -403,16 +391,6 @@ open class ProtoCompareGenerated(
|
||||
}
|
||||
}
|
||||
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.classFile) != new.hasExtension(KlibMetadataProtoBuf.classFile)) result.add(ProtoBufClassKind.KLIB_EXT_CLASS_FILE)
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.classFile)) {
|
||||
if (old.getExtension(KlibMetadataProtoBuf.classFile) != new.getExtension(KlibMetadataProtoBuf.classFile)) result.add(ProtoBufClassKind.KLIB_EXT_CLASS_FILE)
|
||||
}
|
||||
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.classUniqId) != new.hasExtension(KlibMetadataProtoBuf.classUniqId)) result.add(ProtoBufClassKind.KLIB_EXT_CLASS_UNIQ_ID)
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.classUniqId)) {
|
||||
if (!checkEquals(old.getExtension(KlibMetadataProtoBuf.classUniqId), new.getExtension(KlibMetadataProtoBuf.classUniqId))) result.add(ProtoBufClassKind.KLIB_EXT_CLASS_UNIQ_ID)
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
@@ -517,16 +495,6 @@ open class ProtoCompareGenerated(
|
||||
}
|
||||
}
|
||||
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.functionFile) != new.hasExtension(KlibMetadataProtoBuf.functionFile)) return false
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.functionFile)) {
|
||||
if (old.getExtension(KlibMetadataProtoBuf.functionFile) != new.getExtension(KlibMetadataProtoBuf.functionFile)) return false
|
||||
}
|
||||
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.functionUniqId) != new.hasExtension(KlibMetadataProtoBuf.functionUniqId)) return false
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.functionUniqId)) {
|
||||
if (!checkEquals(old.getExtension(KlibMetadataProtoBuf.functionUniqId), new.getExtension(KlibMetadataProtoBuf.functionUniqId))) return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -703,16 +671,6 @@ open class ProtoCompareGenerated(
|
||||
if (!checkEquals(old.getExtension(KlibMetadataProtoBuf.compileTimeValue), new.getExtension(KlibMetadataProtoBuf.compileTimeValue))) return false
|
||||
}
|
||||
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.propertyFile) != new.hasExtension(KlibMetadataProtoBuf.propertyFile)) return false
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.propertyFile)) {
|
||||
if (old.getExtension(KlibMetadataProtoBuf.propertyFile) != new.getExtension(KlibMetadataProtoBuf.propertyFile)) return false
|
||||
}
|
||||
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.propertyUniqId) != new.hasExtension(KlibMetadataProtoBuf.propertyUniqId)) return false
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.propertyUniqId)) {
|
||||
if (!checkEquals(old.getExtension(KlibMetadataProtoBuf.propertyUniqId), new.getExtension(KlibMetadataProtoBuf.propertyUniqId))) return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -750,11 +708,6 @@ open class ProtoCompareGenerated(
|
||||
|
||||
if (!checkEqualsTypeAliasVersionRequirement(old, new)) return false
|
||||
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.typeAliasUniqId) != new.hasExtension(KlibMetadataProtoBuf.typeAliasUniqId)) return false
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.typeAliasUniqId)) {
|
||||
if (!checkEquals(old.getExtension(KlibMetadataProtoBuf.typeAliasUniqId), new.getExtension(KlibMetadataProtoBuf.typeAliasUniqId))) return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -830,11 +783,6 @@ open class ProtoCompareGenerated(
|
||||
}
|
||||
}
|
||||
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.typeParamUniqId) != new.hasExtension(KlibMetadataProtoBuf.typeParamUniqId)) return false
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.typeParamUniqId)) {
|
||||
if (!checkEquals(old.getExtension(KlibMetadataProtoBuf.typeParamUniqId), new.getExtension(KlibMetadataProtoBuf.typeParamUniqId))) return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -997,11 +945,6 @@ open class ProtoCompareGenerated(
|
||||
}
|
||||
}
|
||||
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.constructorUniqId) != new.hasExtension(KlibMetadataProtoBuf.constructorUniqId)) return false
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.constructorUniqId)) {
|
||||
if (!checkEquals(old.getExtension(KlibMetadataProtoBuf.constructorUniqId), new.getExtension(KlibMetadataProtoBuf.constructorUniqId))) return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -1043,11 +986,6 @@ open class ProtoCompareGenerated(
|
||||
if (old.getExtension(KlibMetadataProtoBuf.enumEntryOrdinal) != new.getExtension(KlibMetadataProtoBuf.enumEntryOrdinal)) return false
|
||||
}
|
||||
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.enumEntryUniqId) != new.hasExtension(KlibMetadataProtoBuf.enumEntryUniqId)) return false
|
||||
if (old.hasExtension(KlibMetadataProtoBuf.enumEntryUniqId)) {
|
||||
if (!checkEquals(old.getExtension(KlibMetadataProtoBuf.enumEntryUniqId), new.getExtension(KlibMetadataProtoBuf.enumEntryUniqId))) return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -1059,12 +997,6 @@ open class ProtoCompareGenerated(
|
||||
return true
|
||||
}
|
||||
|
||||
open fun checkEquals(old: KlibMetadataProtoBuf.DescriptorUniqId, new: KlibMetadataProtoBuf.DescriptorUniqId): Boolean {
|
||||
if (old.index != new.index) return false
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
open fun checkEquals(old: ProtoBuf.ValueParameter, new: ProtoBuf.ValueParameter): Boolean {
|
||||
if (old.hasFlags() != new.hasFlags()) return false
|
||||
if (old.hasFlags()) {
|
||||
@@ -1879,14 +1811,6 @@ fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) ->
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.classAnnotation, i).hashCode(stringIndexes, fqNameIndexes, typeById)
|
||||
}
|
||||
|
||||
if (hasExtension(KlibMetadataProtoBuf.classFile)) {
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.classFile)
|
||||
}
|
||||
|
||||
if (hasExtension(KlibMetadataProtoBuf.classUniqId)) {
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.classUniqId).hashCode(stringIndexes, fqNameIndexes, typeById)
|
||||
}
|
||||
|
||||
return hashCode
|
||||
}
|
||||
|
||||
@@ -1971,14 +1895,6 @@ fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int)
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.functionAnnotation, i).hashCode(stringIndexes, fqNameIndexes, typeById)
|
||||
}
|
||||
|
||||
if (hasExtension(KlibMetadataProtoBuf.functionFile)) {
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.functionFile)
|
||||
}
|
||||
|
||||
if (hasExtension(KlibMetadataProtoBuf.functionUniqId)) {
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.functionUniqId).hashCode(stringIndexes, fqNameIndexes, typeById)
|
||||
}
|
||||
|
||||
return hashCode
|
||||
}
|
||||
|
||||
@@ -2099,14 +2015,6 @@ fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int)
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.compileTimeValue).hashCode(stringIndexes, fqNameIndexes, typeById)
|
||||
}
|
||||
|
||||
if (hasExtension(KlibMetadataProtoBuf.propertyFile)) {
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.propertyFile)
|
||||
}
|
||||
|
||||
if (hasExtension(KlibMetadataProtoBuf.propertyUniqId)) {
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.propertyUniqId).hashCode(stringIndexes, fqNameIndexes, typeById)
|
||||
}
|
||||
|
||||
return hashCode
|
||||
}
|
||||
|
||||
@@ -2147,10 +2055,6 @@ fun ProtoBuf.TypeAlias.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int
|
||||
hashCode = 31 * hashCode + getVersionRequirement(i)
|
||||
}
|
||||
|
||||
if (hasExtension(KlibMetadataProtoBuf.typeAliasUniqId)) {
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.typeAliasUniqId).hashCode(stringIndexes, fqNameIndexes, typeById)
|
||||
}
|
||||
|
||||
return hashCode
|
||||
}
|
||||
|
||||
@@ -2217,10 +2121,6 @@ fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes:
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.typeParameterAnnotation, i).hashCode(stringIndexes, fqNameIndexes, typeById)
|
||||
}
|
||||
|
||||
if (hasExtension(KlibMetadataProtoBuf.typeParamUniqId)) {
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.typeParamUniqId).hashCode(stringIndexes, fqNameIndexes, typeById)
|
||||
}
|
||||
|
||||
return hashCode
|
||||
}
|
||||
|
||||
@@ -2341,10 +2241,6 @@ fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.constructorAnnotation, i).hashCode(stringIndexes, fqNameIndexes, typeById)
|
||||
}
|
||||
|
||||
if (hasExtension(KlibMetadataProtoBuf.constructorUniqId)) {
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.constructorUniqId).hashCode(stringIndexes, fqNameIndexes, typeById)
|
||||
}
|
||||
|
||||
return hashCode
|
||||
}
|
||||
|
||||
@@ -2371,10 +2267,6 @@ fun ProtoBuf.EnumEntry.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.enumEntryOrdinal)
|
||||
}
|
||||
|
||||
if (hasExtension(KlibMetadataProtoBuf.enumEntryUniqId)) {
|
||||
hashCode = 31 * hashCode + getExtension(KlibMetadataProtoBuf.enumEntryUniqId).hashCode(stringIndexes, fqNameIndexes, typeById)
|
||||
}
|
||||
|
||||
return hashCode
|
||||
}
|
||||
|
||||
@@ -2390,14 +2282,6 @@ fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (In
|
||||
return hashCode
|
||||
}
|
||||
|
||||
fun KlibMetadataProtoBuf.DescriptorUniqId.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int, typeById: (Int) -> ProtoBuf.Type): Int {
|
||||
var hashCode = 1
|
||||
|
||||
hashCode = 31 * hashCode + index.hashCode()
|
||||
|
||||
return hashCode
|
||||
}
|
||||
|
||||
fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int, typeById: (Int) -> ProtoBuf.Type): Int {
|
||||
var hashCode = 1
|
||||
|
||||
|
||||
@@ -274,10 +274,7 @@ class DifferenceCalculatorForClass(
|
||||
}
|
||||
ProtoBufClassKind.KLIB_EXT_CLASS_ANNOTATION_LIST -> {
|
||||
isClassAffected = true
|
||||
}
|
||||
ProtoBufClassKind.KLIB_EXT_CLASS_FILE,
|
||||
ProtoBufClassKind.KLIB_EXT_CLASS_UNIQ_ID -> {
|
||||
// Not affected (probably?)
|
||||
areSubclassesAffected = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+102
-82
@@ -3462,88 +3462,91 @@ public final class DebugKlibMetadataProtoBuf {
|
||||
"\n@compiler/util-klib-metadata/src/KlibMe" +
|
||||
"tadataProtoBuf.debug.proto\022%org.jetbrain" +
|
||||
"s.kotlin.library.metadata\032&core/metadata" +
|
||||
"/src/metadata.debug.proto\"\345\002\n\006Header\022\023\n\013" +
|
||||
"module_name\030\001 \002(\t\022\r\n\005flags\030\002 \001(\005\022;\n\007stri" +
|
||||
"ngs\030\004 \001(\0132*.org.jetbrains.kotlin.metadat" +
|
||||
"a.StringTable\022J\n\017qualified_names\030\005 \001(\01321" +
|
||||
".org.jetbrains.kotlin.metadata.Qualified" +
|
||||
"NameTable\022=\n\nannotation\030\006 \003(\0132).org.jetb" +
|
||||
"rains.kotlin.metadata.Annotation\022\035\n\025pack",
|
||||
"age_fragment_name\030\007 \003(\t\022\025\n\rempty_package" +
|
||||
"\030\010 \003(\t\0229\n\004file\030\t \003(\0132+.org.jetbrains.kot" +
|
||||
"lin.library.metadata.File\"\024\n\004File\022\014\n\004nam" +
|
||||
"e\030\001 \002(\t\"!\n\020DescriptorUniqId\022\r\n\005index\030\001 \002" +
|
||||
"(\003:@\n\017package_fq_name\022&.org.jetbrains.ko" +
|
||||
"tlin.metadata.Package\030\253\001 \001(\005:j\n\020class_an" +
|
||||
"notation\022$.org.jetbrains.kotlin.metadata" +
|
||||
".Class\030\252\001 \003(\0132).org.jetbrains.kotlin.met" +
|
||||
"adata.Annotation:9\n\nclass_file\022$.org.jet" +
|
||||
"brains.kotlin.metadata.Class\030\257\001 \001(\005:u\n\rc",
|
||||
"lass_uniq_id\022$.org.jetbrains.kotlin.meta" +
|
||||
"data.Class\030\253\001 \001(\01327.org.jetbrains.kotlin" +
|
||||
".library.metadata.DescriptorUniqId:v\n\026co" +
|
||||
"nstructor_annotation\022*.org.jetbrains.kot" +
|
||||
"lin.metadata.Constructor\030\252\001 \003(\0132).org.je" +
|
||||
"tbrains.kotlin.metadata.Annotation:\201\001\n\023c" +
|
||||
"onstructor_uniq_id\022*.org.jetbrains.kotli" +
|
||||
"n.metadata.Constructor\030\254\001 \001(\01327.org.jetb" +
|
||||
"rains.kotlin.library.metadata.Descriptor" +
|
||||
"UniqId:p\n\023function_annotation\022\'.org.jetb",
|
||||
"rains.kotlin.metadata.Function\030\252\001 \003(\0132)." +
|
||||
"org.jetbrains.kotlin.metadata.Annotation" +
|
||||
":?\n\rfunction_file\022\'.org.jetbrains.kotlin" +
|
||||
".metadata.Function\030\254\001 \001(\005:{\n\020function_un" +
|
||||
"iq_id\022\'.org.jetbrains.kotlin.metadata.Fu" +
|
||||
"nction\030\255\001 \001(\01327.org.jetbrains.kotlin.lib" +
|
||||
"rary.metadata.DescriptorUniqId:p\n\023proper" +
|
||||
"ty_annotation\022\'.org.jetbrains.kotlin.met" +
|
||||
"adata.Property\030\252\001 \003(\0132).org.jetbrains.ko" +
|
||||
"tlin.metadata.Annotation:w\n\032property_get",
|
||||
"ter_annotation\022\'.org.jetbrains.kotlin.me" +
|
||||
"tadata.Property\030\261\001 \003(\0132).org.jetbrains.k" +
|
||||
"otlin.metadata.Annotation:w\n\032property_se" +
|
||||
"tter_annotation\022\'.org.jetbrains.kotlin.m" +
|
||||
"etadata.Property\030\262\001 \003(\0132).org.jetbrains." +
|
||||
"kotlin.metadata.Annotation:~\n\022compile_ti" +
|
||||
"me_value\022\'.org.jetbrains.kotlin.metadata" +
|
||||
".Property\030\255\001 \001(\01328.org.jetbrains.kotlin." +
|
||||
"metadata.Annotation.Argument.Value:?\n\rpr" +
|
||||
"operty_file\022\'.org.jetbrains.kotlin.metad",
|
||||
"ata.Property\030\260\001 \001(\005:{\n\020property_uniq_id\022" +
|
||||
"\'.org.jetbrains.kotlin.metadata.Property" +
|
||||
"\030\263\001 \001(\01327.org.jetbrains.kotlin.library.m" +
|
||||
"etadata.DescriptorUniqId:s\n\025enum_entry_a" +
|
||||
"nnotation\022(.org.jetbrains.kotlin.metadat" +
|
||||
"a.EnumEntry\030\252\001 \003(\0132).org.jetbrains.kotli" +
|
||||
"n.metadata.Annotation:E\n\022enum_entry_ordi" +
|
||||
"nal\022(.org.jetbrains.kotlin.metadata.Enum" +
|
||||
"Entry\030\253\001 \001(\005:~\n\022enum_entry_uniq_id\022(.org" +
|
||||
".jetbrains.kotlin.metadata.EnumEntry\030\254\001 ",
|
||||
"\001(\01327.org.jetbrains.kotlin.library.metad" +
|
||||
"ata.DescriptorUniqId:w\n\024parameter_annota" +
|
||||
"tion\022-.org.jetbrains.kotlin.metadata.Val" +
|
||||
"ueParameter\030\252\001 \003(\0132).org.jetbrains.kotli" +
|
||||
"n.metadata.Annotation:h\n\017type_annotation" +
|
||||
"\022#.org.jetbrains.kotlin.metadata.Type\030\252\001" +
|
||||
" \003(\0132).org.jetbrains.kotlin.metadata.Ann" +
|
||||
"otation:{\n\031type_parameter_annotation\022,.o" +
|
||||
"rg.jetbrains.kotlin.metadata.TypeParamet" +
|
||||
"er\030\252\001 \003(\0132).org.jetbrains.kotlin.metadat",
|
||||
"a.Annotation:\202\001\n\022type_param_uniq_id\022,.or" +
|
||||
"g.jetbrains.kotlin.metadata.TypeParamete" +
|
||||
"r\030\253\001 \001(\01327.org.jetbrains.kotlin.library." +
|
||||
"metadata.DescriptorUniqId:O\n\026package_fra" +
|
||||
"gment_files\022..org.jetbrains.kotlin.metad" +
|
||||
"ata.PackageFragment\030\252\001 \003(\005:A\n\010is_empty\022." +
|
||||
".org.jetbrains.kotlin.metadata.PackageFr" +
|
||||
"agment\030\254\001 \001(\010:@\n\007fq_name\022..org.jetbrains" +
|
||||
".kotlin.metadata.PackageFragment\030\255\001 \001(\t:" +
|
||||
"G\n\nclass_name\022..org.jetbrains.kotlin.met",
|
||||
"adata.PackageFragment\030\256\001 \003(\005B\002\020\001:~\n\022type" +
|
||||
"_alias_uniq_id\022(.org.jetbrains.kotlin.me" +
|
||||
"tadata.TypeAlias\030\203\001 \001(\01327.org.jetbrains." +
|
||||
"kotlin.library.metadata.DescriptorUniqId" +
|
||||
"B\033B\031DebugKlibMetadataProtoBuf"
|
||||
"/src/metadata.debug.proto\032)core/metadata" +
|
||||
"/src/ext_options.debug.proto\"\345\002\n\006Header\022" +
|
||||
"\023\n\013module_name\030\001 \002(\t\022\r\n\005flags\030\002 \001(\005\022;\n\007s" +
|
||||
"trings\030\004 \001(\0132*.org.jetbrains.kotlin.meta" +
|
||||
"data.StringTable\022J\n\017qualified_names\030\005 \001(" +
|
||||
"\01321.org.jetbrains.kotlin.metadata.Qualif" +
|
||||
"iedNameTable\022=\n\nannotation\030\006 \003(\0132).org.j",
|
||||
"etbrains.kotlin.metadata.Annotation\022\035\n\025p" +
|
||||
"ackage_fragment_name\030\007 \003(\t\022\025\n\rempty_pack" +
|
||||
"age\030\010 \003(\t\0229\n\004file\030\t \003(\0132+.org.jetbrains." +
|
||||
"kotlin.library.metadata.File\"\024\n\004File\022\014\n\004" +
|
||||
"name\030\001 \002(\t\"!\n\020DescriptorUniqId\022\r\n\005index\030" +
|
||||
"\001 \002(\003:@\n\017package_fq_name\022&.org.jetbrains" +
|
||||
".kotlin.metadata.Package\030\253\001 \001(\005:j\n\020class" +
|
||||
"_annotation\022$.org.jetbrains.kotlin.metad" +
|
||||
"ata.Class\030\252\001 \003(\0132).org.jetbrains.kotlin." +
|
||||
"metadata.Annotation:?\n\nclass_file\022$.org.",
|
||||
"jetbrains.kotlin.metadata.Class\030\257\001 \001(\005B\004" +
|
||||
"\200\265\030\001:{\n\rclass_uniq_id\022$.org.jetbrains.ko" +
|
||||
"tlin.metadata.Class\030\253\001 \001(\01327.org.jetbrai" +
|
||||
"ns.kotlin.library.metadata.DescriptorUni" +
|
||||
"qIdB\004\200\265\030\001:v\n\026constructor_annotation\022*.or" +
|
||||
"g.jetbrains.kotlin.metadata.Constructor\030" +
|
||||
"\252\001 \003(\0132).org.jetbrains.kotlin.metadata.A" +
|
||||
"nnotation:\207\001\n\023constructor_uniq_id\022*.org." +
|
||||
"jetbrains.kotlin.metadata.Constructor\030\254\001" +
|
||||
" \001(\01327.org.jetbrains.kotlin.library.meta",
|
||||
"data.DescriptorUniqIdB\004\200\265\030\001:p\n\023function_" +
|
||||
"annotation\022\'.org.jetbrains.kotlin.metada" +
|
||||
"ta.Function\030\252\001 \003(\0132).org.jetbrains.kotli" +
|
||||
"n.metadata.Annotation:E\n\rfunction_file\022\'" +
|
||||
".org.jetbrains.kotlin.metadata.Function\030" +
|
||||
"\254\001 \001(\005B\004\200\265\030\001:\201\001\n\020function_uniq_id\022\'.org." +
|
||||
"jetbrains.kotlin.metadata.Function\030\255\001 \001(" +
|
||||
"\01327.org.jetbrains.kotlin.library.metadat" +
|
||||
"a.DescriptorUniqIdB\004\200\265\030\001:p\n\023property_ann" +
|
||||
"otation\022\'.org.jetbrains.kotlin.metadata.",
|
||||
"Property\030\252\001 \003(\0132).org.jetbrains.kotlin.m" +
|
||||
"etadata.Annotation:w\n\032property_getter_an" +
|
||||
"notation\022\'.org.jetbrains.kotlin.metadata" +
|
||||
".Property\030\261\001 \003(\0132).org.jetbrains.kotlin." +
|
||||
"metadata.Annotation:w\n\032property_setter_a" +
|
||||
"nnotation\022\'.org.jetbrains.kotlin.metadat" +
|
||||
"a.Property\030\262\001 \003(\0132).org.jetbrains.kotlin" +
|
||||
".metadata.Annotation:~\n\022compile_time_val" +
|
||||
"ue\022\'.org.jetbrains.kotlin.metadata.Prope" +
|
||||
"rty\030\255\001 \001(\01328.org.jetbrains.kotlin.metada",
|
||||
"ta.Annotation.Argument.Value:E\n\rproperty" +
|
||||
"_file\022\'.org.jetbrains.kotlin.metadata.Pr" +
|
||||
"operty\030\260\001 \001(\005B\004\200\265\030\001:\201\001\n\020property_uniq_id" +
|
||||
"\022\'.org.jetbrains.kotlin.metadata.Propert" +
|
||||
"y\030\263\001 \001(\01327.org.jetbrains.kotlin.library." +
|
||||
"metadata.DescriptorUniqIdB\004\200\265\030\001:s\n\025enum_" +
|
||||
"entry_annotation\022(.org.jetbrains.kotlin." +
|
||||
"metadata.EnumEntry\030\252\001 \003(\0132).org.jetbrain" +
|
||||
"s.kotlin.metadata.Annotation:E\n\022enum_ent" +
|
||||
"ry_ordinal\022(.org.jetbrains.kotlin.metada",
|
||||
"ta.EnumEntry\030\253\001 \001(\005:\204\001\n\022enum_entry_uniq_" +
|
||||
"id\022(.org.jetbrains.kotlin.metadata.EnumE" +
|
||||
"ntry\030\254\001 \001(\01327.org.jetbrains.kotlin.libra" +
|
||||
"ry.metadata.DescriptorUniqIdB\004\200\265\030\001:w\n\024pa" +
|
||||
"rameter_annotation\022-.org.jetbrains.kotli" +
|
||||
"n.metadata.ValueParameter\030\252\001 \003(\0132).org.j" +
|
||||
"etbrains.kotlin.metadata.Annotation:h\n\017t" +
|
||||
"ype_annotation\022#.org.jetbrains.kotlin.me" +
|
||||
"tadata.Type\030\252\001 \003(\0132).org.jetbrains.kotli" +
|
||||
"n.metadata.Annotation:{\n\031type_parameter_",
|
||||
"annotation\022,.org.jetbrains.kotlin.metada" +
|
||||
"ta.TypeParameter\030\252\001 \003(\0132).org.jetbrains." +
|
||||
"kotlin.metadata.Annotation:\210\001\n\022type_para" +
|
||||
"m_uniq_id\022,.org.jetbrains.kotlin.metadat" +
|
||||
"a.TypeParameter\030\253\001 \001(\01327.org.jetbrains.k" +
|
||||
"otlin.library.metadata.DescriptorUniqIdB" +
|
||||
"\004\200\265\030\001:U\n\026package_fragment_files\022..org.je" +
|
||||
"tbrains.kotlin.metadata.PackageFragment\030" +
|
||||
"\252\001 \003(\005B\004\200\265\030\001:A\n\010is_empty\022..org.jetbrains" +
|
||||
".kotlin.metadata.PackageFragment\030\254\001 \001(\010:",
|
||||
"@\n\007fq_name\022..org.jetbrains.kotlin.metada" +
|
||||
"ta.PackageFragment\030\255\001 \001(\t:G\n\nclass_name\022" +
|
||||
"..org.jetbrains.kotlin.metadata.PackageF" +
|
||||
"ragment\030\256\001 \003(\005B\002\020\001:\204\001\n\022type_alias_uniq_i" +
|
||||
"d\022(.org.jetbrains.kotlin.metadata.TypeAl" +
|
||||
"ias\030\203\001 \001(\01327.org.jetbrains.kotlin.librar" +
|
||||
"y.metadata.DescriptorUniqIdB\004\200\265\030\001B\033B\031Deb" +
|
||||
"ugKlibMetadataProtoBuf"
|
||||
};
|
||||
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
|
||||
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
|
||||
@@ -3557,6 +3560,7 @@ public final class DebugKlibMetadataProtoBuf {
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
|
||||
org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor(),
|
||||
org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.getDescriptor(),
|
||||
}, assigner);
|
||||
internal_static_org_jetbrains_kotlin_library_metadata_Header_descriptor =
|
||||
getDescriptor().getMessageTypes().get(0);
|
||||
@@ -3603,7 +3607,23 @@ public final class DebugKlibMetadataProtoBuf {
|
||||
fqName.internalInit(descriptor.getExtensions().get(24));
|
||||
className.internalInit(descriptor.getExtensions().get(25));
|
||||
typeAliasUniqId.internalInit(descriptor.getExtensions().get(26));
|
||||
org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
|
||||
org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
|
||||
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
|
||||
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
|
||||
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
|
||||
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
|
||||
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
|
||||
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
|
||||
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
|
||||
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
|
||||
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
|
||||
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
|
||||
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
|
||||
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
|
||||
.internalUpdateFileDescriptor(descriptor, registry);
|
||||
org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor();
|
||||
org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.getDescriptor();
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
package org.jetbrains.kotlin.library.metadata;
|
||||
|
||||
import "core/metadata/src/metadata.proto";
|
||||
import "core/metadata/src/ext_options.proto";
|
||||
|
||||
option java_outer_classname = "KlibMetadataProtoBuf";
|
||||
option optimize_for = LITE_RUNTIME;
|
||||
@@ -56,19 +57,19 @@ extend org.jetbrains.kotlin.metadata.Package {
|
||||
|
||||
extend org.jetbrains.kotlin.metadata.Class {
|
||||
repeated org.jetbrains.kotlin.metadata.Annotation class_annotation = 170;
|
||||
optional int32 class_file = 175;
|
||||
optional DescriptorUniqId class_uniq_id = 171;
|
||||
optional int32 class_file = 175 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
|
||||
optional DescriptorUniqId class_uniq_id = 171 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
|
||||
}
|
||||
|
||||
extend org.jetbrains.kotlin.metadata.Constructor {
|
||||
repeated org.jetbrains.kotlin.metadata.Annotation constructor_annotation = 170;
|
||||
optional DescriptorUniqId constructor_uniq_id = 172;
|
||||
optional DescriptorUniqId constructor_uniq_id = 172 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
|
||||
}
|
||||
|
||||
extend org.jetbrains.kotlin.metadata.Function {
|
||||
repeated org.jetbrains.kotlin.metadata.Annotation function_annotation = 170;
|
||||
optional int32 function_file = 172;
|
||||
optional DescriptorUniqId function_uniq_id = 173;
|
||||
optional int32 function_file = 172 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
|
||||
optional DescriptorUniqId function_uniq_id = 173 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
|
||||
}
|
||||
|
||||
extend org.jetbrains.kotlin.metadata.Property {
|
||||
@@ -76,14 +77,14 @@ extend org.jetbrains.kotlin.metadata.Property {
|
||||
repeated org.jetbrains.kotlin.metadata.Annotation property_getter_annotation = 177;
|
||||
repeated org.jetbrains.kotlin.metadata.Annotation property_setter_annotation = 178;
|
||||
optional org.jetbrains.kotlin.metadata.Annotation.Argument.Value compile_time_value = 173;
|
||||
optional int32 property_file = 176;
|
||||
optional DescriptorUniqId property_uniq_id = 179;
|
||||
optional int32 property_file = 176 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
|
||||
optional DescriptorUniqId property_uniq_id = 179 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
|
||||
}
|
||||
|
||||
extend org.jetbrains.kotlin.metadata.EnumEntry {
|
||||
repeated org.jetbrains.kotlin.metadata.Annotation enum_entry_annotation = 170;
|
||||
optional int32 enum_entry_ordinal = 171;
|
||||
optional DescriptorUniqId enum_entry_uniq_id = 172;
|
||||
optional DescriptorUniqId enum_entry_uniq_id = 172 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
|
||||
}
|
||||
|
||||
extend org.jetbrains.kotlin.metadata.ValueParameter {
|
||||
@@ -96,11 +97,11 @@ extend org.jetbrains.kotlin.metadata.Type {
|
||||
|
||||
extend org.jetbrains.kotlin.metadata.TypeParameter {
|
||||
repeated org.jetbrains.kotlin.metadata.Annotation type_parameter_annotation = 170;
|
||||
optional DescriptorUniqId type_param_uniq_id = 171;
|
||||
optional DescriptorUniqId type_param_uniq_id = 171 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
|
||||
}
|
||||
|
||||
extend org.jetbrains.kotlin.metadata.PackageFragment {
|
||||
repeated int32 package_fragment_files = 170;
|
||||
repeated int32 package_fragment_files = 170 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
|
||||
optional bool is_empty = 172;
|
||||
optional string fq_name = 173;
|
||||
// id in StringTable
|
||||
@@ -109,5 +110,5 @@ extend org.jetbrains.kotlin.metadata.PackageFragment {
|
||||
|
||||
extend org.jetbrains.kotlin.metadata.TypeAlias {
|
||||
// TODO repeated org.jetbrains.kotlin.metadata.Annotation type_alias_annotation = 130;
|
||||
optional DescriptorUniqId type_alias_uniq_id = 131;
|
||||
optional DescriptorUniqId type_alias_uniq_id = 131 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
|
||||
}
|
||||
Reference in New Issue
Block a user