Changes in src/InitTweak/FixInit.cc [7b3f66b:ec79847]

File:

• src/InitTweak/FixInit.cc (modified) (5 diffs)

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 13 11:44:26 2016
+// Last Modified On : Mon May 09 12:36:02 2016
 // Update Count     : 30
 //
@@ -17 +17 @@
 #include <list>
 #include "FixInit.h"
-#include "InitTweak.h"
 #include "ResolvExpr/Resolver.h"
 #include "ResolvExpr/typeops.h"
@@ -28 +27 @@
 #include "SymTab/Indexer.h"
 #include "GenPoly/PolyMutator.h"
+#include "GenPoly/GenPoly.h"
 
 bool ctordtorp = false;
@@ -398 +398 @@
         }
 
+        bool isInstrinsicSingleArgCallStmt( Statement * stmt ) {
+                if ( stmt == NULL ) return false;
+                if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( stmt ) ) {
+                        ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( exprStmt->get_expr() );
+                        assert( appExpr );
+                        VariableExpr * function = dynamic_cast< VariableExpr * >( appExpr->get_function() );
+                        assert( function );
+                        // check for Intrinsic only - don't want to remove all overridable ctor/dtors because autogenerated ctor/dtor
+                        // will call all member dtors, and some members may have a user defined dtor.
+                        FunctionType * funcType = GenPoly::getFunctionType( function->get_var()->get_type() );
+                        assert( funcType );
+                        return function->get_var()->get_linkage() == LinkageSpec::Intrinsic && funcType->get_parameters().size() == 1;
+                } else if ( CompoundStmt * compoundStmt = dynamic_cast< CompoundStmt * >( stmt ) ) {
+                        // could also be a compound statement with a loop, in the case of an array
+                        assert( compoundStmt->get_kids().size() == 2 ); // loop variable and loop
+                        ForStmt * forStmt = dynamic_cast< ForStmt * >( compoundStmt->get_kids().back() );
+                        assert( forStmt && forStmt->get_body() );
+                        return isInstrinsicSingleArgCallStmt( forStmt->get_body() );
+                } else {
+                        // should never get here
+                        assert( false && "encountered unknown call statement" );
+                }
+        }
+
         namespace {
                 template<typename Iterator, typename OutputIterator>
@@ -404 +428 @@
                                 // remove if instrinsic destructor statement. Note that this is only called
                                 // on lists of implicit dtors, so if the user manually calls an intrinsic
-                                // dtor then the call must (and will) still be generated since the argument
-                                // may contain side effects.
+                                // dtor then the call will still be generated
                                 if ( ! isInstrinsicSingleArgCallStmt( *it ) ) {
                                         // don't need to call intrinsic dtor, because it does nothing, but