Changeset b8a4f47 for src

Timestamp:

Jan 9, 2018, 5:35:39 PM (6 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:

eb0aedb

Parents:

e9a715d3

Message:

Convert ScrubTyVars? to PassVisitor?

Location:

src/GenPoly

Files:

• ScrubTyVars.cc (modified) (6 diffs)
• ScrubTyVars.h (modified) (6 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;
@@ -55 +55 @@
         }
 
-        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 +64 @@
         }
 
-        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

src/GenPoly/ScrubTyVars.h

@@ -18 +18 @@
 #include <cassert>            // for assert
 
+#include "Common/PassVisitor.h"
 #include "GenPoly.h"          // for TyVarMap, isPolyType, isDynType
 #include "SynTree/Mutator.h"  // for Mutator
@@ -27 +28 @@
 
 namespace GenPoly {
-        class ScrubTyVars : public Mutator {
+        struct ScrubTyVars : public WithVisitorRef<ScrubTyVars>, public WithShortCircuiting, public WithGuards {
                 /// Whether to scrub all type variables from the provided map, dynamic type variables from the provided map, or all type variables
                 enum ScrubMode { FromMap, DynamicFromMap, All };
@@ -51 +52 @@
                 static SynTreeClass *scrubAll( SynTreeClass *target );
 
-                virtual Type* mutate( TypeInstType *typeInst );
-                virtual Type* mutate( StructInstType *structInst );
-                virtual Type* mutate( UnionInstType *unionInst );
-                virtual Expression* mutate( SizeofExpr *szeof );
-                virtual Expression* mutate( AlignofExpr *algnof );
-                virtual Type* mutate( PointerType *pointer );
+                /// determine if children should be visited based on whether base type should be scrubbed.
+                void primeBaseScrub( Type * );
+
+                void premutate( TypeInstType * ) { visit_children = false; }
+                void premutate( StructInstType * ) { visit_children = false; }
+                void premutate( UnionInstType * ) { visit_children = false; }
+                void premutate( SizeofExpr * szeof ) { primeBaseScrub( szeof->type ); }
+                void premutate( AlignofExpr * algnof ) { primeBaseScrub( algnof->type ); }
+                void premutate( PointerType * pointer ) { primeBaseScrub( pointer->base ); }
+
+                Type * postmutate( TypeInstType * typeInst );
+                Type * postmutate( StructInstType * structInst );
+                Type * postmutate( UnionInstType * unionInst );
+                Expression * postmutate( SizeofExpr * szeof );
+                Expression * postmutate( AlignofExpr * algnof );
+                Type * postmutate( PointerType * pointer );
 
           private:
@@ -75 +86 @@
                 const TyVarMap *tyVars;  ///< Type variables to scrub
                 ScrubMode mode;          ///< which type variables to scrub? [FromMap]
+
+                Type * dynType = nullptr; ///< result of shouldScrub
         };
 
         template< typename SynTreeClass >
         SynTreeClass * ScrubTyVars::scrub( SynTreeClass *target, const TyVarMap &tyVars ) {
-                ScrubTyVars scrubber( tyVars );
+                PassVisitor<ScrubTyVars> scrubber( tyVars );
                 return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
         }
@@ -85 +98 @@
         template< typename SynTreeClass >
         SynTreeClass * ScrubTyVars::scrubDynamic( SynTreeClass *target, const TyVarMap &tyVars ) {
-                ScrubTyVars scrubber( tyVars, ScrubTyVars::DynamicFromMap );
+                PassVisitor<ScrubTyVars> scrubber( tyVars, ScrubTyVars::DynamicFromMap );
                 return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
         }
@@ -91 +104 @@
         template< typename SynTreeClass >
         SynTreeClass * ScrubTyVars::scrubAll( SynTreeClass *target ) {
-                ScrubTyVars scrubber;
+                PassVisitor<ScrubTyVars> scrubber;
                 return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
         }