Changeset 90152a4 for src/GenPoly/ScrubTyVars.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

• src/GenPoly/ScrubTyVars.cc (modified) (7 diffs)

src/GenPoly/ScrubTyVars.cc

@@ -25 +25 @@
 
 namespace GenPoly {
-        Type * ScrubTyVars::mutate( TypeInstType *typeInst ) {
+        Type * ScrubTyVars::postmutate( TypeInstType * typeInst ) {
                 if ( ! tyVars ) {
                         if ( typeInst->get_isFtype() ) {
@@ -31 +31 @@
                                 return new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
                         } else {
-                                PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) );
+                                PointerType * ret = new PointerType( Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) );
                                 delete typeInst;
                                 return ret;
@@ -37 +37 @@
                 }
 
-                TyVarMap::const_iterator tyVar = tyVars->find( typeInst->get_name() );
+                TyVarMap::const_iterator tyVar = tyVars->find( typeInst->name );
                 if ( tyVar != tyVars->end() ) {
                         switch ( tyVar->second.kind ) {
@@ -43 +43 @@
                           case TypeDecl::Ttype:
                                 {
-                                        PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) );
+                                        PointerType * ret = new PointerType( Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) );
                                         delete typeInst;
                                         return ret;
@@ -50 +50 @@
                                 delete typeInst;
                                 return new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
+                          default:
+                                assertf(false, "Unhandled tyvar kind: %d", tyVar->second.kind);
                         } // switch
                 } // if
@@ -55 +57 @@
         }
 
-        Type * ScrubTyVars::mutateAggregateType( Type *ty ) {
+        Type * ScrubTyVars::mutateAggregateType( Type * ty ) {
                 if ( shouldScrub( ty ) ) {
-                        PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( ty->get_qualifiers() ) );
+                        PointerType * ret = new PointerType( Type::Qualifiers(), new VoidType( ty->get_qualifiers() ) );
                         delete ty;
                         return ret;
@@ -64 +66 @@
         }
 
-        Type * ScrubTyVars::mutate( StructInstType *structInst ) {
+        Type * ScrubTyVars::postmutate( StructInstType * structInst ) {
                 return mutateAggregateType( structInst );
         }
 
-        Type * ScrubTyVars::mutate( UnionInstType *unionInst ) {
+        Type * ScrubTyVars::postmutate( UnionInstType * unionInst ) {
                 return mutateAggregateType( unionInst );
         }
 
-        Expression * ScrubTyVars::mutate( SizeofExpr *szeof ) {
+        void ScrubTyVars::primeBaseScrub( Type * type ) {
+                // need to determine whether type needs to be scrubbed to determine whether
+                // automatic recursion is necessary
+                if ( Type * t = shouldScrub( type ) ) {
+                        visit_children = false;
+                        GuardValue( dynType );
+                        dynType = t;
+                }
+        }
+
+        Expression * ScrubTyVars::postmutate( SizeofExpr * szeof ) {
                 // sizeof( T ) => _sizeof_T parameter, which is the size of T
-                if ( Type *dynType = shouldScrub( szeof->get_type() ) ) {
+                if ( dynType ) {
                         Expression *expr = new NameExpr( sizeofName( mangleType( dynType ) ) );
                         return expr;
-                } else {
-                        return Mutator::mutate( szeof );
                 } // if
+                return szeof;
         }
 
-        Expression * ScrubTyVars::mutate( AlignofExpr *algnof ) {
+        Expression * ScrubTyVars::postmutate( AlignofExpr * algnof ) {
                 // alignof( T ) => _alignof_T parameter, which is the alignment of T
-                if ( Type *dynType = shouldScrub( algnof->get_type() ) ) {
+                if ( dynType ) {
                         Expression *expr = new NameExpr( alignofName( mangleType( dynType ) ) );
                         return expr;
-                } else {
-                        return Mutator::mutate( algnof );
                 } // if
+                return algnof;
         }
 
-        Type * ScrubTyVars::mutate( PointerType *pointer ) {
-//              // special case of shouldScrub that takes all TypeInstType pointer bases, even if they're not dynamic
-//              Type *base = pointer->get_base();
-//              Type *dynType = 0;
-//              if ( dynamicOnly ) {
-//                      if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( base ) ) {
-//                              if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) { dynType = typeInst; }
-//                      } else {
-//                              dynType = isDynType( base, tyVars );
-//                      }
-//              } else {
-//                      dynType = isPolyType( base, tyVars );
-//              }
-//              if ( dynType ) {
-                if ( Type *dynType = shouldScrub( pointer->get_base() ) ) {
-                        Type *ret = dynType->acceptMutator( *this );
+        Type * ScrubTyVars::postmutate( PointerType * pointer ) {
+                if ( dynType ) {
+                        Type * ret = dynType->acceptMutator( *visitor );
                         ret->get_qualifiers() |= pointer->get_qualifiers();
-                        pointer->set_base( 0 );
+                        pointer->base = nullptr;
                         delete pointer;
                         return ret;
                 }
-                return Mutator::mutate( pointer );
+                return pointer;
         }
 } // namespace GenPoly