Changeset 21300d7 for src/InitTweak/InitTweak.cc

Timestamp:

Jun 12, 2019, 4:06:37 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

462a7c7, d60780c

Parents:

aaeacf4 (diff), 6625727 (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

File:

• src/InitTweak/InitTweak.cc (modified) (7 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
@@ -4 +19 @@
 #include <iterator>                // for back_insert_iterator, back_inserter
 #include <memory>                  // for __shared_ptr
+#include <vector>
 
 #include "AST/Expr.hpp"
@@ -307 +323 @@
         }
 
-        struct CallFinder {
-                CallFinder( const std::list< std::string > & names ) : names( names ) {}
+        struct CallFinder_old {
+                CallFinder_old( const std::list< std::string > & names ) : names( names ) {}
 
                 void postvisit( ApplicationExpr * appExpr ) {
@@ -331 +347 @@
         };
 
+        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> finder( std::list< std::string >{ "?{}", "^?{}" } );
+                static PassVisitor<CallFinder_old> 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 );
         }
 
@@ -436 +475 @@
         }
 
+        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>
@@ -444 +497 @@
                         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 );
+                }
         }
 
@@ -452 +511 @@
                                 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;