Changes in src/SymTab/Validate.cc [95d09bdb:8a3ecb9]

File:

• src/SymTab/Validate.cc (modified) (5 diffs)

src/SymTab/Validate.cc

@@ -85 +85 @@
                 void previsit( AlignofExpr * );
                 void previsit( UntypedOffsetofExpr * );
-                void previsit( CompoundLiteralExpr * );
                 void handleType( Type * );
         };
@@ -351 +350 @@
         }
 
-        void HoistTypeDecls::previsit( CompoundLiteralExpr * expr ) {
-                handleType( expr->result );
-        }
-
 
         Type * FixQualifiedTypes::postmutate( QualifiedType * qualType ) {
@@ -368 +363 @@
                                 auto base = td->base;
                                 assert( base );
-                                return base->clone();
+                                Type * ret = base->clone();
+                                ret->get_qualifiers() = qualType->get_qualifiers();
+                                return ret;
                         } else {
                                 // .T => T is not a type name
@@ -388 +385 @@
                                         if ( StructDecl * aggr = dynamic_cast< StructDecl * >( member ) ) {
                                                 if ( aggr->name == inst->name ) {
+                                                        // TODO: is this case, and other non-TypeInstType cases, necessary?
                                                         return new StructInstType( qualType->get_qualifiers(), aggr );
                                                 }
@@ -404 +402 @@
                                         }
                                 } else if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( child ) ) {
-                                        // struct typedefs are being replaced by forward decls too early; move it to hoist struct
+                                        // name on the right is a typedef
                                         if ( NamedTypeDecl * aggr = dynamic_cast< NamedTypeDecl * > ( member ) ) {
                                                 if ( aggr->name == inst->name ) {
                                                         assert( aggr->base );
-                                                        return aggr->base->clone();
+                                                        Type * ret = aggr->base->clone();
+                                                        ret->get_qualifiers() = qualType->get_qualifiers();
+                                                        return ret;
                                                 }
                                         }