Changeset 02fdb8e for src/Common

Timestamp:

May 7, 2019, 1:39:08 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

cedb545

Parents:

0c0f548

Message:

Added WithConstTypeSubstitution? accessory on pass visitor.
Mostly exploratory work, figuring out what can be const

Location:

src/Common

Files:

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

src/Common/PassVisitor.h

@@ -4 +4 @@
 
 #include <stack>
+#include <type_traits>
 
 #include "Common/Stats.h"
@@ -301 +302 @@
 
 
-        TypeSubstitution **             get_env_ptr    () { return env_impl             ( pass, 0); }
+        auto                                    get_env_ptr    () -> decltype(env_impl( pass, 0)) { return env_impl( pass, 0); }
         std::list< Statement* > *       get_beforeStmts() { return stmtsToAddBefore_impl( pass, 0); }
         std::list< Statement* > *       get_afterStmts () { return stmtsToAddAfter_impl ( pass, 0); }
@@ -348 +349 @@
 };
 
+class WithConstTypeSubstitution {
+protected:
+        WithConstTypeSubstitution() = default;
+        ~WithConstTypeSubstitution() = default;
+
+public:
+        const TypeSubstitution * env = nullptr;
+};
+
 class WithStmtsToAdd {
 protected:

src/Common/PassVisitor.impl.h

@@ -253 +253 @@
 
         // don't want statements from outer CompoundStmts to be added to this CompoundStmt
-        ValueGuardPtr< TypeSubstitution * >  oldEnv        ( get_env_ptr    () );
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
         ValueGuardPtr< DeclList_t >          oldBeforeDecls( get_beforeDecls() );
         ValueGuardPtr< DeclList_t >          oldAfterDecls ( get_afterDecls () );
@@ -1995 +1995 @@
 
         // don't want statements from outer CompoundStmts to be added to this StmtExpr
-        ValueGuardPtr< TypeSubstitution * >      oldEnv        ( get_env_ptr() );
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
         ValueGuardPtr< std::list< Statement* > > oldBeforeStmts( get_beforeStmts() );
         ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );
@@ -2012 +2012 @@
 
         // don't want statements from outer CompoundStmts to be added to this StmtExpr
-        ValueGuardPtr< TypeSubstitution * >      oldEnv        ( get_env_ptr() );
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
         ValueGuardPtr< std::list< Statement* > > oldBeforeStmts( get_beforeStmts() );
         ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );

src/Common/PassVisitor.proto.h

@@ -165 +165 @@
 static inline type * name##_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) long unused ) { return nullptr;}    \
 
-FIELD_PTR( TypeSubstitution *, env )
+FIELD_PTR( const TypeSubstitution *, env )
 FIELD_PTR( std::list< Statement* >, stmtsToAddBefore )
 FIELD_PTR( std::list< Statement* >, stmtsToAddAfter  )