Changeset 66f8528 for src/ResolvExpr/Resolver.cc

Timestamp:

Dec 15, 2016, 5:16:42 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

43385ca, f7ff3fb

Parents:

5802a4f (diff), 596f987b (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' into tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

File:

• src/ResolvExpr/Resolver.cc (modified) (3 diffs)

src/ResolvExpr/Resolver.cc

@@ -404 +404 @@
         template< typename AggrInst >
         TypeSubstitution makeGenericSubstitutuion( AggrInst * inst ) {
+                assert( inst );
+                assert( inst->get_baseParameters() );
                 std::list< TypeDecl * > baseParams = *inst->get_baseParameters();
                 std::list< Expression * > typeSubs = inst->get_parameters();
@@ -444 +446 @@
 
         void Resolver::resolveAggrInit( ReferenceToType * inst, InitIterator & init, InitIterator & initEnd ) {
-
                 if ( StructInstType * sit = dynamic_cast< StructInstType * >( inst ) ) {
                         TypeSubstitution sub = makeGenericSubstitutuion( sit );
@@ -455 +456 @@
                         }
                 } else if ( UnionInstType * uit = dynamic_cast< UnionInstType * >( inst ) ) {
-                        TypeSubstitution sub = makeGenericSubstitutuion( sit );
+                        TypeSubstitution sub = makeGenericSubstitutuion( uit );
                         UnionDecl * un = uit->get_baseUnion();
                         // only resolve to the first member of a union