Changeset 87c3bef for src

Timestamp:

Mar 8, 2017, 3:21:15 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:

be8bd88

Parents:

69d8a9a

Message:

Fix bug with generated structs for pointer-to-polymorphic types

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (1 diff)

src/GenPoly/InstantiateGeneric.cc

@@ -226 +226 @@
 
                         if ( (*baseParam)->isComplete() ) {
-                                // substitute parameter for complete (otype or sized dtype) type; makes the struct concrete or dynamic depending on the parameter
-                                out.push_back( paramType->clone() );
+                                // substitute parameter for complete (otype or sized dtype) type
+                                int pointerLevels = 0;
+                                if ( hasPolyBase( paramType->get_type(), &pointerLevels ) && pointerLevels > 0 ) {
+                                        // Make a void* with equivalent nesting
+                                        Type* voidPtr = new VoidType( Type::Qualifiers() );
+                                        while ( pointerLevels > 0 ) {
+                                                // Just about data layout, so qualifiers *shouldn't* matter
+                                                voidPtr = new PointerType( Type::Qualifiers(), voidPtr );
+                                                --pointerLevels;
+                                        }
+                                        out.push_back( new TypeExpr( voidPtr ) );
+                                } else {
+                                        // Just clone parameter type
+                                        out.push_back( paramType->clone() );
+                                }
+                                // make the struct concrete or dynamic depending on the parameter
                                 gt |= isPolyType( paramType->get_type() ) ? genericType::dynamic : genericType::concrete;
                         } else switch ( (*baseParam)->get_kind() ) {