summaryrefslogtreecommitdiffstats
path: root/llvm/tools
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-07-02 22:46:18 +0000
committerChris Lattner <sabre@nondot.org>2009-07-02 22:46:18 +0000
commita76611a5359456f9a77d55b8e01889af7e7284a9 (patch)
treebe82db7c3264e1f05787120bf265f698bfd711b2 /llvm/tools
parent87127712b973cd9622ebabdc2a36973beaa2804a (diff)
downloadbcm5719-llvm-a76611a5359456f9a77d55b8e01889af7e7284a9.tar.gz
bcm5719-llvm-a76611a5359456f9a77d55b8e01889af7e7284a9.zip
switch the .ll parser into SMDiagnostic.
llvm-svn: 74734
Diffstat (limited to 'llvm/tools')
-rw-r--r--llvm/tools/bugpoint/BugDriver.cpp5
-rw-r--r--llvm/tools/llvm-as/llvm-as.cpp5
2 files changed, 6 insertions, 4 deletions
diff --git a/llvm/tools/bugpoint/BugDriver.cpp b/llvm/tools/bugpoint/BugDriver.cpp
index 847de1f8066..aab50720c6e 100644
--- a/llvm/tools/bugpoint/BugDriver.cpp
+++ b/llvm/tools/bugpoint/BugDriver.cpp
@@ -23,6 +23,7 @@
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/raw_ostream.h"
#include <iostream>
#include <memory>
@@ -82,9 +83,9 @@ Module *llvm::ParseInputFile(const std::string &Filename,
if (Buffer.get())
Result = ParseBitcodeFile(Buffer.get(), Ctxt);
- ParseError Err;
+ SMDiagnostic Err;
if (!Result && !(Result = ParseAssemblyFile(Filename, Err, Ctxt))) {
- Err.PrintError("bugpoint", errs());
+ Err.Print("bugpoint", errs());
Result = 0;
}
diff --git a/llvm/tools/llvm-as/llvm-as.cpp b/llvm/tools/llvm-as/llvm-as.cpp
index 53731b6c11e..eccabd5d14a 100644
--- a/llvm/tools/llvm-as/llvm-as.cpp
+++ b/llvm/tools/llvm-as/llvm-as.cpp
@@ -23,6 +23,7 @@
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PrettyStackTrace.h"
+#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/Streams.h"
#include "llvm/Support/SystemUtils.h"
#include "llvm/Support/raw_ostream.h"
@@ -64,10 +65,10 @@ int main(int argc, char **argv) {
std::ostream *Out = 0;
try {
// Parse the file now...
- ParseError Err;
+ SMDiagnostic Err;
std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename, Err, Context));
if (M.get() == 0) {
- Err.PrintError(argv[0], errs());
+ Err.Print(argv[0], errs());
return 1;
}
OpenPOWER on IntegriCloud