Changeset ea23d10 for src/SymTab

Timestamp:

Feb 8, 2017, 2:35:08 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, with_gc

Children:

e994912, f923b5f

Parents:

424931d (diff), 4fbdd1e3 (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

Location:

src/SymTab

Files:

• Mangler.cc (modified) (1 diff)
• Validate.cc (modified) (1 diff)

src/SymTab/Mangler.cc

@@ -172 +172 @@
                         for ( std::list< Expression* >::const_iterator param = params.begin(); param != params.end(); ++param ) {
                                 TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
-                                assert(paramType && "Aggregate parameters should be type expressions");
+                                assertf(paramType, "Aggregate parameters should be type expressions: %s", toString(*param).c_str());
                                 maybeAccept( paramType->get_type(), *this );
                         }

src/SymTab/Validate.cc

@@ -696 +696 @@
                         FunctionDecl * newDecl = new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, ret->get_isInline(), ret->get_isNoreturn(), objDecl->get_attributes() );
                         objDecl->get_attributes().clear();
+                        objDecl->set_type( nullptr );
                         delete objDecl;
                         return newDecl;