Changes in src/ResolvExpr/Resolver.cc [1d2b64f:eeaea53]

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 );
                         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
@@ -455 +457 @@
                         }
                 } else if ( UnionInstType * uit = dynamic_cast< UnionInstType * >( inst ) ) {
-                        TypeSubstitution sub = makeGenericSubstitutuion( sit );
+                        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 );