Changeset 2514607d for src/SymTab/Validate.cc

Timestamp:

Jul 23, 2018, 6:00:57 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

e68b3a8

Parents:

cbdf565 (diff), c29c342 (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/SymTab/Validate.cc (modified) (3 diffs)

src/SymTab/Validate.cc

@@ -368 +368 @@
                                 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 +390 @@
                                         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 +407 @@
                                         }
                                 } 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;
                                                 }
                                         }