Changeset 9ed3237

Timestamp:

Nov 18, 2015, 1:06:24 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

0ddb713

Parents:

84b08d4 (diff), ba407ce (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 'override-autogen' into ctor

Location:

src

Files:

• GenPoly/Box.cc (modified) (1 diff)
• GenPoly/Specialize.cc (modified) (5 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• SynTree/Type.h (modified) (4 diffs)
• main.cc (modified) (1 diff)

src/GenPoly/Box.cc

@@ -414 +414 @@
                                 for ( std::list< DeclarationWithType *>::iterator assert = (*tyVar)->get_assertions().begin(); assert != (*tyVar)->get_assertions().end(); ++assert ) {
                                         InferredParams::const_iterator inferParam = appExpr->get_inferParams().find( (*assert)->get_uniqueId() );
-                                        assert( inferParam != appExpr->get_inferParams().end() );
+                                        assert( inferParam != appExpr->get_inferParams().end() && "NOTE: Explicit casts of polymorphic functions to compatible monomorphic functions are currently unsupported" );
                                         Expression *newExpr = inferParam->second.expr->clone();
                                         addCast( newExpr, (*assert)->get_type(), tyVars );

src/GenPoly/Specialize.cc

@@ -45 +45 @@
 
           private:
+                Expression *createThunkFunction( FunctionType *funType, Expression *actual, InferredParams *inferParams = 0 );
                 Expression *doSpecialization( Type *formalType, Expression *actual, InferredParams *inferParams = 0 );
                 void handleExplicitParams( ApplicationExpr *appExpr );
@@ -61 +62 @@
         }
 
+        /// 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 +87 @@
         }
 
+        /// Returns a pointer to the base FunctionType if ty is the type of a function (or pointer to one), NULL otherwise
+        FunctionType * getFunctionType( Type *ty ) {
+                PointerType *ptrType;
+                if ( ( ptrType = dynamic_cast< PointerType* >( ty ) ) ) {
+                        return dynamic_cast< FunctionType* >( ptrType->get_base() ); // pointer if FunctionType, NULL otherwise
+                } else {
+                        return dynamic_cast< FunctionType* >( ty ); // pointer if FunctionType, NULL otherwise
+                }
+        }
+
+        /// 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( std::list< std::string >() ), false, false );
+                thunkFunc->fixUniqueId();
+
+                // 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() );
                 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 +175 @@
                 // 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;
@@ -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 *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;
+                }
         }
 

src/ResolvExpr/AlternativeFinder.cc

@@ -698 +698 @@
                         std::list< Type* >::iterator candidate_end = (*i).expr->get_results().begin();
                         std::advance( candidate_end, castExpr->get_results().size() );
+                        // unification run for side-effects
+                        unifyList( castExpr->get_results().begin(), castExpr->get_results().end(),
+                                           (*i).expr->get_results().begin(), candidate_end,
+                                   i->env, needAssertions, haveAssertions, openVars, indexer );
                         Cost thisCost = castCostList( (*i).expr->get_results().begin(), candidate_end,
-                                                                                  castExpr->get_results().begin(), castExpr->get_results().end(), indexer, i->env );
+                                                                                  castExpr->get_results().begin(), castExpr->get_results().end(),
+                                                                                  indexer, i->env );
                         if ( thisCost != Cost::infinity ) {
                                 // count one safe conversion for each value that is thrown away

src/SynTree/Type.h

@@ -418 +418 @@
         return isConst == other.isConst
                 && isVolatile == other.isVolatile
-                && isRestrict == other.isRestrict
-//      && isLvalue == other.isLvalue
+//              && isRestrict == other.isRestrict
+//              && isLvalue == other.isLvalue
                 && isAtomic == other.isAtomic;
 }
@@ -426 +426 @@
         return isConst != other.isConst
                 || isVolatile != other.isVolatile
-                || isRestrict != other.isRestrict
-//      || isLvalue != other.isLvalue
+//              || isRestrict != other.isRestrict
+//              || isLvalue != other.isLvalue
                 || isAtomic != other.isAtomic;
 }
@@ -434 +434 @@
         return isConst <= other.isConst
                 && isVolatile <= other.isVolatile
-                && isRestrict <= other.isRestrict
-//      && isLvalue >= other.isLvalue
+//              && isRestrict <= other.isRestrict
+//              && isLvalue >= other.isLvalue
                 && isAtomic == other.isAtomic;
 }
@@ -442 +442 @@
         return isConst >= other.isConst
                 && isVolatile >= other.isVolatile
-                && isRestrict >= other.isRestrict
-//      && isLvalue <= other.isLvalue
+//              && isRestrict >= other.isRestrict
+//              && isLvalue <= other.isLvalue
                 && isAtomic == other.isAtomic;
 }

src/main.cc

@@ -271 +271 @@
                 GenPoly::copyParams( translationUnit );
                 OPTPRINT( "convertSpecializations" )
-                GenPoly::convertSpecializations( translationUnit );             
+                GenPoly::convertSpecializations( translationUnit );
                 OPTPRINT( "convertLvalue" )
                 GenPoly::convertLvalue( translationUnit );