Changes in src/GenPoly/Specialize.cc [8cbf8cd:aedfd91]

File:

• src/GenPoly/Specialize.cc (modified) (9 diffs)

src/GenPoly/Specialize.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Specialize.cc -- 
+// Specialize.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Sep 22 14:04:13 2015
-// Update Count     : 15
+// Last Modified On : Thu Apr 28 15:17:45 2016
+// Update Count     : 24
 //
 
@@ -17 +17 @@
 
 #include "Specialize.h"
+#include "GenPoly.h"
 #include "PolyMutator.h"
 
@@ -24 +25 @@
 #include "SynTree/Statement.h"
 #include "SynTree/Type.h"
+#include "SynTree/Attribute.h"
 #include "SynTree/TypeSubstitution.h"
 #include "SynTree/Mutator.h"
 #include "ResolvExpr/FindOpenVars.h"
-#include "UniqueName.h"
-#include "utility.h"
+#include "Common/UniqueName.h"
+#include "Common/utility.h"
+#include "InitTweak/InitTweak.h"
 
 namespace GenPoly {
@@ -40 +43 @@
                 virtual Expression * mutate( AddressExpr *castExpr );
                 virtual Expression * mutate( CastExpr *castExpr );
-                virtual Expression * mutate( LogicalExpr *logicalExpr );
-                virtual Expression * mutate( ConditionalExpr *conditionalExpr );
-                virtual Expression * mutate( CommaExpr *commaExpr );
+                // virtual Expression * mutate( LogicalExpr *logicalExpr );
+                // virtual Expression * mutate( ConditionalExpr *conditionalExpr );
+                // virtual Expression * mutate( CommaExpr *commaExpr );
 
           private:
+                Expression *createThunkFunction( FunctionType *funType, Expression *actual, InferredParams *inferParams = 0 );
                 Expression *doSpecialization( Type *formalType, Expression *actual, InferredParams *inferParams = 0 );
                 void handleExplicitParams( ApplicationExpr *appExpr );
@@ -61 +65 @@
         }
 
+        /// Looks up open variables in actual type, returning true if any of them are bound in the environment or formal type.
         bool needsSpecialization( Type *formalType, Type *actualType, TypeSubstitution *env ) {
                 if ( env ) {
@@ -85 +90 @@
         }
 
+        /// Generates a thunk that calls `actual` with type `funType` and returns its address
+        Expression * Specialize::createThunkFunction( FunctionType *funType, Expression *actual, InferredParams *inferParams ) {
+                FunctionType *newType = funType->clone();
+                if ( env ) {
+                        TypeSubstitution newEnv( *env );
+                        // it is important to replace only occurrences of type variables that occur free in the
+                        // thunk's type
+                        newEnv.applyFree( newType );
+                } // if
+                // create new thunk with same signature as formal type (C linkage, empty body)
+                FunctionDecl *thunkFunc = new FunctionDecl( thunkNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, newType, new CompoundStmt( noLabels ), false, false );
+                thunkFunc->fixUniqueId();
+
+                // thunks may be generated and not used - silence warning with attribute
+                thunkFunc->get_attributes().push_back( new Attribute( "unused" ) );
+
+                // thread thunk parameters into call to actual function, naming thunk parameters as we go
+                UniqueName paramNamer( paramPrefix );
+                ApplicationExpr *appExpr = new ApplicationExpr( actual );
+                for ( std::list< DeclarationWithType* >::iterator param = thunkFunc->get_functionType()->get_parameters().begin(); param != thunkFunc->get_functionType()->get_parameters().end(); ++param ) {
+                        (*param )->set_name( paramNamer.newName() );
+                        appExpr->get_args().push_back( new VariableExpr( *param ) );
+                } // for
+                appExpr->set_env( maybeClone( env ) );
+                if ( inferParams ) {
+                        appExpr->get_inferParams() = *inferParams;
+                } // if
+
+                // handle any specializations that may still be present
+                std::string oldParamPrefix = paramPrefix;
+                paramPrefix += "p";
+                // save stmtsToAdd in oldStmts
+                std::list< Statement* > oldStmts;
+                oldStmts.splice( oldStmts.end(), stmtsToAdd );
+                handleExplicitParams( appExpr );
+                paramPrefix = oldParamPrefix;
+                // write any statements added for recursive specializations into the thunk body
+                thunkFunc->get_statements()->get_kids().splice( thunkFunc->get_statements()->get_kids().end(), stmtsToAdd );
+                // restore oldStmts into stmtsToAdd
+                stmtsToAdd.splice( stmtsToAdd.end(), oldStmts );
+
+                // add return (or valueless expression) to the thunk
+                Statement *appStmt;
+                if ( funType->get_returnVals().empty() ) {
+                        appStmt = new ExprStmt( noLabels, appExpr );
+                } else {
+                        appStmt = new ReturnStmt( noLabels, appExpr );
+                } // if
+                thunkFunc->get_statements()->get_kids().push_back( appStmt );
+
+                // add thunk definition to queue of statements to add
+                stmtsToAdd.push_back( new DeclStmt( noLabels, thunkFunc ) );
+                // return address of thunk function as replacement expression
+                return new AddressExpr( new VariableExpr( thunkFunc ) );
+        }
+
         Expression * Specialize::doSpecialization( Type *formalType, Expression *actual, InferredParams *inferParams ) {
-                assert( ! actual->get_results().empty() );
+                assert( ! actual->get_results().empty() ); // using front, should have this assert
                 if ( needsSpecialization( formalType, actual->get_results().front(), env ) ) {
-                        PointerType *ptrType;
                         FunctionType *funType;
-                        if ( ( ptrType = dynamic_cast< PointerType* >( formalType ) ) && ( funType = dynamic_cast< FunctionType* >( ptrType->get_base() ) ) ) {
-                                FunctionType *newType = funType->clone();
-                                if ( env ) {
-                                        TypeSubstitution newEnv( *env );
-                                        // it is important to replace only occurrences of type variables that occur free in the
-                                        // thunk's type
-                                        newEnv.applyFree( newType );
-                                } // if
-                                FunctionDecl *thunkFunc = new FunctionDecl( thunkNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, newType, new CompoundStmt( std::list< std::string >() ), false, false );
-                                thunkFunc->fixUniqueId();
-
-                                UniqueName paramNamer( paramPrefix );
-                                ApplicationExpr *appExpr = new ApplicationExpr( actual );
-                                for ( std::list< DeclarationWithType* >::iterator param = thunkFunc->get_functionType()->get_parameters().begin(); param != thunkFunc->get_functionType()->get_parameters().end(); ++param ) {
-                                        (*param )->set_name( paramNamer.newName() );
-                                        appExpr->get_args().push_back( new VariableExpr( *param ) );
-                                } // for
-                                appExpr->set_env( maybeClone( env ) );
-                                if ( inferParams ) {
-                                        appExpr->get_inferParams() = *inferParams;
-                                } // if
-
-                                // handle any specializations that may still be present
-                                std::string oldParamPrefix = paramPrefix;
-                                paramPrefix += "p";
-                                std::list< Statement* > oldStmts;
-                                oldStmts.splice( oldStmts.end(), stmtsToAdd );
-                                handleExplicitParams( appExpr );
-                                paramPrefix = oldParamPrefix;
-                                thunkFunc->get_statements()->get_kids().splice( thunkFunc->get_statements()->get_kids().end(), stmtsToAdd );
-                                stmtsToAdd.splice( stmtsToAdd.end(), oldStmts );
-
-                                Statement *appStmt;
-                                if ( funType->get_returnVals().empty() ) {
-                                        appStmt = new ExprStmt( noLabels, appExpr );
+                        if ( ( funType = getFunctionType( formalType ) ) ) {
+                                ApplicationExpr *appExpr;
+                                VariableExpr *varExpr;
+                                if ( ( appExpr = dynamic_cast<ApplicationExpr*>( actual ) ) ) {
+                                        return createThunkFunction( funType, appExpr->get_function(), inferParams );
+                                } else if ( ( varExpr = dynamic_cast<VariableExpr*>( actual ) ) ) {
+                                        return createThunkFunction( funType, varExpr, inferParams );
                                 } else {
-                                        appStmt = new ReturnStmt( noLabels, appExpr );
-                                } // if
-                                thunkFunc->get_statements()->get_kids().push_back( appStmt );
-                                stmtsToAdd.push_back( new DeclStmt( noLabels, thunkFunc ) );
-                                return new AddressExpr( new VariableExpr( thunkFunc ) );
+                                        // This likely won't work, as anything that could build an ApplicationExpr probably hit one of the previous two branches
+                                        return createThunkFunction( funType, actual, inferParams );
+                                }
                         } else {
                                 return actual;
@@ -142 +172 @@
                 // create thunks for the explicit parameters
                 assert( ! appExpr->get_function()->get_results().empty() );
-                PointerType *pointer = dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() );
-                assert( pointer );
-                FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() );
+                FunctionType *function = getFunctionType( appExpr->get_function()->get_results().front() );
+                assert( function );
                 std::list< DeclarationWithType* >::iterator formal;
                 std::list< Expression* >::iterator actual;
@@ -156 +185 @@
                 mutateAll( appExpr->get_args(), *this );
 
-                // create thunks for the inferred parameters
-                for ( InferredParams::iterator inferParam = appExpr->get_inferParams().begin(); inferParam != appExpr->get_inferParams().end(); ++inferParam ) {
-                        inferParam->second.expr = doSpecialization( inferParam->second.formalType, inferParam->second.expr, &appExpr->get_inferParams() );
-                }
-
-                handleExplicitParams( appExpr );
+                if ( ! InitTweak::isIntrinsicCallExpr( appExpr ) ) {
+                        // create thunks for the inferred parameters
+                        // don't need to do this for intrinsic calls, because they aren't actually passed
+                        for ( InferredParams::iterator inferParam = appExpr->get_inferParams().begin(); inferParam != appExpr->get_inferParams().end(); ++inferParam ) {
+                                inferParam->second.expr = doSpecialization( inferParam->second.formalType, inferParam->second.expr, &appExpr->get_inferParams() );
+                        }
+
+                        handleExplicitParams( appExpr );
+                }
 
                 return appExpr;
@@ -175 +207 @@
         Expression * Specialize::mutate( CastExpr *castExpr ) {
                 castExpr->get_arg()->acceptMutator( *this );
-                if ( ! castExpr->get_results().empty() ) {
-                        // this may not be the correct condition, but previously the next statement 
-                        // was happening unchecked, causing a crash on a cast to void
-                        castExpr->set_arg( doSpecialization( castExpr->get_results().front(), castExpr->get_arg() ) );          
-                }
-                return castExpr;
-        }
-
-        Expression * Specialize::mutate( LogicalExpr *logicalExpr ) {
-                return logicalExpr;
-        }
-
-        Expression * Specialize::mutate( ConditionalExpr *condExpr ) {
-                return condExpr;
-        }
-
-        Expression * Specialize::mutate( CommaExpr *commaExpr ) {
-                return commaExpr;
-        }
+                if ( castExpr->get_results().empty() ) {
+                        // can't specialize if we don't have a return value
+                        return castExpr;
+                }
+                Expression *specialized = doSpecialization( castExpr->get_results().front(), castExpr->get_arg() );
+                if ( specialized != castExpr->get_arg() ) {
+                        // assume here that the specialization incorporates the cast
+                        return specialized;
+                } else {
+                        return castExpr;
+                }
+        }
+
+        // Removing these for now. Richard put these in for some reason, but it's not clear why.
+        // In particular, copy constructors produce a comma expression, and with this code the parts
+        // of that comma expression are not specialized, which causes problems.
+
+        // Expression * Specialize::mutate( LogicalExpr *logicalExpr ) {
+        //      return logicalExpr;
+        // }
+
+        // Expression * Specialize::mutate( ConditionalExpr *condExpr ) {
+        //      return condExpr;
+        // }
+
+        // Expression * Specialize::mutate( CommaExpr *commaExpr ) {
+        //      return commaExpr;
+        // }
 } // namespace GenPoly