diff options
| author | Yonghong Song <yhs@fb.com> | 2021-08-19 15:54:38 -0700 |
|---|---|---|
| committer | Yonghong Song <yhs@fb.com> | 2021-08-19 15:54:38 -0700 |
| commit | c1169b8bd3255dbae62c0a6122c0f0eda28b5814 (patch) | |
| tree | a18ae7071c6736e23629cfc4554daa4c8f815890 /llvm/lib/Bitcode/Reader/MetadataLoader.cpp | |
| parent | 2fded193e7a8fb5bd8fb339f00fd9de686390530 (diff) | |
| download | llvm-c1169b8bd3255dbae62c0a6122c0f0eda28b5814.zip llvm-c1169b8bd3255dbae62c0a6122c0f0eda28b5814.tar.gz llvm-c1169b8bd3255dbae62c0a6122c0f0eda28b5814.tar.bz2 | |
Revert "[DebugInfo] generate btf_tag annotations for DIComposite types"
This reverts commit 2fded193e7a8fb5bd8fb339f00fd9de686390530.
Builtbot reports some test failures. Revert now so I can take time
to fix the issues.
Diffstat (limited to 'llvm/lib/Bitcode/Reader/MetadataLoader.cpp')
| -rw-r--r-- | llvm/lib/Bitcode/Reader/MetadataLoader.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp index da6010e..8493eb7 100644 --- a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp +++ b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp @@ -1461,7 +1461,7 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata( break; } case bitc::METADATA_COMPOSITE_TYPE: { - if (Record.size() < 16 || Record.size() > 22) + if (Record.size() < 16 || Record.size() > 21) return error("Invalid record"); // If we have a UUID and this is not a forward declaration, lookup the @@ -1489,7 +1489,6 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata( Metadata *Associated = nullptr; Metadata *Allocated = nullptr; Metadata *Rank = nullptr; - Metadata *Annotations = nullptr; auto *Identifier = getMDString(Record[15]); // If this module is being parsed so that it can be ThinLTO imported // into another module, composite types only need to be imported @@ -1521,9 +1520,6 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata( if (Record.size() > 20) { Rank = getMDOrNull(Record[20]); } - if (Record.size() > 21) { - Annotations = getMDOrNull(Record[21]); - } } DICompositeType *CT = nullptr; if (Identifier) @@ -1531,7 +1527,7 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata( Context, *Identifier, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits, OffsetInBits, Flags, Elements, RuntimeLang, VTableHolder, TemplateParams, Discriminator, DataLocation, Associated, - Allocated, Rank, Annotations); + Allocated, Rank); // Create a node if we didn't get a lazy ODR type. if (!CT) @@ -1540,7 +1536,7 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata( SizeInBits, AlignInBits, OffsetInBits, Flags, Elements, RuntimeLang, VTableHolder, TemplateParams, Identifier, Discriminator, DataLocation, Associated, - Allocated, Rank, Annotations)); + Allocated, Rank)); if (!IsNotUsedInTypeRef && Identifier) MetadataList.addTypeRef(*Identifier, *cast<DICompositeType>(CT)); |