Changes in / [658f6de0:a73d57a]

Location:

src

Files:

• GenPoly/Box.cc (modified) (14 diffs)
• SymTab/Validate.cc (modified) (5 diffs)

src/GenPoly/Box.cc

@@ -73 +73 @@
                         /// Makes a new temporary array holding the offsets of the fields of `type`, and returns a new variable expression referencing it
                         Expression *makeOffsetArray( StructInstType *type );
+                        /// Pass the extra type parameters from polymorphic generic arguments or return types into a function application
+                        void passArgTypeVars( ApplicationExpr *appExpr, Type *parmType, Type *argBaseType, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars, std::set< std::string > &seenTypes );
                         /// passes extra type parameters into a polymorphic function application
-                        void passTypeVars( ApplicationExpr *appExpr, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars );
+                        void passTypeVars( ApplicationExpr *appExpr, ReferenceToType *polyRetType, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars );
                         /// wraps a function application with a new temporary for the out-parameter return value
                         Expression *addRetParam( ApplicationExpr *appExpr, FunctionType *function, Type *retType, std::list< Expression *>::iterator &arg );
@@ -398 +400 @@
                 }
 
-                void Pass1::passTypeVars( ApplicationExpr *appExpr, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars ) {
+                void Pass1::passArgTypeVars( ApplicationExpr *appExpr, Type *parmType, Type *argBaseType, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars, std::set< std::string > &seenTypes ) {
+                        Type *polyBase = hasPolyBase( parmType, exprTyVars );
+                        if ( polyBase && ! dynamic_cast< TypeInstType* >( polyBase ) ) {
+                                std::string sizeName = sizeofName( polyBase );
+                                if ( seenTypes.count( sizeName ) ) return;
+
+                                arg = appExpr->get_args().insert( arg, new SizeofExpr( argBaseType->clone() ) );
+                                arg++;
+                                arg = appExpr->get_args().insert( arg, new AlignofExpr( argBaseType->clone() ) );
+                                arg++;
+                                if ( dynamic_cast< StructInstType* >( polyBase ) ) {
+                                        if ( StructInstType *argBaseStructType = dynamic_cast< StructInstType* >( argBaseType ) ) {
+                                                arg = appExpr->get_args().insert( arg, makeOffsetArray( argBaseStructType ) );
+                                                arg++;
+                                        } else {
+                                                throw SemanticError( "Cannot pass non-struct type for generic struct" );
+                                        }
+                                }
+
+                                seenTypes.insert( sizeName );
+                        }
+                }
+
+                void Pass1::passTypeVars( ApplicationExpr *appExpr, ReferenceToType *polyRetType, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars ) {
                         // pass size/align for type variables
                         for ( TyVarMap::const_iterator tyParm = exprTyVars.begin(); tyParm != exprTyVars.end(); ++tyParm ) {
@@ -424 +449 @@
                         std::list< Expression* >::const_iterator fnArg = arg;
                         std::set< std::string > seenTypes; //< names for generic types we've seen
+
+                        // a polymorphic return type may need to be added to the argument list
+                        if ( polyRetType ) {
+                                Type *concRetType = replaceWithConcrete( appExpr, polyRetType );
+                                passArgTypeVars( appExpr, polyRetType, concRetType, arg, exprTyVars, seenTypes );
+                        }
+                        
+                        // add type information args for presently unseen types in parameter list
                         for ( ; fnParm != funcType->get_parameters().end() && fnArg != appExpr->get_args().end(); ++fnParm, ++fnArg ) {
-                                Type *polyBase = hasPolyBase( (*fnParm)->get_type(), exprTyVars );
-                                if ( polyBase && ! dynamic_cast< TypeInstType* >( polyBase ) ) {
-                                        std::string sizeName = sizeofName( polyBase );
-                                        if ( seenTypes.count( sizeName ) ) continue;
-
-                                        VariableExpr *fnArgBase = getBaseVar( *fnArg );
-                                        assert( fnArgBase && ! fnArgBase->get_results().empty() );
-                                        Type *argBaseType = fnArgBase->get_results().front();
-                                        arg = appExpr->get_args().insert( arg, new SizeofExpr( argBaseType->clone() ) );
-                                        arg++;
-                                        arg = appExpr->get_args().insert( arg, new AlignofExpr( argBaseType->clone() ) );
-                                        arg++;
-                                        if ( dynamic_cast< StructInstType* >( polyBase ) ) {
-                                                if ( StructInstType *argBaseStructType = dynamic_cast< StructInstType* >( argBaseType ) ) {
-                                                        arg = appExpr->get_args().insert( arg, makeOffsetArray( argBaseStructType ) );
-                                                        arg++;
-                                                } else {
-                                                        throw SemanticError( "Cannot pass non-struct type for generic struct" );
-                                                }
-                                        }
-
-                                        seenTypes.insert( sizeName );
-                                }
+                                VariableExpr *fnArgBase = getBaseVar( *fnArg );
+                                if ( ! fnArgBase || fnArgBase->get_results().empty() ) continue;
+                                passArgTypeVars( appExpr, (*fnParm)->get_type(), fnArgBase->get_results().front(), arg, exprTyVars, seenTypes );
                         }
                 }
@@ -470 +483 @@
                         ObjectDecl *newObj = makeTemporary( retType->clone() );
                         Expression *paramExpr = new VariableExpr( newObj );
-                        // If the type of the temporary is not polymorphic, box temporary by taking its address; otherwise the
-                        // temporary is already boxed and can be used directly.
+
+                        // If the type of the temporary is not polymorphic, box temporary by taking its address;
+                        // otherwise the temporary is already boxed and can be used directly.
                         if ( ! isPolyType( newObj->get_type(), scopeTyVars, env ) ) {
                                 paramExpr = new AddressExpr( paramExpr );
@@ -520 +534 @@
                         assert( env );
                         Type *concrete = replaceWithConcrete( appExpr, polyType );
+                        // add out-parameter for return value   
                         return addRetParam( appExpr, function, concrete, arg );
                 }
@@ -542 +557 @@
                         assert( ! arg->get_results().empty() );
                         if ( isPolyType( param, exprTyVars ) ) {
-                                if ( dynamic_cast< TypeInstType *>( arg->get_results().front() ) ) {
-                                        // if the argument's type is a type parameter, we don't need to box again!
+                                if ( isPolyType( arg->get_results().front() ) ) {
+                                        // if the argument's type is polymorphic, we don't need to box again!
                                         return;
                                 } else if ( arg->get_results().front()->get_isLvalue() ) {
@@ -917 +932 @@
                         std::list< Expression *>::iterator paramBegin = appExpr->get_args().begin();
 
-                        if ( ReferenceToType *polyType = isPolyRet( function ) ) {
-                                ret = addPolyRetParam( appExpr, function, polyType, arg );
+                        TyVarMap exprTyVars;
+                        makeTyVarMap( function, exprTyVars );
+                        ReferenceToType *polyRetType = 0;
+
+                        if ( polyRetType = isPolyRet( function ) ) {
+                                ret = addPolyRetParam( appExpr, function, polyRetType, arg );
                         } else if ( needsAdapter( function, scopeTyVars ) ) {
                                 // std::cerr << "needs adapter: ";
@@ -930 +949 @@
                         arg = appExpr->get_args().begin();
 
-                        TyVarMap exprTyVars;
-                        makeTyVarMap( function, exprTyVars );
-
-                        passTypeVars( appExpr, arg, exprTyVars );
+                        passTypeVars( appExpr, polyRetType, arg, exprTyVars );
                         addInferredParams( appExpr, function, arg, exprTyVars );
 
@@ -992 +1008 @@
                 }
 
+                /// Wraps a function declaration in a new pointer-to-function variable expression
+                VariableExpr *wrapFunctionDecl( DeclarationWithType *functionDecl ) {
+                        // line below cloned from FixFunction.cc
+                        ObjectDecl *functionObj = new ObjectDecl( functionDecl->get_name(), functionDecl->get_storageClass(), functionDecl->get_linkage(), 0,
+                                                                  new PointerType( Type::Qualifiers(), functionDecl->get_type()->clone() ), 0 );
+                        functionObj->set_mangleName( functionDecl->get_mangleName() );
+                        return new VariableExpr( functionObj );
+                }
+                
                 Statement * Pass1::mutate( ReturnStmt *returnStmt ) {
                         if ( retval && returnStmt->get_expr() ) {
@@ -1007 +1032 @@
 
                                 // find assignment operator for (polymorphic) return type
-                                DeclarationWithType *assignDecl = 0;
+                                ApplicationExpr *assignExpr = 0;
                                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType *>( retval->get_type() ) ) {
+                                        // find assignment operator for type variable
                                         std::map< std::string, DeclarationWithType *>::const_iterator assignIter = assignOps.find( typeInst->get_name() );
                                         if ( assignIter == assignOps.end() ) {
                                                 throw SemanticError( "Attempt to return dtype or ftype object in ", returnStmt->get_expr() );
                                         } // if
-                                        assignDecl = assignIter->second;
+                                        assignExpr = new ApplicationExpr( new VariableExpr( assignIter->second ) );
                                 } else if ( ReferenceToType *refType = dynamic_cast< ReferenceToType *>( retval->get_type() ) ) {
+                                        // find assignment operator for generic type
                                         ScopedMap< std::string, DeclarationWithType *>::const_iterator assignIter = scopedAssignOps.find( refType->get_name() );
                                         if ( assignIter == scopedAssignOps.end() ) {
                                                 throw SemanticError( "Attempt to return dtype or ftype generic object in ", returnStmt->get_expr() );
                                         }
+
+                                        // wrap it up in an application expression
                                         DeclarationWithType *functionDecl = assignIter->second;
-                                        // line below cloned from FixFunction.cc
-                                        assignDecl = new ObjectDecl( functionDecl->get_name(), functionDecl->get_storageClass(), functionDecl->get_linkage(), 0,
-                                                                     new PointerType( Type::Qualifiers(), functionDecl->get_type()->clone() ), 0 );
-                                        assignDecl->set_mangleName( functionDecl->get_mangleName() );
+                                        assignExpr = new ApplicationExpr( wrapFunctionDecl( functionDecl ) );
+                                        assignExpr->set_env( env->clone() );
+
+                                        // find each of its needed secondary assignment operators
+                                        std::list< Expression* > &tyParams = refType->get_parameters();
+                                        std::list< TypeDecl* > &forallParams = functionDecl->get_type()->get_forall();
+                                        std::list< Expression* >::const_iterator tyIt = tyParams.begin();
+                                        std::list< TypeDecl* >::const_iterator forallIt = forallParams.begin();
+                                        for ( ; tyIt != tyParams.end() && forallIt != forallParams.end(); ++tyIt, ++forallIt ) {
+                                                if ( (*forallIt)->get_kind() != TypeDecl::Any ) continue; // skip types with no assign op (ftype/dtype)
+
+                                                std::list< DeclarationWithType* > &asserts = (*forallIt)->get_assertions();
+                                                assert( ! asserts.empty() && "Type param needs assignment operator assertion" );
+                                                DeclarationWithType *actualDecl = asserts.front();
+                                                ReferenceToType *actualType = isAssignment( actualDecl );
+                                                assert( actualType && "First assertion of type with assertions should be assignment operator" );
+                                                TypeExpr *formalTypeExpr = dynamic_cast< TypeExpr* >( *tyIt );
+                                                assert( formalTypeExpr && "type parameters must be type expressions" );
+                                                Type *formalType = formalTypeExpr->get_type();
+                                                assignExpr->get_env()->add( actualType->get_name(), formalType );
+                                                
+                                                DeclarationWithType *assertAssign = 0;
+                                                if ( TypeInstType *formalTypeInstType = dynamic_cast< TypeInstType* >( formalType ) ) {
+                                                        std::map< std::string, DeclarationWithType *>::const_iterator assertAssignIt = assignOps.find( formalTypeInstType->get_name() );
+                                                        if ( assertAssignIt == assignOps.end() ) {
+                                                                throw SemanticError( "No assignment operation found for ", formalTypeInstType );
+                                                        }
+                                                        assertAssign = assertAssignIt->second;
+                                                        //assignExpr->get_env()->add( formalTypeInstType->get_name(), actualType );
+                                                } else if ( ReferenceToType *formalReferenceType = dynamic_cast< ReferenceToType* >( formalType ) )  {
+                                                        ScopedMap< std::string, DeclarationWithType *>::const_iterator assertAssignIt = scopedAssignOps.find( formalReferenceType->get_name() );
+                                                        if ( assertAssignIt == scopedAssignOps.end() ) {
+                                                                throw SemanticError( "No assignment operation found for ", formalReferenceType );
+                                                        }
+                                                        assertAssign = assertAssignIt->second;
+                                                } else assert( false && "returning polymorphic types with non struct/polymorphic parameters not yet supported" );
+                                                
+
+                                                assignExpr->get_inferParams()[ actualDecl->get_uniqueId() ]
+                                                        = ParamEntry( assertAssign->get_uniqueId(), assertAssign->get_type()->clone(), actualDecl->get_type()->clone(), wrapFunctionDecl( assertAssign ) );
+                                        }
                                 }
-                                assert( assignDecl );
+                                assert( assignExpr );
 
                                 // replace return statement with appropriate assignment to out parameter
-                                ApplicationExpr *assignExpr = new ApplicationExpr( new VariableExpr( assignDecl ) );
                                 Expression *retParm = new NameExpr( retval->get_name() );
                                 retParm->get_results().push_back( new PointerType( Type::Qualifiers(), retval->get_type()->clone() ) );
@@ -1180 +1245 @@
                         }
 
-                        // add size/align for generic types to parameter list
+                        // add size/align for generic parameter types to parameter list
                         std::set< std::string > seenTypes; // sizeofName for generic types we've seen
                         for ( std::list< DeclarationWithType* >::const_iterator fnParm = last; fnParm != funcType->get_parameters().end(); ++fnParm ) {
@@ -1295 +1360 @@
 
                                 if ( DeclarationWithType *declWithType = dynamic_cast< DeclarationWithType* >( *decl ) ) {
-                                        if ( memberDecl->get_mangleName() == declWithType->get_mangleName() ) return i;
+                                        if ( memberDecl->get_mangleName().empty() || declWithType->get_mangleName().empty()
+                                             || memberDecl->get_mangleName() == declWithType->get_mangleName() ) return i;
                                         else continue;
                                 } else return i;
@@ -1353 +1419 @@
                                 delete memberExpr;
                                 return fieldLoc;
-                        } else if ( UnionInstType *unionType = dynamic_cast< UnionInstType* >( objectType ) ) {
+                        } else if ( dynamic_cast< UnionInstType* >( objectType ) ) {
                                 // union members are all at offset zero, so build appropriately-dereferenced variable
                                 Expression *derefdVar = makeDerefdVar( varExpr->clone(), varDepth );
@@ -1379 +1445 @@
                                 delete offsetofExpr;
                                 return offsetInd;
-                        } else if ( UnionInstType *unionType = dynamic_cast< UnionInstType* >( ty ) ) {
+                        } else if ( dynamic_cast< UnionInstType* >( ty ) ) {
                                 // all union members are at offset zero
                                 delete offsetofExpr;

src/SymTab/Validate.cc

@@ -382 +382 @@
                 // it's not a semantic error if the struct is not found, just an implicit forward declaration
                 if ( st ) {
-                        assert( ! structInst->get_baseStruct() || structInst->get_baseStruct()->get_members().empty() || ! st->get_members().empty() );
+                        //assert( ! structInst->get_baseStruct() || structInst->get_baseStruct()->get_members().empty() || ! st->get_members().empty() );
                         structInst->set_baseStruct( st );
                 } // if
@@ -659 +659 @@
         }
 
+        /// Creates a new type decl that's the same as src, but renamed and with only the ?=? assertion (for complete types only)
+        TypeDecl *cloneAndRename( TypeDecl *src, const std::string &name ) {
+                TypeDecl *dst = new TypeDecl( name, src->get_storageClass(), 0, src->get_kind() );
+
+                if ( src->get_kind() == TypeDecl::Any ) {
+                        // just include assignment operator assertion
+                        TypeInstType *assignParamType = new TypeInstType( Type::Qualifiers(), name, dst );
+                        FunctionType *assignFunctionType = new FunctionType( Type::Qualifiers(), false );
+                        assignFunctionType->get_returnVals().push_back(
+                                new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, assignParamType->clone(), 0 ) );
+                        assignFunctionType->get_parameters().push_back(
+                                new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), assignParamType->clone() ), 0 ) );
+                        assignFunctionType->get_parameters().push_back(
+                                new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, assignParamType, 0 ) );
+                        FunctionDecl *assignAssert = new FunctionDecl( "?=?", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, assignFunctionType, 0, false, false );
+                        dst->get_assertions().push_back( assignAssert );
+                }
+
+                return dst;
+        }
+
         Declaration *makeStructAssignment( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting ) {
                 FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
@@ -666 +687 @@
                 std::list< TypeDecl* >& genericParams = aggregateDecl->get_parameters();
                 std::list< Expression* > structParams;  // List of matching parameters to put on types
+                TypeSubstitution genericSubs; // Substitutions to make to member types of struct
                 for ( std::list< TypeDecl* >::const_iterator param = genericParams.begin(); param != genericParams.end(); ++param ) {
                         isGeneric = true;
-                        TypeDecl *typeParam = (*param)->clone();
+                        TypeDecl *typeParam = cloneAndRename( *param, "_autoassign_" + aggregateDecl->get_name() + "_" + (*param)->get_name() );
                         assignType->get_forall().push_back( typeParam );
-                        structParams.push_back( new TypeExpr( new TypeInstType( Type::Qualifiers(), typeParam->get_name(), typeParam ) ) );
+                        TypeInstType *newParamType = new TypeInstType( Type::Qualifiers(), typeParam->get_name(), typeParam );
+                        genericSubs.add( (*param)->get_name(), newParamType );
+                        structParams.push_back( new TypeExpr( newParamType ) );
                 }
 
@@ -701 +725 @@
                                 }
 
-                                if ( ArrayType *array = dynamic_cast< ArrayType * >( dwt->get_type() ) ) {
-                                        makeArrayAssignment( srcParam, dstParam, dwt, array, back_inserter( assignDecl->get_statements()->get_kids() ) );
-                                        if ( isGeneric ) makeArrayAssignment( srcParam, returnVal, dwt, array, back_inserter( assignDecl->get_statements()->get_kids() ) );
+                                if ( isGeneric ) {
+                                        // rewrite member type in terms of the type variables on this operator
+                                        DeclarationWithType *fixedMember = dwt->clone();
+                                        genericSubs.apply( fixedMember );
+
+                                        // assign to both destination and return value
+                                        if ( ArrayType *array = dynamic_cast< ArrayType * >( fixedMember->get_type() ) ) {
+                                                makeArrayAssignment( srcParam, dstParam, fixedMember, array, back_inserter( assignDecl->get_statements()->get_kids() ) );
+                                                makeArrayAssignment( srcParam, returnVal, fixedMember, array, back_inserter( assignDecl->get_statements()->get_kids() ) );
+                                        } else {
+                                                makeScalarAssignment( srcParam, dstParam, fixedMember, back_inserter( assignDecl->get_statements()->get_kids() ) );
+                                                makeScalarAssignment( srcParam, returnVal, fixedMember, back_inserter( assignDecl->get_statements()->get_kids() ) );
+                                        } // if
                                 } else {
-                                        makeScalarAssignment( srcParam, dstParam, dwt, back_inserter( assignDecl->get_statements()->get_kids() ) );
-                                        if ( isGeneric ) makeScalarAssignment( srcParam, returnVal, dwt, back_inserter( assignDecl->get_statements()->get_kids() ) );
+                                        // assign to destination
+                                        if ( ArrayType *array = dynamic_cast< ArrayType * >( dwt->get_type() ) ) {
+                                                makeArrayAssignment( srcParam, dstParam, dwt, array, back_inserter( assignDecl->get_statements()->get_kids() ) );
+                                        } else {
+                                                makeScalarAssignment( srcParam, dstParam, dwt, back_inserter( assignDecl->get_statements()->get_kids() ) );
+                                        } // if
                                 } // if
                         } // if
@@ -724 +762 @@
                 for ( std::list< TypeDecl* >::const_iterator param = genericParams.begin(); param != genericParams.end(); ++param ) {
                         isGeneric = true;
-                        TypeDecl *typeParam = (*param)->clone();
+                        TypeDecl *typeParam = cloneAndRename( *param, "_autoassign_" + aggregateDecl->get_name() + "_" + (*param)->get_name() );
                         assignType->get_forall().push_back( typeParam );
                         unionParams.push_back( new TypeExpr( new TypeInstType( Type::Qualifiers(), typeParam->get_name(), typeParam ) ) );