Changeset 2c57025 for src/GenPoly

Timestamp:

Nov 25, 2016, 6:11:03 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

0f35657

Parents:

186fd86

Message:

add support for built-in sized trait which decouples size/alignment information from otype parameters, add test for sized trait

Location:

src/GenPoly

Files:

• Box.cc (modified) (11 diffs)
• GenPoly.cc (modified) (3 diffs)
• GenPoly.h (modified) (2 diffs)
• InstantiateGeneric.cc (modified) (2 diffs)
• PolyMutator.cc (modified) (1 diff)
• ScrubTyVars.cc (modified) (3 diffs)

src/GenPoly/Box.cc

@@ -275 +275 @@
 
                 for ( std::list< TypeDecl* >::const_iterator decl = decls.begin(); decl != decls.end(); ++decl ) {
-                        if ( (*decl)->get_kind() == TypeDecl::Any ) {
+                        if ( (*decl)->isComplete() ) {
                                 otypeDecls.push_back( *decl );
                         }
@@ -719 +719 @@
 
                 TypeDecl *Pass1::mutate( TypeDecl *typeDecl ) {
-                        scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
+                        addToTyVarMap( typeDecl, scopeTyVars );
                         return Mutator::mutate( typeDecl );
                 }
@@ -774 +774 @@
                                 ResolvExpr::EqvClass eqvClass;
                                 assert( env );
-                                if ( tyParm->second == TypeDecl::Any ) {
+                                if ( tyParm->second.isComplete ) {
                                         Type *concrete = env->lookup( tyParm->first );
                                         if ( concrete ) {
@@ -1278 +1278 @@
                         std::list< Expression *>::iterator paramBegin = appExpr->get_args().begin();
 
-                        TyVarMap exprTyVars( (TypeDecl::Kind)-1 );
+                        TyVarMap exprTyVars( TypeDecl::Data{} );
                         makeTyVarMap( function, exprTyVars );
                         ReferenceToType *dynRetType = isDynRet( function, exprTyVars );
@@ -1428 +1428 @@
 
                                                 // skip non-otype parameters (ftype/dtype)
+                                                // xxx - should this check whether the type is complete instead?
                                                 if ( (*forallIt)->get_kind() != TypeDecl::Any ) continue;
 
@@ -1553 +1554 @@
 
                 TypeDecl * Pass2::mutate( TypeDecl *typeDecl ) {
-                        scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
+                        addToTyVarMap( typeDecl, scopeTyVars );
                         if ( typeDecl->get_base() ) {
                                 return handleDecl( typeDecl, typeDecl->get_base() );
@@ -1597 +1598 @@
                                 ObjectDecl *sizeParm, *alignParm;
                                 // add all size and alignment parameters to parameter list
-                                if ( (*tyParm)->get_kind() == TypeDecl::Any ) {
+                                if ( (*tyParm)->isComplete() ) {
                                         TypeInstType parmType( Type::Qualifiers(), (*tyParm)->get_name(), *tyParm );
                                         std::string parmName = mangleType( &parmType );
@@ -1706 +1707 @@
 
                 TypeDecl * PolyGenericCalculator::mutate( TypeDecl *typeDecl ) {
-                        scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
+                        addToTyVarMap( typeDecl, scopeTyVars );
                         return Parent::mutate( typeDecl );
                 }
@@ -1870 +1871 @@
                         for ( ; baseParam != baseParams.end() && typeParam != typeParams.end(); ++baseParam, ++typeParam ) {
                                 // skip non-otype parameters
-                                if ( (*baseParam)->get_kind() != TypeDecl::Any ) continue;
+                                if ( ! (*baseParam)->isComplete() ) continue;
                                 TypeExpr *typeExpr = dynamic_cast< TypeExpr* >( *typeParam );
                                 assert( typeExpr && "all otype parameters should be type expressions" );
@@ -2082 +2083 @@
 //   Initializer *init = 0;
 //   std::list< Expression *> designators;
-//   scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
+//   addToTyVarMap( typeDecl, scopeTyVars );
 //   if ( typeDecl->get_base() ) {
 //     init = new SimpleInit( new SizeofExpr( handleDecl( typeDecl, typeDecl->get_base() ) ), designators );
@@ -2088 +2089 @@
 //   return new ObjectDecl( typeDecl->get_name(), Declaration::Extern, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::UnsignedInt ), init );
 
-                        scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
+                        addToTyVarMap( typeDecl, scopeTyVars );
                         return Mutator::mutate( typeDecl );
                 }

src/GenPoly/GenPoly.cc

@@ -97 +97 @@
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
                         auto var = tyVars.find( typeInst->get_name() );
-                        if ( var != tyVars.end() && var->second == TypeDecl::Any ) {
+                        if ( var != tyVars.end() && var->second.isComplete ) {
                                 return typeInst;
                         }
@@ -117 +117 @@
                 if ( function->get_returnVals().empty() ) return 0;
 
-                TyVarMap forallTypes( (TypeDecl::Kind)-1 );
+                TyVarMap forallTypes( TypeDecl::Data{} );
                 makeTyVarMap( function, forallTypes );
                 return (ReferenceToType*)isDynType( function->get_returnVals().front()->get_type(), forallTypes );
@@ -227 +227 @@
         }
 
+        void addToTyVarMap( TypeDecl * tyVar, TyVarMap &tyVarMap ) {
+                tyVarMap[ tyVar->get_name() ] = TypeDecl::Data{ tyVar };
+        }
+
         void makeTyVarMap( Type *type, TyVarMap &tyVarMap ) {
                 for ( Type::ForallList::const_iterator tyVar = type->get_forall().begin(); tyVar != type->get_forall().end(); ++tyVar ) {
                         assert( *tyVar );
-                        tyVarMap[ (*tyVar)->get_name() ] = (*tyVar)->get_kind();
+                        addToTyVarMap( *tyVar, tyVarMap );
                 }
                 if ( PointerType *pointer = dynamic_cast< PointerType* >( type ) ) {

src/GenPoly/GenPoly.h

@@ -30 +30 @@
 
 namespace GenPoly {
-        typedef ErasableScopedMap< std::string, TypeDecl::Kind > TyVarMap;
+        typedef ErasableScopedMap< std::string, TypeDecl::Data > TyVarMap;
 
         /// Replaces a TypeInstType by its referrent in the environment, if applicable
@@ -74 +74 @@
         VariableExpr *getBaseVar( Expression *expr, int *levels = 0 );
 
+        /// Adds the type variable `tyVar` to `tyVarMap`
+        void addToTyVarMap( TypeDecl * tyVar, TyVarMap &tyVarMap );
+
         /// Adds the declarations in the forall list of type (and its pointed-to type if it's a pointer type) to `tyVarMap`
         void makeTyVarMap( Type *type, TyVarMap &tyVarMap );

src/GenPoly/InstantiateGeneric.cc

@@ -284 +284 @@
                                 // set concDecl to new type, insert type declaration into statements to add
                                 concDecl = new StructDecl( typeNamer.newName( inst->get_name() ) );
+                                concDecl->set_body( inst->get_baseStruct()->has_body() );
                                 substituteMembers( inst->get_baseStruct()->get_members(), *inst->get_baseParameters(), typeSubs,        concDecl->get_members() );
                                 DeclMutator::addDeclaration( concDecl );
@@ -337 +338 @@
                                 // set concDecl to new type, insert type declaration into statements to add
                                 concDecl = new UnionDecl( typeNamer.newName( inst->get_name() ) );
+                                concDecl->set_body( inst->get_baseUnion()->has_body() );
                                 substituteMembers( inst->get_baseUnion()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
                                 DeclMutator::addDeclaration( concDecl );

src/GenPoly/PolyMutator.cc

@@ -23 +23 @@
 
 namespace GenPoly {
-        namespace {
-                const std::list<Label> noLabels;
-        }
-
-        PolyMutator::PolyMutator() : scopeTyVars( (TypeDecl::Kind)-1 ), env( 0 ) {}
+        PolyMutator::PolyMutator() : scopeTyVars( TypeDecl::Data{} ), env( 0 ) {}
 
         void PolyMutator::mutateStatementList( std::list< Statement* > &statements ) {

src/GenPoly/ScrubTyVars.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ScrubTyVars.cc -- 
+// ScrubTyVars.cc --
 //
 // Author           : Richard C. Bilson
@@ -28 +28 @@
                 TyVarMap::const_iterator tyVar = tyVars.find( typeInst->get_name() );
                 if ( tyVar != tyVars.end() ) {
-                        switch ( tyVar->second ) {
+                        switch ( tyVar->second.kind ) {
                           case TypeDecl::Any:
                           case TypeDecl::Dtype:
@@ -52 +52 @@
                 return ty;
         }
-        
+
         Type * ScrubTyVars::mutate( StructInstType *structInst ) {
                 return mutateAggregateType( structInst );