Changeset 2ed94a9 for src/GenPoly/ScrubTyVars.cc

Timestamp:

Feb 8, 2023, 2:27:55 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

b110bcc

Parents:

997185e (diff), ccb29b4 (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.cc (modified) (1 diff)

src/GenPoly/ScrubTyVars.cc

@@ -178 +178 @@
 
 ast::Type const * ScrubTypeVars::postvisit( ast::TypeInstType const * type ) {
+        ast::TypeDecl::Kind kind;
         // This implies that mode == ScrubMode::All.
         if ( !typeVars ) {
-                if ( ast::TypeDecl::Ftype == type->kind ) {
-                        return new ast::PointerType(
-                                new ast::FunctionType( ast::FixedArgs ) );
-                } else {
-                        return new ast::PointerType(
-                                new ast::VoidType( type->qualifiers ) );
-                }
-        }
-
-        auto typeVar = typeVars->find( *type );
-        if ( typeVar == typeVars->end() ) {
-                return type;
-        }
-
-        switch ( typeVar->second.kind ) {
-        case ::TypeDecl::Dtype:
-        case ::TypeDecl::Ttype:
+                kind = type->kind;
+        } else {
+                // Otherwise, only scrub the type var if it is in map.
+                auto typeVar = typeVars->find( *type );
+                if ( typeVar == typeVars->end() ) {
+                        return type;
+                }
+                kind = typeVar->second.kind;
+        }
+
+        switch ( kind ) {
+        case ast::TypeDecl::Dtype:
+        case ast::TypeDecl::Ttype:
                 return new ast::PointerType(
                         new ast::VoidType( type->qualifiers ) );
-        case ::TypeDecl::Ftype:
+        case ast::TypeDecl::Ftype:
                 return new ast::PointerType(
                         new ast::FunctionType( ast::VariableArgs ) );
         default:
-                assertf( false,
-                        "Unhandled type variable kind: %d", typeVar->second.kind );
+                assertf( false, "Unhandled type variable kind: %d", kind );
                 throw; // Just in case the assert is removed, stop here.
         }