Changeset cf34e82

Timestamp:

Oct 3, 2023, 5:31:59 PM (11 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

2261bcc, 3cbe320

Parents:

11ab0b4a (diff), 1ee0a4da (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• GenPoly/Box.h (modified) (2 diffs)
• GenPoly/BoxNew.cpp (added)
• GenPoly/InstantiateGenericNew.cpp (modified) (3 diffs)
• GenPoly/module.mk (modified) (1 diff)
• main.cc (modified) (1 diff)

src/GenPoly/Box.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Box.h -- 
+// Box.h -- Implement polymorphic function calls and types.
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:23:52 2017
-// Update Count     : 6
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Oct  6 13:37:00 2022
+// Update Count     : 7
 //
 
@@ -19 +19 @@
 
 class Declaration;
+namespace ast {
+        class TranslationUnit;
+}
 
 namespace GenPoly {
         /// boxes polymorphic function calls
         void box( std::list< Declaration* >& translationUnit );
+void box( ast::TranslationUnit & translationUnit );
 } // namespace GenPoly
 

src/GenPoly/InstantiateGenericNew.cpp

@@ -335 +335 @@
 ast::Expr const * FixDtypeStatic::postvisit( ast::MemberExpr const * expr ) {
         ast::ptr<ast::Type> const & type = expr->aggregate->result;
-        if ( !isGenericType( type ) ) {
-                return expr;
-        } else if ( auto inst = type.as<ast::StructInstType>() ) {
-                return fixMemberExpr( inst, expr );
+        if ( auto inst = type.as<ast::StructInstType>() ) {
+                if ( !inst->params.empty() ) return fixMemberExpr( inst, expr );
         } else if ( auto inst = type.as<ast::UnionInstType>() ) {
-                return fixMemberExpr( inst, expr );
+                if ( !inst->params.empty() ) return fixMemberExpr( inst, expr );
         }
         return expr;
@@ -451 +449 @@
         ast::Expr const * postvisit( ast::MemberExpr const * expr );
         ast::Expr const * postvisit( ast::Expr const * expr );
-        void previsit( ast::ParseNode const * node );
-
+        ast::Designation const * postvisit( ast::Designation const * );
+
+        void previsit( ast::ParseNode const * node ) {
+                GuardValue( location ) = &node->location;
+        }
         void previsit( ast::FunctionType const * ) {
                 GuardValue( inFunctionType ) = true;
@@ -628 +629 @@
 }
 
-void GenericInstantiator::previsit( ast::ParseNode const * node ) {
-        GuardValue( location ) = &node->location;
+// 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;
 }
 

src/GenPoly/module.mk

@@ -22 +22 @@
 
 SRC += $(SRC_GENPOLY) \
+        GenPoly/BoxNew.cpp \
         GenPoly/Box.cc \
         GenPoly/Box.h \

src/main.cc

@@ -419 +419 @@
 
                 PASS( "Convert L-Value", GenPoly::convertLvalue, transUnit );
+                DUMP( bboxp, std::move( transUnit ) );
+                PASS( "Box", GenPoly::box, transUnit );
 
                 translationUnit = convert( std::move( transUnit ) );
-
-                DUMP( bboxp, translationUnit );
-                PASS( "Box", GenPoly::box, translationUnit );
 
                 PASS( "Link-Once", CodeGen::translateLinkOnce, translationUnit );