summaryrefslogtreecommitdiffstats
path: root/llvm/tools/dsymutil/MachODebugMapParser.cpp
diff options
context:
space:
mode:
authorFrederic Riss <friss@apple.com>2015-06-03 17:08:42 +0000
committerFrederic Riss <friss@apple.com>2015-06-03 17:08:42 +0000
commit28dbc5ab8b58e6b4ca43d7a34cbbc8d02a37793f (patch)
tree605d3450125d8afb1e3d0a7d75340bc616fe8f75 /llvm/tools/dsymutil/MachODebugMapParser.cpp
parent3c306e895e5e7f53950b4102e92fcf2266492b5c (diff)
downloadbcm5719-llvm-28dbc5ab8b58e6b4ca43d7a34cbbc8d02a37793f.tar.gz
bcm5719-llvm-28dbc5ab8b58e6b4ca43d7a34cbbc8d02a37793f.zip
Revert "[dsymutil] Accept a YAML debug map as input instead of a binary."
This reverts commit r238941 while I figure out the bot issues. llvm-svn: 238943
Diffstat (limited to 'llvm/tools/dsymutil/MachODebugMapParser.cpp')
-rw-r--r--llvm/tools/dsymutil/MachODebugMapParser.cpp26
1 files changed, 3 insertions, 23 deletions
diff --git a/llvm/tools/dsymutil/MachODebugMapParser.cpp b/llvm/tools/dsymutil/MachODebugMapParser.cpp
index c8b48823f98..bf64303b9ea 100644
--- a/llvm/tools/dsymutil/MachODebugMapParser.cpp
+++ b/llvm/tools/dsymutil/MachODebugMapParser.cpp
@@ -242,32 +242,12 @@ void MachODebugMapParser::loadMainBinarySymbols() {
}
}
-ErrorOr<std::unique_ptr<DebugMap>>
-parseYAMLDebugMap(StringRef InputFile, bool Verbose) {
- auto ErrOrFile = MemoryBuffer::getFileOrSTDIN(InputFile);
- if (auto Err =ErrOrFile.getError())
- return Err;
-
- std::unique_ptr<DebugMap> Res;
- yaml::Input yin((*ErrOrFile)->getBuffer());
- yin >> Res;
-
- if (auto EC = yin.error())
- return EC;
-
- return std::move(Res);
-}
-
namespace llvm {
namespace dsymutil {
llvm::ErrorOr<std::unique_ptr<DebugMap>>
-parseDebugMap(StringRef InputFile, StringRef PrependPath, bool Verbose, bool InputIsYAML) {
- if (!InputIsYAML) {
- MachODebugMapParser Parser(InputFile, PrependPath, Verbose);
- return Parser.parse();
- } else {
- return parseYAMLDebugMap(InputFile, Verbose);
- }
+parseDebugMap(StringRef InputFile, StringRef PrependPath, bool Verbose) {
+ MachODebugMapParser Parser(InputFile, PrependPath, Verbose);
+ return Parser.parse();
}
}
}
OpenPOWER on IntegriCloud