nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modernize the getStreamedBitcodeModule interface a bit. NFC.

Browse Source 
llvm-svn: 224499
This commit is contained in:
Rafael Espindola
2014-12-18 05:08:43 +00:00
parent f7df7221d1
commit 7d727b5f11
4 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/tools/llvm-dis/llvm-dis.cpp
View File

@@ -127,15 +127,19 @@ int main(int argc, char **argv) {
std::unique_ptr<Module> M;
// Use the bitcode streaming interface
DataStreamer *streamer = getDataFileStreamer(InputFilename, &ErrorMessage);
if (streamer) {
DataStreamer *Streamer = getDataFileStreamer(InputFilename, &ErrorMessage);
if (Streamer) {
std::string DisplayFilename;
if (InputFilename == "-")
DisplayFilename = "<stdin>";
else
DisplayFilename = InputFilename;
M.reset(getStreamedBitcodeModule(DisplayFilename, streamer, Context,
&ErrorMessage));
ErrorOr<std::unique_ptr<Module>> MOrErr =
getStreamedBitcodeModule(DisplayFilename, Streamer, Context);
if (std::error_code EC = MOrErr.getError())
ErrorMessage = EC.message();
else
M = std::move(*MOrErr);
if(M.get()) {
if (std::error_code EC = M->materializeAllPermanently()) {
ErrorMessage = EC.message();