From d4c7f2766bcf2cf87e562ea4e71cb4b54d81b74e Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 30 Jul 2002 21:43:25 +0000 Subject: [PATCH] Print the tool name when an error comes from so that I can tell which tool of a pipeline is having issues. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3168 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/as/as.cpp | 12 +++++++----- tools/gccas/gccas.cpp | 6 +++--- tools/link/link.cpp | 7 ++++--- tools/llvm-as/as.cpp | 12 +++++++----- tools/llvm-as/llvm-as.cpp | 12 +++++++----- tools/llvm-link/llvm-link.cpp | 7 ++++--- tools/opt/opt.cpp | 11 ++++++----- 7 files changed, 38 insertions(+), 29 deletions(-) diff --git a/tools/as/as.cpp b/tools/as/as.cpp index 36f84568783..7593cef4b0f 100644 --- a/tools/as/as.cpp +++ b/tools/as/as.cpp @@ -40,7 +40,7 @@ int main(int argc, char **argv) { // Parse the file now... std::auto_ptr M(ParseAssemblyFile(InputFilename)); if (M.get() == 0) { - cerr << "assembly didn't read correctly.\n"; + cerr << argv[0] << ": assembly didn't read correctly.\n"; return 1; } @@ -49,7 +49,8 @@ int main(int argc, char **argv) { if (OutputFilename != "") { // Specified an output filename? if (!Force && std::ifstream(OutputFilename.c_str())) { // If force is not specified, make sure not to overwrite a file! - cerr << "Error opening '" << OutputFilename << "': File exists!\n" + cerr << argv[0] << ": error opening '" << OutputFilename + << "': file exists!\n" << "Use -f command line argument to force output\n"; return 1; } @@ -71,7 +72,8 @@ int main(int argc, char **argv) { if (!Force && std::ifstream(OutputFilename.c_str())) { // If force is not specified, make sure not to overwrite a file! - cerr << "Error opening '" << OutputFilename << "': File exists!\n" + cerr << argv[0] << ": error opening '" << OutputFilename + << "': file exists!\n" << "Use -f command line argument to force output\n"; return 1; } @@ -84,13 +86,13 @@ int main(int argc, char **argv) { } if (!Out->good()) { - cerr << "Error opening " << OutputFilename << "!\n"; + cerr << argv[0] << ": error opening " << OutputFilename << "!\n"; return 1; } WriteBytecodeToFile(M.get(), *Out); } catch (const ParseException &E) { - cerr << E.getMessage() << std::endl; + cerr << argv[0] << ": " << E.getMessage() << "\n"; return 1; } diff --git a/tools/gccas/gccas.cpp b/tools/gccas/gccas.cpp index 974e9e26f4b..13a4a4111e8 100644 --- a/tools/gccas/gccas.cpp +++ b/tools/gccas/gccas.cpp @@ -102,12 +102,12 @@ int main(int argc, char **argv) { // Parse the file now... M.reset(ParseAssemblyFile(InputFilename)); } catch (const ParseException &E) { - cerr << E.getMessage() << "\n"; + cerr << argv[0] << ": " << E.getMessage() << "\n"; return 1; } if (M.get() == 0) { - cerr << "assembly didn't read correctly.\n"; + cerr << argv[0] << ": assembly didn't read correctly.\n"; return 1; } @@ -124,7 +124,7 @@ int main(int argc, char **argv) { std::ofstream Out(OutputFilename.c_str(), std::ios::out); if (!Out.good()) { - cerr << "Error opening " << OutputFilename << "!\n"; + cerr << argv[0] << ": error opening " << OutputFilename << "!\n"; return 1; } diff --git a/tools/link/link.cpp b/tools/link/link.cpp index 7f48cc4b7b1..075e7075e84 100644 --- a/tools/link/link.cpp +++ b/tools/link/link.cpp @@ -109,7 +109,7 @@ int main(int argc, char **argv) { if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n"; if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) { - cerr << "Error linking in '" << InputFilenames[i] << "': " + cerr << argv[0] << ": error linking in '" << InputFilenames[i] << "': " << ErrorMessage << "\n"; return 1; } @@ -121,13 +121,14 @@ int main(int argc, char **argv) { if (OutputFilename != "-") { if (!Force && std::ifstream(OutputFilename.c_str())) { // If force is not specified, make sure not to overwrite a file! - cerr << "Error opening '" << OutputFilename << "': File exists!\n" + cerr << argv[0] << ": error opening '" << OutputFilename + << "': file exists!\n" << "Use -f command line argument to force output\n"; return 1; } Out = new std::ofstream(OutputFilename.c_str()); if (!Out->good()) { - cerr << "Error opening '" << OutputFilename << "'!\n"; + cerr << argv[0] << ": error opening '" << OutputFilename << "'!\n"; return 1; } diff --git a/tools/llvm-as/as.cpp b/tools/llvm-as/as.cpp index 36f84568783..7593cef4b0f 100644 --- a/tools/llvm-as/as.cpp +++ b/tools/llvm-as/as.cpp @@ -40,7 +40,7 @@ int main(int argc, char **argv) { // Parse the file now... std::auto_ptr M(ParseAssemblyFile(InputFilename)); if (M.get() == 0) { - cerr << "assembly didn't read correctly.\n"; + cerr << argv[0] << ": assembly didn't read correctly.\n"; return 1; } @@ -49,7 +49,8 @@ int main(int argc, char **argv) { if (OutputFilename != "") { // Specified an output filename? if (!Force && std::ifstream(OutputFilename.c_str())) { // If force is not specified, make sure not to overwrite a file! - cerr << "Error opening '" << OutputFilename << "': File exists!\n" + cerr << argv[0] << ": error opening '" << OutputFilename + << "': file exists!\n" << "Use -f command line argument to force output\n"; return 1; } @@ -71,7 +72,8 @@ int main(int argc, char **argv) { if (!Force && std::ifstream(OutputFilename.c_str())) { // If force is not specified, make sure not to overwrite a file! - cerr << "Error opening '" << OutputFilename << "': File exists!\n" + cerr << argv[0] << ": error opening '" << OutputFilename + << "': file exists!\n" << "Use -f command line argument to force output\n"; return 1; } @@ -84,13 +86,13 @@ int main(int argc, char **argv) { } if (!Out->good()) { - cerr << "Error opening " << OutputFilename << "!\n"; + cerr << argv[0] << ": error opening " << OutputFilename << "!\n"; return 1; } WriteBytecodeToFile(M.get(), *Out); } catch (const ParseException &E) { - cerr << E.getMessage() << std::endl; + cerr << argv[0] << ": " << E.getMessage() << "\n"; return 1; } diff --git a/tools/llvm-as/llvm-as.cpp b/tools/llvm-as/llvm-as.cpp index 36f84568783..7593cef4b0f 100644 --- a/tools/llvm-as/llvm-as.cpp +++ b/tools/llvm-as/llvm-as.cpp @@ -40,7 +40,7 @@ int main(int argc, char **argv) { // Parse the file now... std::auto_ptr M(ParseAssemblyFile(InputFilename)); if (M.get() == 0) { - cerr << "assembly didn't read correctly.\n"; + cerr << argv[0] << ": assembly didn't read correctly.\n"; return 1; } @@ -49,7 +49,8 @@ int main(int argc, char **argv) { if (OutputFilename != "") { // Specified an output filename? if (!Force && std::ifstream(OutputFilename.c_str())) { // If force is not specified, make sure not to overwrite a file! - cerr << "Error opening '" << OutputFilename << "': File exists!\n" + cerr << argv[0] << ": error opening '" << OutputFilename + << "': file exists!\n" << "Use -f command line argument to force output\n"; return 1; } @@ -71,7 +72,8 @@ int main(int argc, char **argv) { if (!Force && std::ifstream(OutputFilename.c_str())) { // If force is not specified, make sure not to overwrite a file! - cerr << "Error opening '" << OutputFilename << "': File exists!\n" + cerr << argv[0] << ": error opening '" << OutputFilename + << "': file exists!\n" << "Use -f command line argument to force output\n"; return 1; } @@ -84,13 +86,13 @@ int main(int argc, char **argv) { } if (!Out->good()) { - cerr << "Error opening " << OutputFilename << "!\n"; + cerr << argv[0] << ": error opening " << OutputFilename << "!\n"; return 1; } WriteBytecodeToFile(M.get(), *Out); } catch (const ParseException &E) { - cerr << E.getMessage() << std::endl; + cerr << argv[0] << ": " << E.getMessage() << "\n"; return 1; } diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index 7f48cc4b7b1..075e7075e84 100644 --- a/tools/llvm-link/llvm-link.cpp +++ b/tools/llvm-link/llvm-link.cpp @@ -109,7 +109,7 @@ int main(int argc, char **argv) { if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n"; if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) { - cerr << "Error linking in '" << InputFilenames[i] << "': " + cerr << argv[0] << ": error linking in '" << InputFilenames[i] << "': " << ErrorMessage << "\n"; return 1; } @@ -121,13 +121,14 @@ int main(int argc, char **argv) { if (OutputFilename != "-") { if (!Force && std::ifstream(OutputFilename.c_str())) { // If force is not specified, make sure not to overwrite a file! - cerr << "Error opening '" << OutputFilename << "': File exists!\n" + cerr << argv[0] << ": error opening '" << OutputFilename + << "': file exists!\n" << "Use -f command line argument to force output\n"; return 1; } Out = new std::ofstream(OutputFilename.c_str()); if (!Out->good()) { - cerr << "Error opening '" << OutputFilename << "'!\n"; + cerr << argv[0] << ": error opening '" << OutputFilename << "'!\n"; return 1; } diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index 463b37c387f..6f7343bae3d 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -1,5 +1,5 @@ //===----------------------------------------------------------------------===// -// LLVM 'OPT' UTILITY +// LLVM Modular Optimizer Utility: opt // // Optimizations may be specified an arbitrary number of times on the command // line, they are run in the order specified. @@ -67,7 +67,7 @@ int main(int argc, char **argv) { // Load the input module... std::auto_ptr M(ParseBytecodeFile(InputFilename)); if (M.get() == 0) { - cerr << "bytecode didn't read correctly.\n"; + cerr << argv[0] << ": bytecode didn't read correctly.\n"; return 1; } @@ -76,14 +76,15 @@ int main(int argc, char **argv) { if (OutputFilename != "") { if (!Force && std::ifstream(OutputFilename.c_str())) { // If force is not specified, make sure not to overwrite a file! - cerr << "Error opening '" << OutputFilename << "': File exists!\n" + cerr << argv[0] << ": error opening '" << OutputFilename + << "': file exists!\n" << "Use -f command line argument to force output\n"; return 1; } Out = new std::ofstream(OutputFilename.c_str()); if (!Out->good()) { - cerr << "Error opening " << OutputFilename << "!\n"; + cerr << argv[0] << ": error opening " << OutputFilename << "!\n"; return 1; } @@ -106,7 +107,7 @@ int main(int argc, char **argv) { else if (Opt->getDataCtor()) Passes.add(Opt->getDataCtor()(TD)); // Pass dummy target data... else - cerr << "Cannot create pass: " << Opt->getPassName() << "\n"; + cerr << argv[0] << ": cannot create pass: " << Opt->getPassName() << "\n"; if (PrintEachXForm) Passes.add(new PrintModulePass(&cerr)); -- 2.34.1