Changeset 7527e63 for src/GenPoly/ScrubTyVars.h

Timestamp:

Aug 16, 2016, 3:20:06 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1f6d4624

Parents:

950f7a7 (diff), 7880579 (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:software/cfa/cfa-cc

File:

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

src/GenPoly/ScrubTyVars.h

@@ -27 +27 @@
         class ScrubTyVars : public Mutator {
           public:
-                ScrubTyVars( const TyVarMap &tyVars ): tyVars( tyVars ) {}
+                ScrubTyVars( const TyVarMap &tyVars, bool dynamicOnly = false ): tyVars( tyVars ), dynamicOnly( dynamicOnly ) {}
 
                 /// For all polymorphic types with type variables in `tyVars`, replaces generic types, dtypes, and ftypes with the appropriate void type,
@@ -33 +33 @@
                 template< typename SynTreeClass >
                 static SynTreeClass *scrub( SynTreeClass *target, const TyVarMap &tyVars );
+
+                /// For all dynamic-layout 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
+                template< typename SynTreeClass >
+                static SynTreeClass *scrubDynamic( SynTreeClass *target, const TyVarMap &tyVars );
 
                 virtual Type* mutate( TypeInstType *typeInst );
@@ -42 +47 @@
 
           private:
+                /// 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 );
+                }
+                
                 /// Mutates (possibly generic) aggregate types appropriately
                 Type* mutateAggregateType( Type *ty );
                 
-                const TyVarMap &tyVars;
+                const TyVarMap &tyVars;  ///< Type variables to scrub
+                bool dynamicOnly;        ///< only scrub the types with dynamic layout? [false]
         };
 
-        /* static class method */
         template< typename SynTreeClass >
         SynTreeClass * ScrubTyVars::scrub( SynTreeClass *target, const TyVarMap &tyVars ) {
                 ScrubTyVars scrubber( tyVars );
+                return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
+        }
+
+        template< typename SynTreeClass >
+        SynTreeClass * ScrubTyVars::scrubDynamic( SynTreeClass *target, const TyVarMap &tyVars ) {
+                ScrubTyVars scrubber( tyVars, true );
                 return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
         }