Changeset 7a560c1 for src/ResolvExpr/Resolver.cc

Timestamp:

Feb 2, 2017, 4:06:26 PM (7 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:

6215a5c, 7d6639d

Parents:

fa2de95 (diff), 99b75cab (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/ResolvExpr/Resolver.cc (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -449 +449 @@
                         TypeSubstitution sub = makeGenericSubstitutuion( sit );
                         StructDecl * st = sit->get_baseStruct();
+                        if(st->get_members().empty()) return;
                         // want to resolve each initializer to the members of the struct,
                         // but if there are more initializers than members we should stop
@@ -458 +459 @@
                         TypeSubstitution sub = makeGenericSubstitutuion( uit );
                         UnionDecl * un = uit->get_baseUnion();
+                        if(un->get_members().empty()) return;
                         // only resolve to the first member of a union
                         resolveSingleAggrInit( *un->get_members().begin(), init, initEnd, sub );