Changeset 4990812 for src

Timestamp:

May 8, 2018, 5:14:39 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

afd550c

Parents:

5fec3f6

Message:

Added some debug for the fallthrough bug

Location:

src

Files:

• Common/PassVisitor.proto.h (modified) (4 diffs)
• main.cc (modified) (1 diff)

src/Common/PassVisitor.proto.h

@@ -47 +47 @@
 
         operator bool() { return m_ref ? *m_ref : true; }
-        bool operator=( bool val ) { return *m_ref = val; }
+        bool operator=( bool val ) { assert(m_ref); return *m_ref = val; }
 
 private:
@@ -53 +53 @@
         friend class ChildrenGuard;
 
-        bool * set( bool & val ) {
+        bool * set( bool * val ) {
                 bool * prev = m_ref;
-                m_ref = &val;
+                m_ref = val;
                 return prev;
         }
@@ -67 +67 @@
         ChildrenGuard( bool_ref * ref )
                 : m_val ( true )
-                , m_prev( ref ? ref->set( m_val ) : nullptr )
+                , m_prev( ref ? ref->set( &m_val ) : nullptr )
                 , m_ref ( ref )
         {}
@@ -73 +73 @@
         ~ChildrenGuard() {
                 if( m_ref ) {
-                        m_ref->set( *m_prev );
+                        m_ref->set( m_prev );
                 }
         }

src/main.cc

@@ -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 );