Changeset ad861ef for src/GenPoly

Timestamp:

Jan 20, 2023, 1:25:37 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

79a6b17, cd5eb4b

Parents:

466787a (diff), a0d1f1c (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/GenPoly

Files:

• Box.cc (modified) (4 diffs)
• GenPoly.cc (modified) (2 diffs)
• InstantiateGeneric.cc (modified) (1 diff)
• InstantiateGenericNew.cpp (modified) (1 diff)

src/GenPoly/Box.cc

@@ -14 +14 @@
 //
 
+#include "Box.h"
+
 #include <algorithm>                     // for mismatch
 #include <cassert>                       // for assert, strict_dynamic_cast
@@ -23 +25 @@
 #include <string>                        // for string, allocator, basic_string
 #include <utility>                       // for pair
-
-#include "Box.h"
 
 #include "CodeGen/OperatorTable.h"
@@ -37 +37 @@
 #include "InitTweak/InitTweak.h"         // for getFunctionName, isAssignment
 #include "Lvalue.h"                      // for generalizedLvalue
-#include "ResolvExpr/typeops.h"          // for typesCompatible
+#include "ResolvExpr/Unify.h"            // for typesCompatible
 #include "ScopedSet.h"                   // for ScopedSet, ScopedSet<>::iter...
 #include "ScrubTyVars.h"                 // for ScrubTyVars
@@ -911 +911 @@
 
                         for ( FunctionType const * const funType : functions ) {
-                                FunctionType *originalFunction = funType->clone();
-                                FunctionType *realFunction = funType->clone();
-                                std::string mangleName = SymTab::Mangler::mangle( realFunction );
+                                std::string mangleName = SymTab::Mangler::mangle( funType );
 
                                 // only attempt to create an adapter or pass one as a parameter if we haven't already done so for this
                                 // pre-substitution parameter function type.
                                 // The second part of the insert result is "is the value new".
-                                if ( adaptersDone.insert( mangleName ).second ) {
-
-                                        // apply substitution to type variables to figure out what the adapter's type should look like
-                                        assert( env );
-                                        env->apply( realFunction );
-                                        mangleName = SymTab::Mangler::mangle( realFunction );
-                                        mangleName += makePolyMonoSuffix( originalFunction, exprTyVars );
-
-                                        typedef ScopedMap< std::string, DeclarationWithType* >::iterator AdapterIter;
-                                        AdapterIter adapter = adapters.find( mangleName );
-                                        if ( adapter == adapters.end() ) {
-                                                // adapter has not been created yet in the current scope, so define it
-                                                FunctionDecl *newAdapter = makeAdapter( funType, realFunction, mangleName, exprTyVars );
-                                                std::pair< AdapterIter, bool > answer = adapters.insert( std::pair< std::string, DeclarationWithType *>( mangleName, newAdapter ) );
-                                                adapter = answer.first;
-                                                stmtsToAddBefore.push_back( new DeclStmt( newAdapter ) );
-                                        } // if
-                                        assert( adapter != adapters.end() );
-
-                                        // add the appropriate adapter as a parameter
-                                        appExpr->get_args().push_front( new VariableExpr( adapter->second ) );
+                                if ( !adaptersDone.insert( mangleName ).second ) continue;
+
+                                // Apply substitution to type variables to figure out what the adapter's type should look like.
+                                assert( env );
+                                FunctionType *realType = funType->clone();
+                                env->apply( realType );
+                                mangleName = SymTab::Mangler::mangle( realType );
+                                mangleName += makePolyMonoSuffix( funType, exprTyVars );
+
+                                typedef ScopedMap< std::string, DeclarationWithType* >::iterator AdapterIter;
+                                AdapterIter adapter = adapters.find( mangleName );
+                                if ( adapter == adapters.end() ) {
+                                        // Adapter has not been created yet in the current scope, so define it.
+                                        FunctionDecl *newAdapter = makeAdapter( funType, realType, mangleName, exprTyVars );
+                                        std::pair< AdapterIter, bool > answer = adapters.insert( mangleName, newAdapter );
+                                        adapter = answer.first;
+                                        stmtsToAddBefore.push_back( new DeclStmt( newAdapter ) );
                                 } // if
+                                assert( adapter != adapters.end() );
+
+                                // Add the appropriate adapter as a parameter.
+                                appExpr->args.push_front( new VariableExpr( adapter->second ) );
                         } // for
                 } // passAdapters

src/GenPoly/GenPoly.cc

@@ -24 +24 @@
 #include <vector>                       // for vector
 
+#include "AST/Expr.hpp"
 #include "AST/Type.hpp"
+#include "AST/TypeSubstitution.hpp"
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
 #include "ResolvExpr/typeops.h"         // for flatten
@@ -490 +492 @@
                 }
 
+                /// Flattens a list of types.
+                // There is another flattenList in Unify.
                 void flattenList( vector<ast::ptr<ast::Type>> const & src,
                                 vector<ast::ptr<ast::Type>> & out ) {

src/GenPoly/InstantiateGeneric.cc

@@ -28 +28 @@
 #include "GenPoly.h"                   // for isPolyType, typesPolyCompatible
 #include "InitTweak/InitTweak.h"
-#include "ResolvExpr/typeops.h"
+#include "ResolvExpr/AdjustExprType.hpp"  // for adjustExprType
+#include "ResolvExpr/Unify.h"          // for typesCompatible
 #include "ScopedSet.h"                 // for ScopedSet, ScopedSet<>::iterator
 #include "ScrubTyVars.h"               // for ScrubTyVars

src/GenPoly/InstantiateGenericNew.cpp

@@ -32 +32 @@
 #include "GenPoly/GenPoly.h"           // for isPolyType, typesPolyCompatible
 #include "GenPoly/ScrubTyVars.h"       // for scrubAll
-#include "ResolvExpr/typeops.h"        // for typesCompatible
+#include "ResolvExpr/AdjustExprType.hpp"  // for adjustExprType
+#include "ResolvExpr/Unify.h"          // for typesCompatible
 
 namespace GenPoly {