Changes in src/GenPoly/InstantiateGenericNew.cpp [04db9f6:251ce80]

File:

• src/GenPoly/InstantiateGenericNew.cpp (modified) (4 diffs)

src/GenPoly/InstantiateGenericNew.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// InstantiateGenericNew.cpp -- Create concrete instances of generic types.
+// InstantiateGenericNew.cpp --
 //
 // Author           : Andrew Beach
@@ -335 +335 @@
 ast::Expr const * FixDtypeStatic::postvisit( ast::MemberExpr const * expr ) {
         ast::ptr<ast::Type> const & type = expr->aggregate->result;
-        if ( auto inst = type.as<ast::StructInstType>() ) {
-                if ( !inst->params.empty() ) return fixMemberExpr( inst, expr );
+        if ( !isGenericType( type ) ) {
+                return expr;
+        } else if ( auto inst = type.as<ast::StructInstType>() ) {
+                return fixMemberExpr( inst, expr );
         } else if ( auto inst = type.as<ast::UnionInstType>() ) {
-                if ( !inst->params.empty() ) return fixMemberExpr( inst, expr );
+                return fixMemberExpr( inst, expr );
         }
         return expr;
@@ -449 +451 @@
         ast::Expr const * postvisit( ast::MemberExpr const * expr );
         ast::Expr const * postvisit( ast::Expr const * expr );
-        ast::Designation const * postvisit( ast::Designation const * );
-
-        void previsit( ast::ParseNode const * node ) {
-                GuardValue( location ) = &node->location;
-        }
+        void previsit( ast::ParseNode const * node );
+
         void previsit( ast::FunctionType const * ) {
                 GuardValue( inFunctionType ) = true;
@@ -629 +628 @@
 }
 
-// This attempts to figure out what the final name of the field will be.
-// Pretty printing can cause this to become incorrect.
-std::string getPrintName( ast::DeclWithType const * decl ) {
-        return ( decl->linkage.is_mangled )
-                ? decl->scopedMangleName() : decl->name;
-}
-
-ast::Designation const * GenericInstantiator::postvisit(
-                ast::Designation const * designation ) {
-        // Disconnect designator names from their fields.
-        // It is now incorrect to point at the generic definition where the used
-        // type now is replaced with a concrete instance. Ideally, new variable
-        // expressions would point at fields in the concrete instances, but that
-        // is work and that information should not be needed this late in
-        // compilation.
-
-        // Modify all designations, even if not needed.
-        auto mutNode = mutate( designation );
-        for ( ast::ptr<ast::Expr> & designator : mutNode->designators ) {
-                if ( auto var = designator.as<ast::VariableExpr>() ) {
-                        designator = new ast::NameExpr(
-                                var->location, getPrintName( var->var ) );
-                }
-        }
-        return mutNode;
+void GenericInstantiator::previsit( ast::ParseNode const * node ) {
+        GuardValue( location ) = &node->location;
 }