Changeset 63afee0

Timestamp:

Nov 20, 2015, 10:32:05 AM (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:

66a2a61

Parents:

f066321 (diff), 258eb5c9 (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 /u/cforall/software/cfa/cfa-cc

Location:

src

Files:

• GenPoly/InstantiateGeneric.cc (added)
• GenPoly/InstantiateGeneric.h (added)
• GenPoly/module.mk (modified) (1 diff)
• Makefile.in (modified) (6 diffs)
• Parser/TypeData.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (1 diff)
• SynTree/ReferenceToType.cc (modified) (2 diffs)
• SynTree/Type.h (modified) (2 diffs)
• SynTree/TypeSubstitution.cc (modified) (3 diffs)
• SynTree/TypeSubstitution.h (modified) (1 diff)
• main.cc (modified) (2 diffs)

src/GenPoly/module.mk

@@ -22 +22 @@
        GenPoly/Specialize.cc \
        GenPoly/CopyParams.cc \
-       GenPoly/FindFunction.cc
+       GenPoly/FindFunction.cc \
+       GenPoly/InstantiateGeneric.cc

src/Makefile.in

@@ -121 +121 @@
         GenPoly/cfa_cpp-CopyParams.$(OBJEXT) \
         GenPoly/cfa_cpp-FindFunction.$(OBJEXT) \
+        GenPoly/cfa_cpp-InstantiateGeneric.$(OBJEXT) \
         InitTweak/cfa_cpp-InitModel.$(OBJEXT) \
         InitTweak/cfa_cpp-InitExpander.$(OBJEXT) \
@@ -347 +348 @@
         GenPoly/ScrubTyVars.cc GenPoly/Lvalue.cc GenPoly/Specialize.cc \
         GenPoly/CopyParams.cc GenPoly/FindFunction.cc \
-        InitTweak/InitModel.cc InitTweak/InitExpander.cc \
-        InitTweak/Mutate.cc InitTweak/Association.cc \
-        InitTweak/RemoveInit.cc Parser/parser.yy Parser/lex.ll \
-        Parser/TypedefTable.cc Parser/ParseNode.cc \
-        Parser/DeclarationNode.cc Parser/ExpressionNode.cc \
-        Parser/StatementNode.cc Parser/InitializerNode.cc \
-        Parser/TypeData.cc Parser/LinkageSpec.cc \
-        Parser/parseutility.cc Parser/Parser.cc \
+        GenPoly/InstantiateGeneric.cc InitTweak/InitModel.cc \
+        InitTweak/InitExpander.cc InitTweak/Mutate.cc \
+        InitTweak/Association.cc InitTweak/RemoveInit.cc \
+        Parser/parser.yy Parser/lex.ll Parser/TypedefTable.cc \
+        Parser/ParseNode.cc Parser/DeclarationNode.cc \
+        Parser/ExpressionNode.cc Parser/StatementNode.cc \
+        Parser/InitializerNode.cc Parser/TypeData.cc \
+        Parser/LinkageSpec.cc Parser/parseutility.cc Parser/Parser.cc \
         ResolvExpr/AlternativeFinder.cc ResolvExpr/Alternative.cc \
         ResolvExpr/Unify.cc ResolvExpr/PtrsAssignable.cc \
@@ -553 +554 @@
         GenPoly/$(DEPDIR)/$(am__dirstamp)
 GenPoly/cfa_cpp-FindFunction.$(OBJEXT): GenPoly/$(am__dirstamp) \
+        GenPoly/$(DEPDIR)/$(am__dirstamp)
+GenPoly/cfa_cpp-InstantiateGeneric.$(OBJEXT): GenPoly/$(am__dirstamp) \
         GenPoly/$(DEPDIR)/$(am__dirstamp)
 InitTweak/$(am__dirstamp):
@@ -784 +787 @@
         -rm -f GenPoly/cfa_cpp-FindFunction.$(OBJEXT)
         -rm -f GenPoly/cfa_cpp-GenPoly.$(OBJEXT)
+        -rm -f GenPoly/cfa_cpp-InstantiateGeneric.$(OBJEXT)
         -rm -f GenPoly/cfa_cpp-Lvalue.$(OBJEXT)
         -rm -f GenPoly/cfa_cpp-PolyMutator.$(OBJEXT)
@@ -893 +897 @@
 @AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/cfa_cpp-FindFunction.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/cfa_cpp-GenPoly.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/cfa_cpp-InstantiateGeneric.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/cfa_cpp-Lvalue.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/cfa_cpp-PolyMutator.Po@am__quote@
@@ -1357 +1362 @@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o GenPoly/cfa_cpp-FindFunction.obj `if test -f 'GenPoly/FindFunction.cc'; then $(CYGPATH_W) 'GenPoly/FindFunction.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/FindFunction.cc'; fi`
 
+GenPoly/cfa_cpp-InstantiateGeneric.o: GenPoly/InstantiateGeneric.cc
+@am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/cfa_cpp-InstantiateGeneric.o -MD -MP -MF GenPoly/$(DEPDIR)/cfa_cpp-InstantiateGeneric.Tpo -c -o GenPoly/cfa_cpp-InstantiateGeneric.o `test -f 'GenPoly/InstantiateGeneric.cc' || echo '$(srcdir)/'`GenPoly/InstantiateGeneric.cc
+@am__fastdepCXX_TRUE@   $(am__mv) GenPoly/$(DEPDIR)/cfa_cpp-InstantiateGeneric.Tpo GenPoly/$(DEPDIR)/cfa_cpp-InstantiateGeneric.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='GenPoly/InstantiateGeneric.cc' object='GenPoly/cfa_cpp-InstantiateGeneric.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o GenPoly/cfa_cpp-InstantiateGeneric.o `test -f 'GenPoly/InstantiateGeneric.cc' || echo '$(srcdir)/'`GenPoly/InstantiateGeneric.cc
+
+GenPoly/cfa_cpp-InstantiateGeneric.obj: GenPoly/InstantiateGeneric.cc
+@am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/cfa_cpp-InstantiateGeneric.obj -MD -MP -MF GenPoly/$(DEPDIR)/cfa_cpp-InstantiateGeneric.Tpo -c -o GenPoly/cfa_cpp-InstantiateGeneric.obj `if test -f 'GenPoly/InstantiateGeneric.cc'; then $(CYGPATH_W) 'GenPoly/InstantiateGeneric.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/InstantiateGeneric.cc'; fi`
+@am__fastdepCXX_TRUE@   $(am__mv) GenPoly/$(DEPDIR)/cfa_cpp-InstantiateGeneric.Tpo GenPoly/$(DEPDIR)/cfa_cpp-InstantiateGeneric.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='GenPoly/InstantiateGeneric.cc' object='GenPoly/cfa_cpp-InstantiateGeneric.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o GenPoly/cfa_cpp-InstantiateGeneric.obj `if test -f 'GenPoly/InstantiateGeneric.cc'; then $(CYGPATH_W) 'GenPoly/InstantiateGeneric.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/InstantiateGeneric.cc'; fi`
+
 InitTweak/cfa_cpp-InitModel.o: InitTweak/InitModel.cc
 @am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT InitTweak/cfa_cpp-InitModel.o -MD -MP -MF InitTweak/$(DEPDIR)/cfa_cpp-InitModel.Tpo -c -o InitTweak/cfa_cpp-InitModel.o `test -f 'InitTweak/InitModel.cc' || echo '$(srcdir)/'`InitTweak/InitModel.cc

src/Parser/TypeData.cc

@@ -799 +799 @@
           case DeclarationNode::Struct:
                 at = new StructDecl( aggregate->name );
+                buildForall( aggregate->params, at->get_parameters() );
                 break;
           case DeclarationNode::Union:
                 at = new UnionDecl( aggregate->name );
+                buildForall( aggregate->params, at->get_parameters() );
                 break;
           case DeclarationNode::Context:
                 at = new ContextDecl( aggregate->name );
+                buildList( aggregate->params, at->get_parameters() );
                 break;
           default:
                 assert( false );
         } // switch
-        buildList( aggregate->params, at->get_parameters() );
+//      buildList( aggregate->params, at->get_parameters() );
         buildList( aggregate->fields, at->get_members() );
 

src/SymTab/Validate.cc

@@ -628 +628 @@
         Declaration *makeStructAssignment( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting ) {
                 FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
+
+                // Make function polymorphic in same parameters as generic struct, if applicable
+                std::list< TypeDecl* >& genericParams = aggregateDecl->get_parameters();
+                for ( std::list< TypeDecl* >::const_iterator param = genericParams.begin(); param != genericParams.end(); ++param ) {
+                        assignType->get_forall().push_back( (*param)->clone() );
+                }
   
                 ObjectDecl *returnVal = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, refType->clone(), 0 );

src/SynTree/ReferenceToType.cc

@@ -59 +59 @@
 std::string StructInstType::typeString() const { return "struct"; }
 
+std::list<TypeDecl*>& StructInstType::get_baseParameters() { return baseStruct->get_parameters(); }
+
 void StructInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
         assert( baseStruct );
@@ -65 +67 @@
 
 std::string UnionInstType::typeString() const { return "union"; }
+
+std::list<TypeDecl*>& UnionInstType::get_baseParameters() { return baseUnion->get_parameters(); }
 
 void UnionInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {

src/SynTree/Type.h

@@ -237 +237 @@
         StructDecl *get_baseStruct() const { return baseStruct; }
         void set_baseStruct( StructDecl *newValue ) { baseStruct = newValue; }
-        
-        // a utility function
+
+        /// Accesses generic parameters of base struct
+        std::list<TypeDecl*>& get_baseParameters();
+        
+        /// Looks up the members of this struct named "name" and places them into "foundDecls".
+        /// Clones declarations into "foundDecls", caller responsible for freeing
         void lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const;
 
@@ -260 +264 @@
         UnionDecl *get_baseUnion() const { return baseUnion; }
         void set_baseUnion( UnionDecl *newValue ) { baseUnion = newValue; }
-        
-        // a utility function
+
+        /// Accesses generic parameters of base union
+        std::list<TypeDecl*>& get_baseParameters();
+        
+        /// looks up the members of this union named "name" and places them into "foundDecls"
+        /// Clones declarations into "foundDecls", caller responsible for freeing
         void lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const;
 

src/SynTree/TypeSubstitution.cc

@@ -126 +126 @@
 Type *TypeSubstitution::handleType( TypeClass *type ) {
         BoundVarsType oldBoundVars( boundVars );
+        // bind type variables from forall-qualifiers
         if ( freeOnly ) {
                 for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
@@ -136 +137 @@
 }
 
+template< typename TypeClass >
+Type *TypeSubstitution::handleAggregateType( TypeClass *type ) {
+        BoundVarsType oldBoundVars( boundVars );
+        // bind type variables from forall-qualifiers
+        if ( freeOnly ) {
+                for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+                        boundVars.insert( (*tyvar )->get_name() );
+                } // for
+        } // if
+        // bind type variables from generic type instantiations
+        for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_baseParameters().begin(); tyvar != type->get_baseParameters().end(); ++tyvar ) {
+                boundVars.insert( (*tyvar)->get_name() );
+        } // for
+        Type *ret = Mutator::mutate( type );
+        boundVars = oldBoundVars;
+        return ret;
+}
+
 Type * TypeSubstitution::mutate( VoidType *basicType ) {
         return handleType( basicType );
@@ -157 +176 @@
 
 Type * TypeSubstitution::mutate( StructInstType *aggregateUseType ) {
-        return handleType( aggregateUseType );
+        return handleAggregateType( aggregateUseType );
 }
 
 Type * TypeSubstitution::mutate( UnionInstType *aggregateUseType ) {
-        return handleType( aggregateUseType );
+        return handleAggregateType( aggregateUseType );
 }
 

src/SynTree/TypeSubstitution.h

@@ -58 +58 @@
         virtual Type* mutate(TypeInstType *aggregateUseType);
         virtual Expression* mutate(NameExpr *nameExpr);
-        
+
+        /// Records type variable bindings from forall-statements
         template< typename TypeClass > Type *handleType( TypeClass *type );
+        /// Records type variable bindings from forall-statements and instantiations of generic types
+        template< typename TypeClass > Type *handleAggregateType( TypeClass *type );
         
         virtual Type* mutate(VoidType *basicType);

src/main.cc

@@ -24 +24 @@
 #include "SynTree/Declaration.h"
 #include "SynTree/Visitor.h"
+#include "GenPoly/InstantiateGeneric.h"
 #include "GenPoly/Lvalue.h"
 #include "GenPoly/Specialize.h"
@@ -268 +269 @@
                 }
 
+                OPTPRINT( "instantiateGeneric" )
+                GenPoly::instantiateGeneric( translationUnit );
                 OPTPRINT( "copyParams" );
                 GenPoly::copyParams( translationUnit );