Changeset 436c0de for src/Common/PassVisitor.h

Timestamp:

Jun 18, 2017, 9:22:22 AM (9 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, resolv-new, with_gc

Children:

f1e80d8

Parents:

ade20d0 (diff), 42b0d73 (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

Conflicts:

src/InitTweak/GenInit.cc

File:

• src/Common/PassVisitor.h (modified) (5 diffs)

src/Common/PassVisitor.h

@@ -54 +54 @@
         virtual void visit( BranchStmt *branchStmt ) override final;
         virtual void visit( ReturnStmt *returnStmt ) override final;
+        virtual void visit( ThrowStmt *throwStmt ) override final;
         virtual void visit( TryStmt *tryStmt ) override final;
         virtual void visit( CatchStmt *catchStmt ) override final;
@@ -90 +91 @@
         virtual void visit( TupleExpr *tupleExpr ) override final;
         virtual void visit( TupleIndexExpr *tupleExpr ) override final;
-        virtual void visit( MemberTupleExpr *tupleExpr ) override final;
         virtual void visit( TupleAssignExpr *assignExpr ) override final;
         virtual void visit( StmtExpr * stmtExpr ) override final;
@@ -140 +140 @@
         virtual Statement* mutate( BranchStmt *branchStmt ) override final;
         virtual Statement* mutate( ReturnStmt *returnStmt ) override final;
+        virtual Statement* mutate( ThrowStmt *throwStmt ) override final;
         virtual Statement* mutate( TryStmt *returnStmt ) override final;
         virtual Statement* mutate( CatchStmt *catchStmt ) override final;
@@ -176 +177 @@
         virtual Expression* mutate( TupleExpr *tupleExpr ) override final;
         virtual Expression* mutate( TupleIndexExpr *tupleExpr ) override final;
-        virtual Expression* mutate( MemberTupleExpr *tupleExpr ) override final;
         virtual Expression* mutate( TupleAssignExpr *assignExpr ) override final;
         virtual Expression* mutate( StmtExpr * stmtExpr ) override final;
@@ -232 +232 @@
         std::list< Statement* > *       get_afterStmts () { return stmtsToAddAfter_impl ( pass, 0); }
         bool visit_children() { bool* skip = skip_children_impl(pass, 0); return ! (skip && *skip); }
-};
+        void reset_visit() { bool* skip = skip_children_impl(pass, 0); if(skip) *skip = false; }
+
+        guard_value_impl init_guard() {
+                guard_value_impl guard;
+                auto at_cleanup = at_cleanup_impl(pass, 0);
+                if( at_cleanup ) {
+                        *at_cleanup = [&guard]( cleanup_func_t && func, void* val ) {
+                                guard.push( std::move( func ), val );
+                        };
+                }
+                return guard;
+        }
+};
+
+template<typename pass_type, typename T>
+void GuardValue( pass_type * pass, T& val ) {
+        pass->at_cleanup( [ val ]( void * newVal ) {
+                * static_cast< T * >( newVal ) = val;
+        }, static_cast< void * >( & val ) );
+}
+
+class WithTypeSubstitution {
+protected:
+        WithTypeSubstitution() = default;
+        ~WithTypeSubstitution() = default;
+
+public:
+        TypeSubstitution * env;
+};
+
+class WithStmtsToAdd {
+protected:
+        WithStmtsToAdd() = default;
+        ~WithStmtsToAdd() = default;
+
+public:
+        std::list< Statement* > stmtsToAddBefore;
+        std::list< Statement* > stmtsToAddAfter;
+};
+
+class WithShortCircuiting {
+protected:
+        WithShortCircuiting() = default;
+        ~WithShortCircuiting() = default;
+
+public:
+        bool skip_children;
+};
+
+class WithScopes {
+protected:
+        WithScopes() = default;
+        ~WithScopes() = default;
+
+public:
+        at_cleanup_t at_cleanup;
+
+        template< typename T >
+        void GuardValue( T& val ) {
+                at_cleanup( [ val ]( void * newVal ) {
+                        * static_cast< T * >( newVal ) = val;
+                }, static_cast< void * >( & val ) );
+        }
+};
+
 
 #include "PassVisitor.impl.h"