Skip to content

Commit

Permalink
Use ParseIRFile to auto-detect LLVM Assembly automatically.
Browse files Browse the repository at this point in the history
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@113765 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
Dan Gohman committed Sep 13, 2010
1 parent 9b10dfb commit c32a226
Showing 1 changed file with 7 additions and 26 deletions.
33 changes: 7 additions & 26 deletions tools/llvm-diff/llvm-diff.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
#include "llvm/LLVMContext.h"
#include "llvm/Module.h"
#include "llvm/Type.h"
#include "llvm/Assembly/Parser.h"
#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/IRReader.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/SourceMgr.h"
Expand All @@ -34,32 +33,14 @@

using namespace llvm;

/// Reads a module from a file. If the filename ends in .ll, it is
/// interpreted as an assembly file; otherwise, it is interpreted as
/// bitcode. On error, messages are written to stderr and null is
/// returned.
/// Reads a module from a file. On error, messages are written to stderr
/// and null is returned.
static Module *ReadModule(LLVMContext &Context, StringRef Name) {
// LLVM assembly path.
if (Name.endswith(".ll")) {
SMDiagnostic Diag;
Module *M = ParseAssemblyFile(Name, Diag, Context);
if (M) return M;

SMDiagnostic Diag;
Module *M = ParseIRFile(Name, Diag, Context);
if (!M)
Diag.Print("llvmdiff", errs());
return 0;
}

// Bitcode path.
MemoryBuffer *Buffer = MemoryBuffer::getFile(Name);

// ParseBitcodeFile takes ownership of the buffer if it succeeds.
std::string Error;
Module *M = ParseBitcodeFile(Buffer, Context, &Error);
if (M) return M;

errs() << "error parsing " << Name << ": " << Error;
delete Buffer;
return 0;
return M;
}

namespace {
Expand Down

0 comments on commit c32a226

Please sign in to comment.