[llvm] r328562 - Delete pdbutil diff mode.
Zachary Turner via llvm-commits
llvm-commits at lists.llvm.org
Mon Mar 26 11:01:07 PDT 2018
Author: zturner
Date: Mon Mar 26 11:01:07 2018
New Revision: 328562
URL: http://llvm.org/viewvc/llvm-project?rev=328562&view=rev
Log:
Delete pdbutil diff mode.
This has been made obsolete by the fact that almost all of the
things it previously checked for are no longer relevant since
we can just compare bytes in a lot of places.
Removed:
llvm/trunk/tools/llvm-pdbutil/Diff.cpp
llvm/trunk/tools/llvm-pdbutil/Diff.h
llvm/trunk/tools/llvm-pdbutil/DiffPrinter.cpp
llvm/trunk/tools/llvm-pdbutil/DiffPrinter.h
Modified:
llvm/trunk/tools/llvm-pdbutil/CMakeLists.txt
llvm/trunk/tools/llvm-pdbutil/llvm-pdbutil.cpp
llvm/trunk/tools/llvm-pdbutil/llvm-pdbutil.h
Modified: llvm/trunk/tools/llvm-pdbutil/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbutil/CMakeLists.txt?rev=328562&r1=328561&r2=328562&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbutil/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-pdbutil/CMakeLists.txt Mon Mar 26 11:01:07 2018
@@ -11,8 +11,6 @@ set(LLVM_LINK_COMPONENTS
add_llvm_tool(llvm-pdbutil
Analyze.cpp
BytesOutputStyle.cpp
- Diff.cpp
- DiffPrinter.cpp
DumpOutputStyle.cpp
InputFile.cpp
llvm-pdbutil.cpp
Removed: llvm/trunk/tools/llvm-pdbutil/Diff.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbutil/Diff.cpp?rev=328561&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-pdbutil/Diff.cpp (original)
+++ llvm/trunk/tools/llvm-pdbutil/Diff.cpp (removed)
@@ -1,644 +0,0 @@
-//===- Diff.cpp - PDB diff utility ------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Diff.h"
-
-#include "DiffPrinter.h"
-#include "FormatUtil.h"
-#include "StreamUtil.h"
-#include "llvm-pdbutil.h"
-
-#include "llvm/ADT/StringSet.h"
-
-#include "llvm/DebugInfo/PDB/Native/DbiStream.h"
-#include "llvm/DebugInfo/PDB/Native/Formatters.h"
-#include "llvm/DebugInfo/PDB/Native/InfoStream.h"
-#include "llvm/DebugInfo/PDB/Native/PDBFile.h"
-#include "llvm/DebugInfo/PDB/Native/PDBStringTable.h"
-#include "llvm/DebugInfo/PDB/Native/RawConstants.h"
-
-#include "llvm/Support/FormatAdapters.h"
-#include "llvm/Support/FormatProviders.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/Path.h"
-
-using namespace llvm;
-using namespace llvm::pdb;
-
-namespace {
-// Compare and format two stream numbers. Stream numbers are considered
-// identical if they contain the same value, equivalent if they are both
-// the invalid stream or neither is the invalid stream, and different if
-// one is the invalid stream and another isn't.
-struct StreamNumberProvider {
- static DiffResult compare(uint16_t L, uint16_t R) {
- if (L == R)
- return DiffResult::IDENTICAL;
- bool LP = L != kInvalidStreamIndex;
- bool RP = R != kInvalidStreamIndex;
- if (LP != RP)
- return DiffResult::DIFFERENT;
- return DiffResult::EQUIVALENT;
- }
-
- static std::string format(uint16_t SN, bool Right) {
- if (SN == kInvalidStreamIndex)
- return "(not present)";
- return formatv("{0}", SN).str();
- }
-};
-
-// Compares and formats two module indices. Modis are considered identical
-// if they are identical, equivalent if they either both contain a value or
-// both don't contain a value, and different if one contains a value and the
-// other doesn't.
-struct ModiProvider {
- DiffResult compare(Optional<uint32_t> L, Optional<uint32_t> R) {
- if (L == R)
- return DiffResult::IDENTICAL;
- if (L.hasValue() != R.hasValue())
- return DiffResult::DIFFERENT;
- return DiffResult::EQUIVALENT;
- }
-
- std::string format(Optional<uint32_t> Modi, bool Right) {
- if (!Modi.hasValue())
- return "(not present)";
- return formatv("{0}", *Modi).str();
- }
-};
-
-// Compares and formats two paths embedded in the PDB, ignoring the beginning
-// of the path if the user specified it as a "root path" on the command line.
-struct BinaryPathProvider {
- explicit BinaryPathProvider(uint32_t MaxLen) : MaxLen(MaxLen) {}
-
- DiffResult compare(StringRef L, StringRef R) {
- if (L == R)
- return DiffResult::IDENTICAL;
-
- SmallString<64> LN = removeRoot(L, false);
- SmallString<64> RN = removeRoot(R, true);
-
- return (LN.equals_lower(RN)) ? DiffResult::EQUIVALENT
- : DiffResult::DIFFERENT;
- }
-
- std::string format(StringRef S, bool Right) {
- if (S.empty())
- return "(empty)";
-
- SmallString<64> Native = removeRoot(S, Right);
- return truncateStringFront(Native.str(), MaxLen);
- }
-
- SmallString<64> removeRoot(StringRef Path, bool IsRight) const {
- SmallString<64> Native(Path);
- auto &RootOpt = IsRight ? opts::diff::RightRoot : opts::diff::LeftRoot;
- SmallString<64> Root(static_cast<std::string>(RootOpt));
- // pdb paths always use windows syntax, convert slashes to backslashes.
- sys::path::native(Root, sys::path::Style::windows);
- if (sys::path::has_stem(Root, sys::path::Style::windows))
- sys::path::append(Root, sys::path::Style::windows,
- sys::path::get_separator(sys::path::Style::windows));
-
- sys::path::replace_path_prefix(Native, Root, "", sys::path::Style::windows);
- return Native;
- }
- uint32_t MaxLen;
-};
-
-// Compare and format two stream purposes. For general streams, this just
-// compares the description. For module streams it uses the path comparison
-// algorithm taking into consideration the binary root, described above.
-// Formatting stream purposes just prints the stream purpose, except for
-// module streams and named streams, where it prefixes the name / module
-// with an identifier. Example:
-//
-// Named Stream "\names"
-// Module Stream "foo.obj"
-//
-// If a named stream is too long to fit in a column, it is truncated at the
-// end, and if a module is too long to fit in a column, it is truncated at the
-// beginning. Example:
-//
-// Named Stream "\Really Long Str..."
-// Module Stream "...puts\foo.obj"
-//
-struct StreamPurposeProvider {
- explicit StreamPurposeProvider(uint32_t MaxLen) : MaxLen(MaxLen) {}
-
- DiffResult compare(const StreamInfo &L, const StreamInfo &R) {
- if (L.getPurpose() != R.getPurpose())
- return DiffResult::DIFFERENT;
- if (L.getPurpose() == StreamPurpose::ModuleStream) {
- BinaryPathProvider PathProvider(MaxLen);
- return PathProvider.compare(L.getShortName(), R.getShortName());
- }
- return (L.getShortName() == R.getShortName()) ? DiffResult::IDENTICAL
- : DiffResult::DIFFERENT;
- }
-
- std::string format(const StreamInfo &P, bool Right) {
- if (P.getPurpose() == StreamPurpose::Other ||
- P.getPurpose() == StreamPurpose::Symbols)
- return truncateStringBack(P.getShortName(), MaxLen);
- if (P.getPurpose() == StreamPurpose::NamedStream)
- return truncateQuotedNameBack("Named Stream", P.getShortName(), MaxLen);
-
- assert(P.getPurpose() == StreamPurpose::ModuleStream);
- uint32_t ExtraChars = strlen("Module \"\"");
- BinaryPathProvider PathProvider(MaxLen - ExtraChars);
- std::string Result = PathProvider.format(P.getShortName(), Right);
- return formatv("Module \"{0}\"", Result);
- }
-
- uint32_t MaxLen;
-};
-} // namespace
-
-namespace llvm {
-template <> struct format_provider<PdbRaw_FeatureSig> {
- static void format(const PdbRaw_FeatureSig &Sig, raw_ostream &Stream,
- StringRef Style) {
- switch (Sig) {
- case PdbRaw_FeatureSig::MinimalDebugInfo:
- Stream << "MinimalDebugInfo";
- break;
- case PdbRaw_FeatureSig::NoTypeMerge:
- Stream << "NoTypeMerge";
- break;
- case PdbRaw_FeatureSig::VC110:
- Stream << "VC110";
- break;
- case PdbRaw_FeatureSig::VC140:
- Stream << "VC140";
- break;
- }
- }
-};
-}
-
-template <typename R> using ValueOfRange = llvm::detail::ValueOfRange<R>;
-
-DiffStyle::DiffStyle(PDBFile &File1, PDBFile &File2)
- : File1(File1), File2(File2) {}
-
-Error DiffStyle::dump() {
- if (auto EC = diffSuperBlock())
- return EC;
-
- if (auto EC = diffFreePageMap())
- return EC;
-
- if (auto EC = diffStreamDirectory())
- return EC;
-
- if (auto EC = diffStringTable())
- return EC;
-
- if (auto EC = diffInfoStream())
- return EC;
-
- if (auto EC = diffDbiStream())
- return EC;
-
- if (auto EC = diffSectionContribs())
- return EC;
-
- if (auto EC = diffSectionMap())
- return EC;
-
- if (auto EC = diffFpoStream())
- return EC;
-
- if (auto EC = diffTpiStream(StreamTPI))
- return EC;
-
- if (auto EC = diffTpiStream(StreamIPI))
- return EC;
-
- if (auto EC = diffPublics())
- return EC;
-
- if (auto EC = diffGlobals())
- return EC;
-
- return Error::success();
-}
-
-Error DiffStyle::diffSuperBlock() {
- DiffPrinter D(2, "MSF Super Block", 16, 20, opts::diff::PrintResultColumn,
- opts::diff::PrintValueColumns, outs());
- D.printExplicit("File", DiffResult::UNSPECIFIED,
- truncateStringFront(File1.getFilePath(), 18),
- truncateStringFront(File2.getFilePath(), 18));
- D.print("Block Size", File1.getBlockSize(), File2.getBlockSize());
- D.print("Block Count", File1.getBlockCount(), File2.getBlockCount());
- D.print("Unknown 1", File1.getUnknown1(), File2.getUnknown1());
- D.print("Directory Size", File1.getNumDirectoryBytes(),
- File2.getNumDirectoryBytes());
- return Error::success();
-}
-
-Error DiffStyle::diffStreamDirectory() {
- DiffPrinter D(2, "Stream Directory", 30, 20, opts::diff::PrintResultColumn,
- opts::diff::PrintValueColumns, outs());
- D.printExplicit("File", DiffResult::UNSPECIFIED,
- truncateStringFront(File1.getFilePath(), 18),
- truncateStringFront(File2.getFilePath(), 18));
-
- SmallVector<StreamInfo, 32> P;
- SmallVector<StreamInfo, 32> Q;
- discoverStreamPurposes(File1, P);
- discoverStreamPurposes(File2, Q);
- D.print("Stream Count", File1.getNumStreams(), File2.getNumStreams());
- auto PI = to_vector<32>(enumerate(P));
- auto QI = to_vector<32>(enumerate(Q));
-
- // Scan all streams in the left hand side, looking for ones that are also
- // in the right. Each time we find one, remove it. When we're done, Q
- // should contain all the streams that are in the right but not in the left.
- StreamPurposeProvider StreamProvider(28);
- for (const auto &P : PI) {
- typedef decltype(PI) ContainerType;
- typedef typename ContainerType::value_type value_type;
-
- auto Iter = llvm::find_if(QI, [P, &StreamProvider](const value_type &V) {
- DiffResult Result = StreamProvider.compare(P.value(), V.value());
- return Result == DiffResult::EQUIVALENT ||
- Result == DiffResult::IDENTICAL;
- });
-
- if (Iter == QI.end()) {
- D.printExplicit(StreamProvider.format(P.value(), false),
- DiffResult::DIFFERENT, P.index(), "(not present)");
- continue;
- }
-
- D.print<EquivalentDiffProvider>(StreamProvider.format(P.value(), false),
- P.index(), Iter->index());
- QI.erase(Iter);
- }
-
- for (const auto &Q : QI) {
- D.printExplicit(StreamProvider.format(Q.value(), true),
- DiffResult::DIFFERENT, "(not present)", Q.index());
- }
-
- return Error::success();
-}
-
-Error DiffStyle::diffStringTable() {
- DiffPrinter D(2, "String Table", 30, 20, opts::diff::PrintResultColumn,
- opts::diff::PrintValueColumns, outs());
- D.printExplicit("File", DiffResult::UNSPECIFIED,
- truncateStringFront(File1.getFilePath(), 18),
- truncateStringFront(File2.getFilePath(), 18));
-
- auto ExpectedST1 = File1.getStringTable();
- auto ExpectedST2 = File2.getStringTable();
- bool Has1 = !!ExpectedST1;
- bool Has2 = !!ExpectedST2;
- std::string Count1 = Has1 ? llvm::utostr(ExpectedST1->getNameCount())
- : "(string table not present)";
- std::string Count2 = Has2 ? llvm::utostr(ExpectedST2->getNameCount())
- : "(string table not present)";
- D.print("Number of Strings", Count1, Count2);
-
- if (!Has1 || !Has2) {
- consumeError(ExpectedST1.takeError());
- consumeError(ExpectedST2.takeError());
- return Error::success();
- }
-
- auto &ST1 = *ExpectedST1;
- auto &ST2 = *ExpectedST2;
-
- D.print("Hash Version", ST1.getHashVersion(), ST2.getHashVersion());
- D.print("Byte Size", ST1.getByteSize(), ST2.getByteSize());
- D.print("Signature", ST1.getSignature(), ST2.getSignature());
-
- // Both have a valid string table, dive in and compare individual strings.
-
- auto IdList1 = ST1.name_ids();
- auto IdList2 = ST2.name_ids();
- StringSet<> LS;
- StringSet<> RS;
- uint32_t Empty1 = 0;
- uint32_t Empty2 = 0;
- for (auto ID : IdList1) {
- auto S = ST1.getStringForID(ID);
- if (!S)
- return S.takeError();
- if (S->empty())
- ++Empty1;
- else
- LS.insert(*S);
- }
- for (auto ID : IdList2) {
- auto S = ST2.getStringForID(ID);
- if (!S)
- return S.takeError();
- if (S->empty())
- ++Empty2;
- else
- RS.insert(*S);
- }
- D.print("Empty Strings", Empty1, Empty2);
-
- for (const auto &S : LS) {
- auto R = RS.find(S.getKey());
- std::string Truncated = truncateStringMiddle(S.getKey(), 28);
- uint32_t I = cantFail(ST1.getIDForString(S.getKey()));
- if (R == RS.end()) {
- D.printExplicit(Truncated, DiffResult::DIFFERENT, I, "(not present)");
- continue;
- }
-
- uint32_t J = cantFail(ST2.getIDForString(R->getKey()));
- D.print<EquivalentDiffProvider>(Truncated, I, J);
- RS.erase(R);
- }
-
- for (const auto &S : RS) {
- auto L = LS.find(S.getKey());
- std::string Truncated = truncateStringMiddle(S.getKey(), 28);
- uint32_t J = cantFail(ST2.getIDForString(S.getKey()));
- if (L == LS.end()) {
- D.printExplicit(Truncated, DiffResult::DIFFERENT, "(not present)", J);
- continue;
- }
-
- uint32_t I = cantFail(ST1.getIDForString(L->getKey()));
- D.print<EquivalentDiffProvider>(Truncated, I, J);
- }
- return Error::success();
-}
-
-Error DiffStyle::diffFreePageMap() { return Error::success(); }
-
-Error DiffStyle::diffInfoStream() {
- DiffPrinter D(2, "PDB Stream", 22, 40, opts::diff::PrintResultColumn,
- opts::diff::PrintValueColumns, outs());
- D.printExplicit("File", DiffResult::UNSPECIFIED,
- truncateStringFront(File1.getFilePath(), 38),
- truncateStringFront(File2.getFilePath(), 38));
-
- auto ExpectedInfo1 = File1.getPDBInfoStream();
- auto ExpectedInfo2 = File2.getPDBInfoStream();
-
- bool Has1 = !!ExpectedInfo1;
- bool Has2 = !!ExpectedInfo2;
- if (!(Has1 && Has2)) {
- std::string L = Has1 ? "(present)" : "(not present)";
- std::string R = Has2 ? "(present)" : "(not present)";
- D.print("Stream", L, R);
-
- consumeError(ExpectedInfo1.takeError());
- consumeError(ExpectedInfo2.takeError());
- return Error::success();
- }
-
- auto &IS1 = *ExpectedInfo1;
- auto &IS2 = *ExpectedInfo2;
- D.print("Stream Size", IS1.getStreamSize(), IS2.getStreamSize());
- D.print("Age", IS1.getAge(), IS2.getAge());
- D.print("Guid", IS1.getGuid(), IS2.getGuid());
- D.print("Signature", IS1.getSignature(), IS2.getSignature());
- D.print("Version", IS1.getVersion(), IS2.getVersion());
- D.diffUnorderedArray("Feature", IS1.getFeatureSignatures(),
- IS2.getFeatureSignatures());
- D.print("Named Stream Size", IS1.getNamedStreamMapByteSize(),
- IS2.getNamedStreamMapByteSize());
- StringMap<uint32_t> NSL = IS1.getNamedStreams().entries();
- StringMap<uint32_t> NSR = IS2.getNamedStreams().entries();
- D.diffUnorderedMap<EquivalentDiffProvider>("Named Stream", NSL, NSR);
- return Error::success();
-}
-
-typedef std::pair<uint32_t, DbiModuleDescriptor> IndexedModuleDescriptor;
-typedef std::vector<IndexedModuleDescriptor> IndexedModuleDescriptorList;
-
-static IndexedModuleDescriptorList
-getModuleDescriptors(const DbiModuleList &ML) {
- IndexedModuleDescriptorList List;
- List.reserve(ML.getModuleCount());
- for (uint32_t I = 0; I < ML.getModuleCount(); ++I)
- List.emplace_back(I, ML.getModuleDescriptor(I));
- return List;
-}
-
-static IndexedModuleDescriptorList::iterator
-findOverrideEquivalentModule(uint32_t Modi,
- IndexedModuleDescriptorList &OtherList) {
- auto &EqMap = opts::diff::Equivalences;
-
- auto Iter = EqMap.find(Modi);
- if (Iter == EqMap.end())
- return OtherList.end();
-
- uint32_t EqValue = Iter->second;
-
- return llvm::find_if(OtherList,
- [EqValue](const IndexedModuleDescriptor &Desc) {
- return Desc.first == EqValue;
- });
-}
-
-static IndexedModuleDescriptorList::iterator
-findEquivalentModule(const IndexedModuleDescriptor &Item,
- IndexedModuleDescriptorList &OtherList, bool ItemIsRight) {
-
- if (!ItemIsRight) {
- uint32_t Modi = Item.first;
- auto OverrideIter = findOverrideEquivalentModule(Modi, OtherList);
- if (OverrideIter != OtherList.end())
- return OverrideIter;
- }
-
- BinaryPathProvider PathProvider(28);
-
- auto Iter = OtherList.begin();
- auto End = OtherList.end();
- for (; Iter != End; ++Iter) {
- const IndexedModuleDescriptor *Left = &Item;
- const IndexedModuleDescriptor *Right = &*Iter;
- if (ItemIsRight)
- std::swap(Left, Right);
- DiffResult Result = PathProvider.compare(Left->second.getModuleName(),
- Right->second.getModuleName());
- if (Result == DiffResult::EQUIVALENT || Result == DiffResult::IDENTICAL)
- return Iter;
- }
- return OtherList.end();
-}
-
-static void diffOneModule(DiffPrinter &D, const IndexedModuleDescriptor &Item,
- IndexedModuleDescriptorList &Other,
- bool ItemIsRight) {
- StreamPurposeProvider HeaderProvider(70);
- StreamInfo Info = StreamInfo::createModuleStream(
- Item.second.getModuleName(), Item.second.getModuleStreamIndex(),
- Item.first);
- D.printFullRow(HeaderProvider.format(Info, ItemIsRight));
-
- const auto *L = &Item;
-
- auto Iter = findEquivalentModule(Item, Other, ItemIsRight);
- if (Iter == Other.end()) {
- // We didn't find this module at all on the other side. Just print one row
- // and continue.
- if (ItemIsRight)
- D.print<ModiProvider>("- Modi", None, Item.first);
- else
- D.print<ModiProvider>("- Modi", Item.first, None);
- return;
- }
-
- // We did find this module. Go through and compare each field.
- const auto *R = &*Iter;
- if (ItemIsRight)
- std::swap(L, R);
-
- BinaryPathProvider PathProvider(28);
- D.print<ModiProvider>("- Modi", L->first, R->first);
- D.print<BinaryPathProvider>("- Obj File Name", L->second.getObjFileName(),
- R->second.getObjFileName(), PathProvider);
- D.print<StreamNumberProvider>("- Debug Stream",
- L->second.getModuleStreamIndex(),
- R->second.getModuleStreamIndex());
- D.print("- C11 Byte Size", L->second.getC11LineInfoByteSize(),
- R->second.getC11LineInfoByteSize());
- D.print("- C13 Byte Size", L->second.getC13LineInfoByteSize(),
- R->second.getC13LineInfoByteSize());
- D.print("- # of files", L->second.getNumberOfFiles(),
- R->second.getNumberOfFiles());
- D.print("- Pdb File Path Index", L->second.getPdbFilePathNameIndex(),
- R->second.getPdbFilePathNameIndex());
- D.print("- Source File Name Index", L->second.getSourceFileNameIndex(),
- R->second.getSourceFileNameIndex());
- D.print("- Symbol Byte Size", L->second.getSymbolDebugInfoByteSize(),
- R->second.getSymbolDebugInfoByteSize());
- Other.erase(Iter);
-}
-
-Error DiffStyle::diffDbiStream() {
- DiffPrinter D(2, "DBI Stream", 40, 30, opts::diff::PrintResultColumn,
- opts::diff::PrintValueColumns, outs());
- D.printExplicit("File", DiffResult::UNSPECIFIED,
- truncateStringFront(File1.getFilePath(), 28),
- truncateStringFront(File2.getFilePath(), 28));
-
- auto ExpectedDbi1 = File1.getPDBDbiStream();
- auto ExpectedDbi2 = File2.getPDBDbiStream();
-
- bool Has1 = !!ExpectedDbi1;
- bool Has2 = !!ExpectedDbi2;
- if (!(Has1 && Has2)) {
- std::string L = Has1 ? "(present)" : "(not present)";
- std::string R = Has2 ? "(present)" : "(not present)";
- D.print("Stream", L, R);
-
- consumeError(ExpectedDbi1.takeError());
- consumeError(ExpectedDbi2.takeError());
- return Error::success();
- }
-
- auto &DL = *ExpectedDbi1;
- auto &DR = *ExpectedDbi2;
-
- D.print("Dbi Version", (uint32_t)DL.getDbiVersion(),
- (uint32_t)DR.getDbiVersion());
- D.print("Age", DL.getAge(), DR.getAge());
- D.print("Machine", (uint16_t)DL.getMachineType(),
- (uint16_t)DR.getMachineType());
- D.print("Flags", DL.getFlags(), DR.getFlags());
- D.print("Build Major", DL.getBuildMajorVersion(), DR.getBuildMajorVersion());
- D.print("Build Minor", DL.getBuildMinorVersion(), DR.getBuildMinorVersion());
- D.print("Build Number", DL.getBuildNumber(), DR.getBuildNumber());
- D.print("PDB DLL Version", DL.getPdbDllVersion(), DR.getPdbDllVersion());
- D.print("PDB DLL RBLD", DL.getPdbDllRbld(), DR.getPdbDllRbld());
- D.print<StreamNumberProvider>("DBG (FPO)",
- DL.getDebugStreamIndex(DbgHeaderType::FPO),
- DR.getDebugStreamIndex(DbgHeaderType::FPO));
- D.print<StreamNumberProvider>(
- "DBG (Exception)", DL.getDebugStreamIndex(DbgHeaderType::Exception),
- DR.getDebugStreamIndex(DbgHeaderType::Exception));
- D.print<StreamNumberProvider>("DBG (Fixup)",
- DL.getDebugStreamIndex(DbgHeaderType::Fixup),
- DR.getDebugStreamIndex(DbgHeaderType::Fixup));
- D.print<StreamNumberProvider>(
- "DBG (OmapToSrc)", DL.getDebugStreamIndex(DbgHeaderType::OmapToSrc),
- DR.getDebugStreamIndex(DbgHeaderType::OmapToSrc));
- D.print<StreamNumberProvider>(
- "DBG (OmapFromSrc)", DL.getDebugStreamIndex(DbgHeaderType::OmapFromSrc),
- DR.getDebugStreamIndex(DbgHeaderType::OmapFromSrc));
- D.print<StreamNumberProvider>(
- "DBG (SectionHdr)", DL.getDebugStreamIndex(DbgHeaderType::SectionHdr),
- DR.getDebugStreamIndex(DbgHeaderType::SectionHdr));
- D.print<StreamNumberProvider>(
- "DBG (TokenRidMap)", DL.getDebugStreamIndex(DbgHeaderType::TokenRidMap),
- DR.getDebugStreamIndex(DbgHeaderType::TokenRidMap));
- D.print<StreamNumberProvider>("DBG (Xdata)",
- DL.getDebugStreamIndex(DbgHeaderType::Xdata),
- DR.getDebugStreamIndex(DbgHeaderType::Xdata));
- D.print<StreamNumberProvider>("DBG (Pdata)",
- DL.getDebugStreamIndex(DbgHeaderType::Pdata),
- DR.getDebugStreamIndex(DbgHeaderType::Pdata));
- D.print<StreamNumberProvider>("DBG (NewFPO)",
- DL.getDebugStreamIndex(DbgHeaderType::NewFPO),
- DR.getDebugStreamIndex(DbgHeaderType::NewFPO));
- D.print<StreamNumberProvider>(
- "DBG (SectionHdrOrig)",
- DL.getDebugStreamIndex(DbgHeaderType::SectionHdrOrig),
- DR.getDebugStreamIndex(DbgHeaderType::SectionHdrOrig));
- D.print<StreamNumberProvider>("Globals Stream",
- DL.getGlobalSymbolStreamIndex(),
- DR.getGlobalSymbolStreamIndex());
- D.print<StreamNumberProvider>("Publics Stream",
- DL.getPublicSymbolStreamIndex(),
- DR.getPublicSymbolStreamIndex());
- D.print<StreamNumberProvider>("Symbol Records", DL.getSymRecordStreamIndex(),
- DR.getSymRecordStreamIndex());
- D.print("Has CTypes", DL.hasCTypes(), DR.hasCTypes());
- D.print("Is Incrementally Linked", DL.isIncrementallyLinked(),
- DR.isIncrementallyLinked());
- D.print("Is Stripped", DL.isStripped(), DR.isStripped());
- const DbiModuleList &ML = DL.modules();
- const DbiModuleList &MR = DR.modules();
- D.print("Module Count", ML.getModuleCount(), MR.getModuleCount());
- D.print("Source File Count", ML.getSourceFileCount(),
- MR.getSourceFileCount());
- auto MDL = getModuleDescriptors(ML);
- auto MDR = getModuleDescriptors(MR);
- // Scan all module descriptors from the left, and look for corresponding
- // module descriptors on the right.
- for (const auto &L : MDL)
- diffOneModule(D, L, MDR, false);
-
- for (const auto &R : MDR)
- diffOneModule(D, R, MDL, true);
-
- return Error::success();
-}
-
-Error DiffStyle::diffSectionContribs() { return Error::success(); }
-
-Error DiffStyle::diffSectionMap() { return Error::success(); }
-
-Error DiffStyle::diffFpoStream() { return Error::success(); }
-
-Error DiffStyle::diffTpiStream(int Index) { return Error::success(); }
-
-Error DiffStyle::diffModuleInfoStream(int Index) { return Error::success(); }
-
-Error DiffStyle::diffPublics() { return Error::success(); }
-
-Error DiffStyle::diffGlobals() { return Error::success(); }
Removed: llvm/trunk/tools/llvm-pdbutil/Diff.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbutil/Diff.h?rev=328561&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-pdbutil/Diff.h (original)
+++ llvm/trunk/tools/llvm-pdbutil/Diff.h (removed)
@@ -1,45 +0,0 @@
-//===- Diff.h - PDB diff utility --------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVMPDBDUMP_DIFF_H
-#define LLVM_TOOLS_LLVMPDBDUMP_DIFF_H
-
-#include "OutputStyle.h"
-
-namespace llvm {
-namespace pdb {
-class PDBFile;
-class DiffStyle : public OutputStyle {
-public:
- explicit DiffStyle(PDBFile &File1, PDBFile &File2);
-
- Error dump() override;
-
-private:
- Error diffSuperBlock();
- Error diffStreamDirectory();
- Error diffStringTable();
- Error diffFreePageMap();
- Error diffInfoStream();
- Error diffDbiStream();
- Error diffSectionContribs();
- Error diffSectionMap();
- Error diffFpoStream();
- Error diffTpiStream(int Index);
- Error diffModuleInfoStream(int Index);
- Error diffPublics();
- Error diffGlobals();
-
- PDBFile &File1;
- PDBFile &File2;
-};
-}
-}
-
-#endif
Removed: llvm/trunk/tools/llvm-pdbutil/DiffPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbutil/DiffPrinter.cpp?rev=328561&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-pdbutil/DiffPrinter.cpp (original)
+++ llvm/trunk/tools/llvm-pdbutil/DiffPrinter.cpp (removed)
@@ -1,147 +0,0 @@
-
-#include "DiffPrinter.h"
-
-#include "llvm/Support/FormatAdapters.h"
-
-using namespace llvm;
-using namespace llvm::pdb;
-
-namespace {
-struct Colorize {
- Colorize(raw_ostream &OS, DiffResult Result) : OS(OS) {
- if (!OS.has_colors())
- return;
- switch (Result) {
- case DiffResult::IDENTICAL:
- OS.changeColor(raw_ostream::Colors::GREEN, false);
- break;
- case DiffResult::EQUIVALENT:
- OS.changeColor(raw_ostream::Colors::YELLOW, true);
- break;
- default:
- OS.changeColor(raw_ostream::Colors::RED, false);
- break;
- }
- }
-
- ~Colorize() {
- if (OS.has_colors())
- OS.resetColor();
- }
-
- raw_ostream &OS;
-};
-}
-
-DiffPrinter::DiffPrinter(uint32_t Indent, StringRef Header,
- uint32_t PropertyWidth, uint32_t FieldWidth,
- bool Result, bool Fields, raw_ostream &Stream)
- : PrintResult(Result), PrintValues(Fields), Indent(Indent),
- PropertyWidth(PropertyWidth), FieldWidth(FieldWidth), OS(Stream) {
- printHeaderRow();
- printFullRow(Header);
-}
-
-DiffPrinter::~DiffPrinter() {}
-
-uint32_t DiffPrinter::tableWidth() const {
- // `|`
- uint32_t W = 1;
-
- // `<width>|`
- W += PropertyWidth + 1;
-
- if (PrintResult) {
- // ` I |`
- W += 4;
- }
-
- if (PrintValues) {
- // `<width>|<width>|`
- W += 2 * (FieldWidth + 1);
- }
- return W;
-}
-
-void DiffPrinter::printFullRow(StringRef Text) {
- newLine();
- printValue(Text, DiffResult::UNSPECIFIED, AlignStyle::Center,
- tableWidth() - 2, true);
- printSeparatorRow();
-}
-
-void DiffPrinter::printSeparatorRow() {
- newLine();
- OS << formatv("{0}", fmt_repeat('-', PropertyWidth));
- if (PrintResult) {
- OS << '+';
- OS << formatv("{0}", fmt_repeat('-', 3));
- }
- if (PrintValues) {
- OS << '+';
- OS << formatv("{0}", fmt_repeat('-', FieldWidth));
- OS << '+';
- OS << formatv("{0}", fmt_repeat('-', FieldWidth));
- }
- OS << '|';
-}
-
-void DiffPrinter::printHeaderRow() {
- newLine('-');
- OS << formatv("{0}", fmt_repeat('-', tableWidth() - 1));
-}
-
-void DiffPrinter::newLine(char InitialChar) {
- OS << "\n";
- OS.indent(Indent) << InitialChar;
-}
-
-void DiffPrinter::printExplicit(StringRef Property, DiffResult C,
- StringRef Left, StringRef Right) {
- newLine();
- printValue(Property, DiffResult::UNSPECIFIED, AlignStyle::Right,
- PropertyWidth, true);
- printResult(C);
- printValue(Left, C, AlignStyle::Center, FieldWidth, false);
- printValue(Right, C, AlignStyle::Center, FieldWidth, false);
- printSeparatorRow();
-}
-
-void DiffPrinter::printResult(DiffResult Result) {
- if (!PrintResult)
- return;
- switch (Result) {
- case DiffResult::DIFFERENT:
- printValue("D", Result, AlignStyle::Center, 3, true);
- break;
- case DiffResult::EQUIVALENT:
- printValue("E", Result, AlignStyle::Center, 3, true);
- break;
- case DiffResult::IDENTICAL:
- printValue("I", Result, AlignStyle::Center, 3, true);
- break;
- case DiffResult::UNSPECIFIED:
- printValue(" ", Result, AlignStyle::Center, 3, true);
- break;
- }
-}
-
-void DiffPrinter::printValue(StringRef Value, DiffResult C, AlignStyle Style,
- uint32_t Width, bool Force) {
- if (!Force && !PrintValues)
- return;
-
- if (Style == AlignStyle::Right)
- --Width;
-
- std::string FormattedItem =
- formatv("{0}", fmt_align(Value, Style, Width)).str();
- if (C != DiffResult::UNSPECIFIED) {
- Colorize Color(OS, C);
- OS << FormattedItem;
- } else
- OS << FormattedItem;
- if (Style == AlignStyle::Right)
- OS << ' ';
- OS << '|';
-}
Removed: llvm/trunk/tools/llvm-pdbutil/DiffPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbutil/DiffPrinter.h?rev=328561&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-pdbutil/DiffPrinter.h (original)
+++ llvm/trunk/tools/llvm-pdbutil/DiffPrinter.h (removed)
@@ -1,172 +0,0 @@
-//===- DiffPrinter.h ------------------------------------------ *- C++ --*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVMPDBDUMP_DIFFPRINTER_H
-#define LLVM_TOOLS_LLVMPDBDUMP_DIFFPRINTER_H
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/DebugInfo/PDB/Native/RawConstants.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include <list>
-#include <unordered_set>
-
-namespace std {
-template <> struct hash<llvm::pdb::PdbRaw_FeatureSig> {
- typedef llvm::pdb::PdbRaw_FeatureSig argument_type;
- typedef std::size_t result_type;
- result_type operator()(argument_type Item) const {
- return std::hash<uint32_t>{}(uint32_t(Item));
- }
-};
-} // namespace std
-
-namespace llvm {
-namespace pdb {
-
-class PDBFile;
-
-enum class DiffResult { UNSPECIFIED, IDENTICAL, EQUIVALENT, DIFFERENT };
-
-struct IdenticalDiffProvider {
- template <typename T, typename U>
- DiffResult compare(const T &Left, const U &Right) {
- return (Left == Right) ? DiffResult::IDENTICAL : DiffResult::DIFFERENT;
- }
-
- template <typename T> std::string format(const T &Item, bool Right) {
- return formatv("{0}", Item).str();
- }
-};
-
-struct EquivalentDiffProvider {
- template <typename T, typename U>
- DiffResult compare(const T &Left, const U &Right) {
- return (Left == Right) ? DiffResult::IDENTICAL : DiffResult::EQUIVALENT;
- }
-
- template <typename T> std::string format(const T &Item, bool Right) {
- return formatv("{0}", Item).str();
- }
-};
-
-class DiffPrinter {
-public:
- DiffPrinter(uint32_t Indent, StringRef Header, uint32_t PropertyWidth,
- uint32_t FieldWidth, bool Result, bool Values,
- raw_ostream &Stream);
- ~DiffPrinter();
-
- template <typename T, typename U> struct Identical {};
-
- template <typename Provider = IdenticalDiffProvider, typename T, typename U>
- void print(StringRef Property, const T &Left, const U &Right,
- Provider P = Provider()) {
- std::string L = P.format(Left, false);
- std::string R = P.format(Right, true);
-
- DiffResult Result = P.compare(Left, Right);
- printExplicit(Property, Result, L, R);
- }
-
- void printExplicit(StringRef Property, DiffResult C, StringRef Left,
- StringRef Right);
-
- template <typename T, typename U>
- void printExplicit(StringRef Property, DiffResult C, const T &Left,
- const U &Right) {
- std::string L = formatv("{0}", Left).str();
- std::string R = formatv("{0}", Right).str();
- printExplicit(Property, C, StringRef(L), StringRef(R));
- }
-
- template <typename T, typename U>
- void diffUnorderedArray(StringRef Property, ArrayRef<T> Left,
- ArrayRef<U> Right) {
- std::unordered_set<T> LS(Left.begin(), Left.end());
- std::unordered_set<U> RS(Right.begin(), Right.end());
- std::string Count1 = formatv("{0} element(s)", Left.size());
- std::string Count2 = formatv("{0} element(s)", Right.size());
- print(std::string(Property) + "s (set)", Count1, Count2);
- for (const auto &L : LS) {
- auto Iter = RS.find(L);
- std::string Text = formatv("{0}", L).str();
- if (Iter == RS.end()) {
- print(Property, Text, "(not present)");
- continue;
- }
- print(Property, Text, Text);
- RS.erase(Iter);
- }
- for (const auto &R : RS) {
- auto Iter = LS.find(R);
- std::string Text = formatv("{0}", R).str();
- if (Iter == LS.end()) {
- print(Property, "(not present)", Text);
- continue;
- }
- print(Property, Text, Text);
- }
- }
-
- template <typename ValueProvider = IdenticalDiffProvider, typename T,
- typename U>
- void diffUnorderedMap(StringRef Property, const StringMap<T> &Left,
- const StringMap<U> &Right,
- ValueProvider P = ValueProvider()) {
- StringMap<U> RightCopy(Right);
-
- std::string Count1 = formatv("{0} element(s)", Left.size());
- std::string Count2 = formatv("{0} element(s)", Right.size());
- print(std::string(Property) + "s (map)", Count1, Count2);
-
- for (const auto &L : Left) {
- auto Iter = RightCopy.find(L.getKey());
- if (Iter == RightCopy.end()) {
- printExplicit(L.getKey(), DiffResult::DIFFERENT, L.getValue(),
- "(not present)");
- continue;
- }
-
- print(L.getKey(), L.getValue(), Iter->getValue(), P);
- RightCopy.erase(Iter);
- }
-
- for (const auto &R : RightCopy) {
- printExplicit(R.getKey(), DiffResult::DIFFERENT, "(not present)",
- R.getValue());
- }
- }
-
- void printFullRow(StringRef Text);
-
-private:
- uint32_t tableWidth() const;
-
- void printHeaderRow();
- void printSeparatorRow();
- void newLine(char InitialChar = '|');
- void printValue(StringRef Value, DiffResult C, AlignStyle Style,
- uint32_t Width, bool Force);
- void printResult(DiffResult Result);
-
- bool PrintResult;
- bool PrintValues;
- uint32_t Indent;
- uint32_t PropertyWidth;
- uint32_t FieldWidth;
- raw_ostream &OS;
-};
-} // namespace pdb
-} // namespace llvm
-
-#endif
Modified: llvm/trunk/tools/llvm-pdbutil/llvm-pdbutil.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbutil/llvm-pdbutil.cpp?rev=328562&r1=328561&r2=328562&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbutil/llvm-pdbutil.cpp (original)
+++ llvm/trunk/tools/llvm-pdbutil/llvm-pdbutil.cpp Mon Mar 26 11:01:07 2018
@@ -15,7 +15,6 @@
#include "Analyze.h"
#include "BytesOutputStyle.h"
-#include "Diff.h"
#include "DumpOutputStyle.h"
#include "InputFile.h"
#include "LinePrinter.h"
@@ -98,8 +97,6 @@ cl::SubCommand
PrettySubcommand("pretty",
"Dump semantic information about types and symbols");
-cl::SubCommand DiffSubcommand("diff", "Diff the contents of 2 PDB files");
-
cl::SubCommand
YamlToPdbSubcommand("yaml2pdb",
"Generate a PDB file from a YAML description");
@@ -295,44 +292,6 @@ cl::opt<bool> NoEnumDefs("no-enum-defini
cl::cat(FilterCategory), cl::sub(PrettySubcommand));
}
-namespace diff {
-cl::opt<bool> PrintValueColumns(
- "values", cl::init(true),
- cl::desc("Print one column for each PDB with the field value"),
- cl::Optional, cl::sub(DiffSubcommand));
-cl::opt<bool>
- PrintResultColumn("result", cl::init(false),
- cl::desc("Print a column with the result status"),
- cl::Optional, cl::sub(DiffSubcommand));
-
-cl::list<std::string>
- RawModiEquivalences("modi-equivalence", cl::ZeroOrMore,
- cl::value_desc("left,right"),
- cl::desc("Modules with the specified indices will be "
- "treated as referring to the same module"),
- cl::sub(DiffSubcommand));
-
-cl::opt<std::string> LeftRoot(
- "left-bin-root", cl::Optional,
- cl::desc("Treats the specified path as the root of the tree containing "
- "binaries referenced by the left PDB. The root is stripped from "
- "embedded paths when doing equality comparisons."),
- cl::sub(DiffSubcommand));
-cl::opt<std::string> RightRoot(
- "right-bin-root", cl::Optional,
- cl::desc("Treats the specified path as the root of the tree containing "
- "binaries referenced by the right PDB. The root is stripped from "
- "embedded paths when doing equality comparisons"),
- cl::sub(DiffSubcommand));
-
-cl::opt<std::string> Left(cl::Positional, cl::desc("<left>"),
- cl::sub(DiffSubcommand));
-cl::opt<std::string> Right(cl::Positional, cl::desc("<right>"),
- cl::sub(DiffSubcommand));
-
-llvm::DenseMap<uint32_t, uint32_t> Equivalences;
-}
-
cl::OptionCategory FileOptions("Module & File Options");
namespace bytes {
@@ -802,18 +761,6 @@ static void dumpAnalysis(StringRef Path)
ExitOnErr(O->dump());
}
-static void diff(StringRef Path1, StringRef Path2) {
- std::unique_ptr<IPDBSession> Session1;
- std::unique_ptr<IPDBSession> Session2;
-
- auto &File1 = loadPDB(Path1, Session1);
- auto &File2 = loadPDB(Path2, Session2);
-
- auto O = llvm::make_unique<DiffStyle>(File1, File2);
-
- ExitOnErr(O->dump());
-}
-
bool opts::pretty::shouldDumpSymLevel(SymLevel Search) {
if (SymTypes.empty())
return true;
@@ -1241,11 +1188,6 @@ int main(int argc_, const char *argv_[])
if (opts::pdb2yaml::DumpModules)
opts::pdb2yaml::DbiStream = true;
}
- if (opts::DiffSubcommand) {
- if (!opts::diff::PrintResultColumn && !opts::diff::PrintValueColumns) {
- llvm::errs() << "WARNING: No diff columns specified\n";
- }
- }
llvm::sys::InitializeCOMRAII COM(llvm::sys::COMThreadingMode::MultiThreaded);
@@ -1300,21 +1242,6 @@ int main(int argc_, const char *argv_[])
llvm::for_each(opts::dump::InputFilenames, dumpRaw);
} else if (opts::BytesSubcommand) {
llvm::for_each(opts::bytes::InputFilenames, dumpBytes);
- } else if (opts::DiffSubcommand) {
- for (StringRef S : opts::diff::RawModiEquivalences) {
- StringRef Left;
- StringRef Right;
- std::tie(Left, Right) = S.split(',');
- uint32_t X, Y;
- if (!to_integer(Left, X) || !to_integer(Right, Y)) {
- errs() << formatv("invalid value {0} specified for modi equivalence\n",
- S);
- exit(1);
- }
- opts::diff::Equivalences[X] = Y;
- }
-
- diff(opts::diff::Left, opts::diff::Right);
} else if (opts::MergeSubcommand) {
if (opts::merge::InputFilenames.size() < 2) {
errs() << "merge subcommand requires at least 2 input files.\n";
Modified: llvm/trunk/tools/llvm-pdbutil/llvm-pdbutil.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbutil/llvm-pdbutil.h?rev=328562&r1=328561&r2=328562&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbutil/llvm-pdbutil.h (original)
+++ llvm/trunk/tools/llvm-pdbutil/llvm-pdbutil.h Mon Mar 26 11:01:07 2018
@@ -189,13 +189,6 @@ extern llvm::cl::list<ModuleSubsection>
extern llvm::cl::opt<bool> DumpModuleSyms;
} // namespace pdb2yaml
-namespace diff {
-extern llvm::cl::opt<bool> PrintValueColumns;
-extern llvm::cl::opt<bool> PrintResultColumn;
-extern llvm::DenseMap<uint32_t, uint32_t> Equivalences;
-extern llvm::cl::opt<std::string> LeftRoot;
-extern llvm::cl::opt<std::string> RightRoot;
-} // namespace diff
}
#endif
More information about the llvm-commits
mailing list