For PR797:

Rid the Assembly Parser of exceptions. This is a really gross hack but it
will do until the Assembly Parser is re-written as a recursive descent.
The basic premise is that wherever the old "ThrowException" function was
called (new name: GenerateError) we set a flag (TriggerError). Every
production checks that flag and calls YYERROR if it is set. Additionally,
each call to ThrowException in the grammar is replaced with GEN_ERROR
which calls GenerateError and then YYERROR immediately. This prevents
the remaining production from continuing after an error condition.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29763 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 10 deletions

diff --git a/tools/gccas/gccas.cpp b/tools/gccas/gccas.cpp
index aeef9b135b..c46b29608a 100644
--- a/tools/gccas/gccas.cpp
+++ b/tools/gccas/gccas.cpp
@@ -137,17 +137,10 @@ int main(int argc, char **argv) {
                                 " llvm .s -> .o assembler for GCC\n");
     sys::PrintStackTraceOnErrorSignal();
 
-    std::auto_ptr<Module> M;
-    try {
-      // Parse the file now...
-      M.reset(ParseAssemblyFile(InputFilename));
-    } catch (const ParseException &E) {
-      std::cerr << argv[0] << ": " << E.getMessage() << "\n";
-      return 1;
-    }
-
+    ParseError Err;
+    std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename,&Err));
     if (M.get() == 0) {
-      std::cerr << argv[0] << ": assembly didn't read correctly.\n";
+      std::cerr << argv[0] << ": " << Err.getMessage() << "\n"; 
       return 1;
     }