Changes in src/SymTab/GenImplicitCall.cpp [4e2f1b2:5bf685f]

File:

• src/SymTab/GenImplicitCall.cpp (modified) (9 diffs)

src/SymTab/GenImplicitCall.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenImplicitCall.cpp -- Generate code for implicit operator calls.
+// GenImplicitCall.hpp --
 //
 // Author           : Andrew Beach
@@ -31 +31 @@
 namespace {
 
-using Inserter = std::back_insert_iterator<std::list<ast::ptr<ast::Stmt>>>;
-
+template< typename OutIter >
 ast::ptr< ast::Stmt > genCall(
         InitTweak::InitExpander & srcParam, const ast::Expr * dstParam,
-        const CodeLocation & loc, const std::string & fname, Inserter && out,
+        const CodeLocation & loc, const std::string & fname, OutIter && out,
         const ast::Type * type, const ast::Type * addCast, LoopDirection forward = LoopForward );
 
@@ -42 +41 @@
 /// optionally returns a statement which must be inserted prior to the containing loop, if
 /// there is one
+template< typename OutIter >
 ast::ptr< ast::Stmt > genScalarCall(
         InitTweak::InitExpander & srcParam, const ast::Expr * dstParam,
-        const CodeLocation & loc, std::string fname, Inserter && out, const ast::Type * type,
+        const CodeLocation & loc, std::string fname, OutIter && out, const ast::Type * type,
         const ast::Type * addCast = nullptr
 ) {
@@ -97 +97 @@
 /// Store in out a loop which calls fname on each element of the array with srcParam and
 /// dstParam as arguments. If forward is true, loop goes from 0 to N-1, else N-1 to 0
+template< typename OutIter >
 void genArrayCall(
         InitTweak::InitExpander & srcParam, const ast::Expr * dstParam,
-        const CodeLocation & loc, const std::string & fname, Inserter && out,
+        const CodeLocation & loc, const std::string & fname, OutIter && out,
         const ast::ArrayType * array, const ast::Type * addCast = nullptr,
         LoopDirection forward = LoopForward
@@ -165 +166 @@
 }
 
+template< typename OutIter >
 ast::ptr< ast::Stmt > genCall(
         InitTweak::InitExpander & srcParam, const ast::Expr * dstParam,
-        const CodeLocation & loc, const std::string & fname, Inserter && out,
+        const CodeLocation & loc, const std::string & fname, OutIter && out,
         const ast::Type * type, const ast::Type * addCast, LoopDirection forward
 ) {
         if ( auto at = dynamic_cast< const ast::ArrayType * >( type ) ) {
                 genArrayCall(
-                        srcParam, dstParam, loc, fname, std::forward< Inserter&& >( out ), at, addCast,
+                        srcParam, dstParam, loc, fname, std::forward< OutIter >(out), at, addCast,
                         forward );
                 return {};
         } else {
                 return genScalarCall(
-                        srcParam, dstParam, loc, fname, std::forward< Inserter&& >( out ), type, addCast );
+                        srcParam, dstParam, loc, fname, std::forward< OutIter >( out ), type, addCast );
         }
 }
@@ -183 +185 @@
 } // namespace
 
-const ast::Stmt * genImplicitCall(
+ast::ptr< ast::Stmt > genImplicitCall(
         InitTweak::InitExpander & srcParam, const ast::Expr * dstParam,
         const CodeLocation & loc, const std::string & fname, const ast::ObjectDecl * obj,
@@ -189 +191 @@
 ) {
         // unnamed bit fields are not copied as they cannot be accessed
-        if ( isUnnamedBitfield( obj ) ) return nullptr;
+        if ( isUnnamedBitfield( obj ) ) return {};
 
         ast::ptr< ast::Type > addCast;
@@ -197 +199 @@
         }
 
-        std::list< ast::ptr< ast::Stmt > > stmts;
+        std::vector< ast::ptr< ast::Stmt > > stmts;
         genCall(
                 srcParam, dstParam, loc, fname, back_inserter( stmts ), obj->type, addCast, forward );
 
-        if ( stmts.empty() ) return nullptr;
-        assert( stmts.size() == 1 );
-
-        const ast::Stmt * callStmt = stmts.front().release();
-        // Implicitly generated ctor/dtor calls should be wrapped so that
-        // later passes are aware they were generated.
-        if ( addCast ) {
-                callStmt = new ast::ImplicitCtorDtorStmt( callStmt->location, callStmt );
-        }
-        return callStmt;
+        if ( stmts.empty() ) {
+                return {};
+        } else if ( stmts.size() == 1 ) {
+                const ast::Stmt * callStmt = stmts.front();
+                if ( addCast ) {
+                        // implicitly generated ctor/dtor calls should be wrapped so that later passes are
+                        // aware they were generated.
+                        callStmt = new ast::ImplicitCtorDtorStmt( callStmt->location, callStmt );
+                }
+                return callStmt;
+        } else {
+                assert( false );
+                return {};
+        }
 }
 
@@ -220 +226 @@
 // compile-command: "make install" //
 // End: //
+
+