Changeset 358cba0 for src/main.cc

Timestamp:

May 15, 2018, 4:17:15 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

2e5fa345

Parents:

7d0a3ba (diff), a61fa0bb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/main.cc (modified) (7 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  2 14:59:02 2018
-// Update Count     : 490
+// Last Modified On : Mon May  7 14:35:57 2018
+// Update Count     : 492
 //
 
@@ -64 +64 @@
 
 #define PASS(name, pass)                   \
-        if ( errorp ) { cerr << #name << endl; } \
-        HeapStats::newPass(#name);               \
+        if ( errorp ) { cerr << name << endl; } \
+        HeapStats::newPass(name);               \
         pass;
 
@@ -371 +371 @@
                 } // if
                 return 1;
-        } // try
+        } catch(...) {
+                std::exception_ptr eptr = std::current_exception();
+                try {
+                        if (eptr) {
+                                std::rethrow_exception(eptr);
+                        }
+                        else {
+                                std::cerr << "Exception Uncaught and Unkown" << std::endl;
+                        }
+                } catch(const std::exception& e) {
+                        std::cerr << "Unaught Exception \"" << e.what() << "\"\n";
+                }
+                return 1;
+        }// try
 
         deleteAll( translationUnit );
-        HeapStats::printStats();
+        if(!libcfap && !treep) HeapStats::printStats();
         return 0;
 } // main
@@ -407 +420 @@
         opterr = 0;                                                                                     // (global) prevent getopt from printing error messages
 
-        bool Werror = false;
+        bool Wsuppress = false, Werror = false;
         int c;
         while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrstTvwW:yzZD:F:", long_opts, &long_index )) != -1 ) {
@@ -495 +508 @@
                         break;
                   case 'w':
-                        SemanticWarning_SuppressAll();
+                        Wsuppress = true;
                         break;
                   case 'W':
@@ -534 +547 @@
                                 assertf( false, "Unknown option: %s\n", argv[optind - 1] );
                         } // if
-                        #if __GNUC__ < 7
-                        #else
+                        #if defined(__GNUC__) && __GNUC__ >= 7
                                 __attribute__((fallthrough));
                         #endif
@@ -545 +557 @@
         if ( Werror ) {
                 SemanticWarning_WarningAsError();
+        } // if
+        if ( Wsuppress ) {
+                SemanticWarning_SuppressAll();
         } // if
         // for ( const auto w : WarningFormats ) {