Changeset e61a35e for src/SymTab

Timestamp:

Mar 14, 2017, 4:57:49 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, stuck-waitfor-destruct, with_gc

Children:

572547c, f841241

Parents:

e496303 (diff), 4da6a6c (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 plg2:software/cfa/cfa-cc

Location:

src/SymTab

Files:

• Autogen.h (modified) (1 diff)
• Validate.cc (modified) (1 diff)

src/SymTab/Autogen.h

@@ -58 +58 @@
                         assert( type );
                         Type * castType = type->clone();
-                        castType->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true);
+                        castType->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, false);
                         castType->set_isLvalue( true ); // xxx - might not need this
                         dstParam = new CastExpr( dstParam, new PointerType( Type::Qualifiers(), castType ) );

src/SymTab/Validate.cc

@@ -323 +323 @@
                         ObjectDecl * obj = dynamic_cast< ObjectDecl * >( *i );
                         assert( obj );
-                        obj->set_type( new EnumInstType( Type::Qualifiers( true, false, false, false, false ), enumDecl->get_name() ) );
+                        obj->set_type( new EnumInstType( Type::Qualifiers( true, false, false, false, false, false ), enumDecl->get_name() ) );
                 } // for
                 Parent::visit( enumDecl );