Changeset 1fbab5a for src/GenPoly/ScrubTyVars.h

Timestamp:

Mar 16, 2017, 4:50:08 PM (7 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:

395fc37, 64ac636, ef42b143

Parents:

2f26687a (diff), d6d747d (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

File:

• src/GenPoly/ScrubTyVars.h (modified) (5 diffs)

src/GenPoly/ScrubTyVars.h

@@ -26 +26 @@
 namespace GenPoly {
         class ScrubTyVars : public Mutator {
-          public:
-                ScrubTyVars( const TyVarMap &tyVars, bool dynamicOnly = false ): tyVars( tyVars ), dynamicOnly( dynamicOnly ) {}
+                /// 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 };
 
+                ScrubTyVars() : tyVars(nullptr), mode( All ) {}
+
+                ScrubTyVars( const TyVarMap &tyVars, ScrubMode mode = FromMap ): tyVars( &tyVars ), mode( mode ) {}
+
+        public:
                 /// For all polymorphic types with type variables in `tyVars`, replaces generic types, dtypes, and ftypes with the appropriate void type,
                 /// and sizeof/alignof expressions with the proper variable
@@ -38 +43 @@
                 template< typename SynTreeClass >
                 static SynTreeClass *scrubDynamic( SynTreeClass *target, const TyVarMap &tyVars );
+
+                /// For all polymorphic types, replaces generic types, dtypes, and ftypes with the appropriate void type,
+                /// and sizeof/alignof expressions with the proper variable
+                template< typename SynTreeClass >
+                static SynTreeClass *scrubAll( SynTreeClass *target );
 
                 virtual Type* mutate( TypeInstType *typeInst );
@@ -49 +59 @@
                 /// Returns the type if it should be scrubbed, NULL otherwise.
                 Type* shouldScrub( Type *ty ) {
-                        return dynamicOnly ? isDynType( ty, tyVars ) : isPolyType( ty, tyVars );
-//                      if ( ! dynamicOnly ) return isPolyType( ty, tyVars );
-// 
-//                      if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( ty ) ) {
-//                              return tyVars.find( typeInst->get_name() ) != tyVars.end() ? ty : 0;
-//                      }
-// 
-//                      return isDynType( ty, tyVars );
+                        switch ( mode ) {
+                        case FromMap: return isPolyType( ty, *tyVars );
+                        case DynamicFromMap: return isDynType( ty, *tyVars );
+                        case All: return isPolyType( ty );
+                        }
+                        assert(false); return nullptr; // unreachable
+                        // return dynamicOnly ? isDynType( ty, tyVars ) : isPolyType( ty, tyVars );
                 }
                 
@@ -62 +71 @@
                 Type* mutateAggregateType( Type *ty );
                 
-                const TyVarMap &tyVars;  ///< Type variables to scrub
-                bool dynamicOnly;        ///< only scrub the types with dynamic layout? [false]
+                const TyVarMap *tyVars;  ///< Type variables to scrub
+                ScrubMode mode;          ///< which type variables to scrub? [FromMap]
         };
 
@@ -74 +83 @@
         template< typename SynTreeClass >
         SynTreeClass * ScrubTyVars::scrubDynamic( SynTreeClass *target, const TyVarMap &tyVars ) {
-                ScrubTyVars scrubber( tyVars, true );
+                ScrubTyVars scrubber( tyVars, ScrubTyVars::DynamicFromMap );
+                return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
+        }
+
+        template< typename SynTreeClass >
+        SynTreeClass * ScrubTyVars::scrubAll( SynTreeClass *target ) {
+                ScrubTyVars scrubber;
                 return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
         }