Changeset 3fb9a83

Timestamp:

Jun 1, 2017, 3:18:58 PM (7 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, resolv-new, with_gc

Children:

134322e

Parents:

5013c62

Message:

Fixed implementation of env, some optim needed

Location:

src/Common

Files:

• PassVisitor.h (modified) (1 diff)
• PassVisitor.impl.h (modified) (3 diffs)
• PassVisitor.proto.h (modified) (1 diff)

src/Common/PassVisitor.h

@@ -218 +218 @@
         void call_endScope  () { end_scope_impl  ( pass, 0 ); }
 
+        void set_env( TypeSubstitution * env ) { set_env_impl( pass, env, 0); }
+
         void mutateStatementList( std::list< Statement* > &statements );
         Statement * mutateStatement( Statement * stmt );

src/Common/PassVisitor.impl.h

@@ -51 +51 @@
         ValueGuard< std::list< Statement* > > oldStmtsToAddAfter( stmtsToAddAfter );
         ValueGuard< TypeSubstitution * > oldEnv( env );
+        set_env( env );
+
         stmtsToAdd.clear();
         stmtsToAddAfter.clear();
@@ -73 +75 @@
         if ( expr->get_env() ) {
                 env = expr->get_env();
+                set_env( env );
         }
         // xxx - should env be cloned (or moved) onto the result of the mutate?
@@ -488 +491 @@
         ValueGuard< std::list< Statement* > > oldStmtsToAddAfter( stmtsToAddAfter );
         ValueGuard< TypeSubstitution * > oldEnv( env );
+        set_env( env );
 
         // xxx - not sure if this is needed, along with appropriate reset, but I don't think so...

src/Common/PassVisitor.proto.h

@@ -69 +69 @@
 template<typename pass_type>
 static inline void end_scope_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) long unused ) {}
+
+// Env
+template<typename pass_type>
+static inline auto set_env_impl( pass_type& pass, TypeSubstitution * env, __attribute__((unused)) int unused ) ->decltype( pass.env, void() ) {
+        pass.env = env;
+}
+
+template<typename pass_type>
+static inline void set_env_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) TypeSubstitution * env, __attribute__((unused)) long unused ) {}