Changes in src/GenPoly/ScrubTyVars.cc [3bb195cb:adc6781]

File:

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

src/GenPoly/ScrubTyVars.cc

@@ -45 +45 @@
 
         Type * ScrubTyVars::mutateAggregateType( Type *ty ) {
-                if ( shouldScrub( ty ) ) {
+                if ( isPolyType( ty, tyVars ) ) {
                         PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( ty->get_qualifiers() ) );
                         delete ty;
@@ -63 +63 @@
         Expression * ScrubTyVars::mutate( SizeofExpr *szeof ) {
                 // sizeof( T ) => _sizeof_T parameter, which is the size of T
-                if ( Type *dynType = shouldScrub( szeof->get_type() ) ) {
-                        Expression *expr = new NameExpr( sizeofName( mangleType( dynType ) ) );
+                if ( Type *polyType = isPolyType( szeof->get_type() ) ) {
+                        Expression *expr = new NameExpr( sizeofName( mangleType( polyType ) ) );
                         return expr;
                 } else {
@@ -73 +73 @@
         Expression * ScrubTyVars::mutate( AlignofExpr *algnof ) {
                 // alignof( T ) => _alignof_T parameter, which is the alignment of T
-                if ( Type *dynType = shouldScrub( algnof->get_type() ) ) {
-                        Expression *expr = new NameExpr( alignofName( mangleType( dynType ) ) );
+                if ( Type *polyType = isPolyType( algnof->get_type() ) ) {
+                        Expression *expr = new NameExpr( alignofName( mangleType( polyType ) ) );
                         return expr;
                 } else {
@@ -82 +82 @@
 
         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 );
+                if ( Type *polyType = isPolyType( pointer->get_base(), tyVars ) ) {
+                        Type *ret = polyType->acceptMutator( *this );
                         ret->get_qualifiers() += pointer->get_qualifiers();
                         pointer->set_base( 0 );