Changeset 031a2c95

Timestamp:

Mar 13, 2017, 2:14:46 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:

8ef9c5e7

Parents:

be8bd88

Message:

Fix to otype T* => void* conversion

File:

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

src/GenPoly/InstantiateGeneric.cc

@@ -237 +237 @@
                                         }
                                         out.push_back( new TypeExpr( voidPtr ) );
+                                        // this type is still dtype-static, no change to gt
                                 } 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;
                                 }
-                                // make the struct concrete or dynamic depending on the parameter
-                                gt |= isPolyType( paramType->get_type() ) ? genericType::dynamic : genericType::concrete;
                         } else switch ( (*baseParam)->get_kind() ) {
                                 case TypeDecl::Dtype: