Changeset 13ca524

Timestamp:

Nov 26, 2015, 5:06:26 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, string, with_gc

Children:

7cd23d5

Parents:

43ffef1 (diff), b81096f (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:/u/cforall/software/cfa/cfa-cc

Location:

src

Files:

• ResolvExpr/Unify.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (6 diffs)

src/ResolvExpr/Unify.cc

@@ -508 +508 @@
                 handleRefType( inst, other );
                 if ( ! result ) return;
-                // Check that parameters of type unify, if any
+                // Check that parameters of types unify, if any
                 std::list< Expression* > params = inst->get_parameters();
-                if ( ! params.empty() ) {
-                        std::list< TypeDecl* > *baseParams = inst->get_baseParameters();
-                        if ( ! baseParams ) {
+                std::list< Expression* > otherParams = ((RefType*)other)->get_parameters();
+
+                std::list< Expression* >::const_iterator it = params.begin(), jt = otherParams.begin();
+                for ( ; it != params.end() && jt != otherParams.end(); ++it, ++jt ) {
+                        TypeExpr *param = dynamic_cast< TypeExpr* >(*it);
+                        assert(param && "Aggregate parameters should be type expressions");
+                        TypeExpr *otherParam = dynamic_cast< TypeExpr* >(*jt);
+                        assert(otherParam && "Aggregate parameters should be type expressions");
+
+                        if ( ! unifyExact( param->get_type(), otherParam->get_type(), env, needAssertions, haveAssertions, openVars, WidenMode(false, false), indexer ) ) {
                                 result = false;
                                 return;
                         }
-                        std::list< Expression* >::const_iterator it = params.begin();
-                        std::list< TypeDecl* >::const_iterator baseIt = baseParams->begin();
-                        while ( it != params.end() && baseIt != baseParams->end()) {
-                                TypeExpr *param = dynamic_cast< TypeExpr* >(*it);
-                                assert(param && "Aggregate parameters should be type expressions");
-                                TypeInstType baseType(Type::Qualifiers(), (*baseIt)->get_name(), *baseIt);
-                                if ( ! unifyExact( param->get_type(), &baseType, env, needAssertions, haveAssertions, openVars, WidenMode(false, false), indexer ) ) {
-                                        result = false;
-                                        return;
-                                }
-                                
-                                ++it;
-                                ++baseIt;
-                        }
-                        if ( it != params.end() || baseIt != baseParams->end() ) {
-                                result = false;
-                        }
                 }
+                result = ( it == params.end() && jt == otherParams.end() );
         }
 

src/SymTab/Validate.cc

@@ -625 +625 @@
         }
 
+        /// Clones a reference type, replacing any parameters it may have with a clone of the provided list
+        template< typename GenericInstType >
+        GenericInstType *cloneWithParams( GenericInstType *refType, const std::list< Expression* >& params ) {
+                GenericInstType *clone = refType->clone();
+                clone->get_parameters().clear();
+                cloneAll( params, clone->get_parameters() );
+                return clone;
+        }
 
         Declaration *makeStructAssignment( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting ) {
@@ -631 +639 @@
                 // Make function polymorphic in same parameters as generic struct, if applicable
                 std::list< TypeDecl* >& genericParams = aggregateDecl->get_parameters();
+                std::list< Expression* > structParams;  // List of matching parameters to put on types
                 for ( std::list< TypeDecl* >::const_iterator param = genericParams.begin(); param != genericParams.end(); ++param ) {
-                        assignType->get_forall().push_back( (*param)->clone() );
+                        TypeDecl *typeParam = (*param)->clone();
+                        assignType->get_forall().push_back( typeParam );
+                        structParams.push_back( new TypeExpr( new TypeInstType( Type::Qualifiers(), typeParam->get_name(), typeParam ) ) );
                 }
   
-                ObjectDecl *returnVal = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, refType->clone(), 0 );
+                ObjectDecl *returnVal = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, cloneWithParams( refType, structParams ), 0 );
                 assignType->get_returnVals().push_back( returnVal );
   
-                ObjectDecl *dstParam = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), refType->clone() ), 0 );
+                ObjectDecl *dstParam = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), cloneWithParams( refType, structParams ) ), 0 );
                 assignType->get_parameters().push_back( dstParam );
   
-                ObjectDecl *srcParam = new ObjectDecl( "_src", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, refType, 0 );
+                ObjectDecl *srcParam = new ObjectDecl( "_src", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, cloneWithParams( refType, structParams ), 0 );
                 assignType->get_parameters().push_back( srcParam );
 
@@ -677 +688 @@
         Declaration *makeUnionAssignment( UnionDecl *aggregateDecl, UnionInstType *refType, unsigned int functionNesting ) {
                 FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
-  
-                ObjectDecl *returnVal = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, refType->clone(), 0 );
+
+                // Make function polymorphic in same parameters as generic union, if applicable
+                std::list< TypeDecl* >& genericParams = aggregateDecl->get_parameters();
+                std::list< Expression* > unionParams;  // List of matching parameters to put on types
+                for ( std::list< TypeDecl* >::const_iterator param = genericParams.begin(); param != genericParams.end(); ++param ) {
+                        TypeDecl *typeParam = (*param)->clone();
+                        assignType->get_forall().push_back( typeParam );
+                        unionParams.push_back( new TypeExpr( new TypeInstType( Type::Qualifiers(), typeParam->get_name(), typeParam ) ) );
+                }
+  
+                ObjectDecl *returnVal = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, cloneWithParams( refType, unionParams ), 0 );
                 assignType->get_returnVals().push_back( returnVal );
   
-                ObjectDecl *dstParam = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), refType->clone() ), 0 );
+                ObjectDecl *dstParam = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), cloneWithParams( refType, unionParams ) ), 0 );
                 assignType->get_parameters().push_back( dstParam );
   
-                ObjectDecl *srcParam = new ObjectDecl( "_src", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, refType, 0 );
+                ObjectDecl *srcParam = new ObjectDecl( "_src", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, cloneWithParams( refType, unionParams ), 0 );
                 assignType->get_parameters().push_back( srcParam );
   
@@ -695 +715 @@
                 copy->get_args().push_back( new VariableExpr( dstParam ) );
                 copy->get_args().push_back( new AddressExpr( new VariableExpr( srcParam ) ) );
-                copy->get_args().push_back( new SizeofExpr( refType->clone() ) );
+                copy->get_args().push_back( new SizeofExpr( cloneWithParams( refType, unionParams ) ) );
 
                 assignDecl->get_statements()->get_kids().push_back( new ExprStmt( noLabels, copy ) );
@@ -714 +734 @@
         void AutogenerateRoutines::visit( StructDecl *structDecl ) {
                 if ( ! structDecl->get_members().empty() && structsDone.find( structDecl->get_name() ) == structsDone.end() ) {
-                        StructInstType *structInst = new StructInstType( Type::Qualifiers(), structDecl->get_name() );
-                        structInst->set_baseStruct( structDecl );
-                        declsToAdd.push_back( makeStructAssignment( structDecl, structInst, functionNesting ) );
+                        StructInstType structInst( Type::Qualifiers(), structDecl->get_name() );
+                        structInst.set_baseStruct( structDecl );
+                        declsToAdd.push_back( makeStructAssignment( structDecl, &structInst, functionNesting ) );
                         structsDone.insert( structDecl->get_name() );
                 } // if
@@ -723 +743 @@
         void AutogenerateRoutines::visit( UnionDecl *unionDecl ) {
                 if ( ! unionDecl->get_members().empty() ) {
-                        UnionInstType *unionInst = new UnionInstType( Type::Qualifiers(), unionDecl->get_name() );
-                        unionInst->set_baseUnion( unionDecl );
-                        declsToAdd.push_back( makeUnionAssignment( unionDecl, unionInst, functionNesting ) );
+                        UnionInstType unionInst( Type::Qualifiers(), unionDecl->get_name() );
+                        unionInst.set_baseUnion( unionDecl );
+                        declsToAdd.push_back( makeUnionAssignment( unionDecl, &unionInst, functionNesting ) );
                 } // if
         }