Changes in src/InitTweak/InitTweak.cc [2d11663:d76c588]

File:

• src/InitTweak/InitTweak.cc (modified) (8 diffs)

src/InitTweak/InitTweak.cc

@@ -1 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// InitTweak.cc --
-//
-// Author           : Rob Schluntz
-// Created On       : Fri May 13 11:26:36 2016
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon Jun 10 13:30:00 2019
-// Update Count     : 5
-//
-
 #include <algorithm>               // for find, all_of
 #include <cassert>                 // for assertf, assert, strict_dynamic_cast
@@ -19 +4 @@
 #include <iterator>                // for back_insert_iterator, back_inserter
 #include <memory>                  // for __shared_ptr
-#include <vector>
 
 #include "AST/Expr.hpp"
@@ -323 +307 @@
         }
 
-        struct CallFinder_old {
-                CallFinder_old( const std::list< std::string > & names ) : names( names ) {}
+        struct CallFinder {
+                CallFinder( const std::list< std::string > & names ) : names( names ) {}
 
                 void postvisit( ApplicationExpr * appExpr ) {
@@ -347 +331 @@
         };
 
-        struct CallFinder_new final {
-                std::vector< ast::ptr< ast::Expr > > matches;
-                const std::vector< std::string > names;
-
-                CallFinder_new( std::vector< std::string > && ns ) : matches(), names( std::move(ns) ) {}
-
-                void handleCallExpr( const ast::Expr * expr ) {
-                        std::string fname = getFunctionName( expr );
-                        if ( std::find( names.begin(), names.end(), fname ) != names.end() ) {
-                                matches.emplace_back( expr );
-                        }
-                }
-
-                void postvisit( const ast::ApplicationExpr * expr ) { handleCallExpr( expr ); }
-                void postvisit( const ast::UntypedExpr *     expr ) { handleCallExpr( expr ); }
-        };
-
         void collectCtorDtorCalls( Statement * stmt, std::list< Expression * > & matches ) {
-                static PassVisitor<CallFinder_old> finder( std::list< std::string >{ "?{}", "^?{}" } );
+                static PassVisitor<CallFinder> finder( std::list< std::string >{ "?{}", "^?{}" } );
                 finder.pass.matches = &matches;
                 maybeAccept( stmt, finder );
-        }
-
-        std::vector< ast::ptr< ast::Expr > > collectCtorDtorCalls( const ast::Stmt * stmt ) {
-                ast::Pass< CallFinder_new > finder{ std::vector< std::string >{ "?{}", "^?{}" } };
-                maybe_accept( stmt, finder );
-                return std::move( finder.pass.matches );
         }
 
@@ -379 +340 @@
                 std::list< Expression * > matches;
                 collectCtorDtorCalls( stmt, matches );
-                assertf( matches.size() <= 1, "%zd constructor/destructors found in %s", matches.size(), toString( stmt ).c_str() );
+                assert( matches.size() <= 1 );
                 return matches.size() == 1 ? matches.front() : nullptr;
         }
@@ -475 +436 @@
         }
 
-        const ast::ApplicationExpr * isIntrinsicCallExpr( const ast::Expr * expr ) {
-                auto appExpr = dynamic_cast< const ast::ApplicationExpr * >( expr );
-                if ( ! appExpr ) return nullptr;
-
-                const ast::DeclWithType * func = getCalledFunction( appExpr->func );
-                assertf( func, 
-                        "getCalledFunction returned nullptr: %s", toString( appExpr->func ).c_str() );
-                
-                // check for Intrinsic only -- don't want to remove all overridable ctor/dtor because 
-                // autogenerated ctor/dtor will call all member dtors, and some members may have a 
-                // user-defined dtor
-                return func->linkage == ast::Linkage::Intrinsic ? appExpr : nullptr;
-        }
-
         namespace {
                 template <typename Predicate>
@@ -497 +444 @@
                         return std::all_of( callExprs.begin(), callExprs.end(), pred);
                 }
-
-                template <typename Predicate>
-                bool allofCtorDtor( const ast::Stmt * stmt, const Predicate & pred ) {
-                        std::vector< ast::ptr< ast::Expr > > callExprs = collectCtorDtorCalls( stmt );
-                        return std::all_of( callExprs.begin(), callExprs.end(), pred );
-                }
         }
 
@@ -511 +452 @@
                                 assert( funcType );
                                 return funcType->get_parameters().size() == 1;
-                        }
-                        return false;
-                });
-        }
-
-        bool isIntrinsicSingleArgCallStmt( const ast::Stmt * stmt ) {
-                return allofCtorDtor( stmt, []( const ast::Expr * callExpr ){
-                        if ( const ast::ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
-                                const ast::FunctionType * funcType = 
-                                        GenPoly::getFunctionType( appExpr->func->result );
-                                assert( funcType );
-                                return funcType->params.size() == 1;
                         }
                         return false;