Changeset 02af79b0 for src/Common

Timestamp:

May 9, 2019, 4:47:53 PM (7 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, stuck-waitfor-destruct

Children:

b038fe4

Parents:

ec28948 (diff), db27767 (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:software/cfa/cfa-cc

Location:

src/Common

Files:

• Assert.cc (modified) (1 diff)
• PassVisitor.h (modified) (3 diffs)
• PassVisitor.impl.h (modified) (4 diffs)
• PassVisitor.proto.h (modified) (2 diffs)

src/Common/Assert.cc

@@ -39 +39 @@
 }
 
+void abort(const char *fmt, ... ) noexcept __attribute__((noreturn, format(printf, 1, 2)));
+void abort(const char *fmt, ... ) noexcept {
+        va_list args;
+        va_start( args, fmt );
+        vfprintf( stderr, fmt, args );
+        va_end( args );
+        fprintf( stderr, "\n" );
+        abort();
+}
+
 // Local Variables: //
 // tab-width: 4 //

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

@@ -20 +20 @@
 
 #define MUTATE_END( type, node )                \
-        return call_postmutate< type * >( node ); \
+        auto __return = call_postmutate< type * >( node ); \
+        assert( __return ); \
+        return __return;
 
 
@@ -253 +255 @@
 
         // 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 +1997 @@
 
         // 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 +2014 @@
 
         // 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  )
@@ -174 +174 @@
 FIELD_PTR( PassVisitor<pass_type> * const, visitor )
 
+#undef FIELD_PTR
+
 //---------------------------------------------------------
 // Indexer