From 74906a467c4a50243c79b8a39004b06b0bd42bbe Mon Sep 17 00:00:00 2001 From: Momchil Velikov Date: Wed, 7 Feb 2018 20:28:47 +0000 Subject: Revert "[DebugInfo] Improvements to representation of enumeration types (PR36168)" Revert commit r324489, it broke LLDB tests. llvm-svn: 324511 --- llvm/lib/Bitcode/Reader/MetadataLoader.cpp | 5 ++--- llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Bitcode') diff --git a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp index 374e3152816..c0ec80e9c01 100644 --- a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp +++ b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp @@ -1200,11 +1200,10 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata( if (Record.size() != 3) return error("Invalid record"); - IsDistinct = Record[0] & 1; - bool IsUnsigned = Record[0] & 2; + IsDistinct = Record[0]; MetadataList.assignValue( GET_OR_DISTINCT(DIEnumerator, (Context, unrotateSign(Record[1]), - IsUnsigned, getMDString(Record[2]))), + getMDString(Record[2]))), NextMetadataNo); NextMetadataNo++; break; diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp index 8c65e951bfa..fd9cde17847 100644 --- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -1457,7 +1457,7 @@ void ModuleBitcodeWriter::writeDISubrange(const DISubrange *N, void ModuleBitcodeWriter::writeDIEnumerator(const DIEnumerator *N, SmallVectorImpl &Record, unsigned Abbrev) { - Record.push_back((N->isUnsigned() << 1) | N->isDistinct()); + Record.push_back(N->isDistinct()); Record.push_back(rotateSign(N->getValue())); Record.push_back(VE.getMetadataOrNullID(N->getRawName())); -- cgit v1.2.3