Changeset 8135d4c for src/GenPoly

Timestamp:

Aug 22, 2017, 7:31:52 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

9aaac6e9

Parents:

fc56cdbf (diff), b3d413b (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' into references

Location:

src/GenPoly

Files:

• Box.cc (modified) (1 diff)
• Box.h (modified) (1 diff)
• CopyParams.cc (modified) (1 diff)
• DeclMutator.cc (modified) (1 diff)
• DeclMutator.h (modified) (1 diff)
• FindFunction.cc (modified) (1 diff)
• FindFunction.h (modified) (1 diff)
• GenPoly.cc (modified) (1 diff)
• GenPoly.h (modified) (2 diffs)
• InstantiateGeneric.cc (modified) (1 diff)
• InstantiateGeneric.h (modified) (1 diff)
• Lvalue.cc (modified) (3 diffs)
• Lvalue.h (modified) (1 diff)
• PolyMutator.cc (modified) (1 diff)
• PolyMutator.h (modified) (1 diff)
• ScrubTyVars.cc (modified) (1 diff)
• ScrubTyVars.h (modified) (3 diffs)
• Specialize.cc (modified) (3 diffs)
• Specialize.h (modified) (1 diff)

src/GenPoly/Box.cc

@@ -14 +14 @@
 //
 
-#include <algorithm>
-#include <iterator>
-#include <list>
-#include <map>
-#include <set>
-#include <stack>
-#include <string>
-#include <utility>
-#include <vector>
-#include <cassert>
+#include <algorithm>                     // for mismatch
+#include <cassert>                       // for assert, safe_dynamic_cast
+#include <iostream>                      // for operator<<, stringstream
+#include <list>                          // for list, list<>::iterator, _Lis...
+#include <map>                           // for _Rb_tree_const_iterator, map
+#include <memory>                        // for auto_ptr
+#include <set>                           // for set
+#include <string>                        // for string, allocator, basic_string
+#include <utility>                       // for pair
 
 #include "Box.h"
-#include "DeclMutator.h"
-#include "Lvalue.h"
-#include "FindFunction.h"
-#include "PolyMutator.h"
-#include "ScopedSet.h"
-#include "ScrubTyVars.h"
-
-#include "Parser/ParseNode.h"
-
-#include "SynTree/Attribute.h"
-#include "SynTree/Constant.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Initializer.h"
-#include "SynTree/Mutator.h"
-#include "SynTree/Statement.h"
-#include "SynTree/Type.h"
-#include "SynTree/TypeSubstitution.h"
-
-#include "ResolvExpr/TypeEnvironment.h"
-#include "ResolvExpr/TypeMap.h"
-#include "ResolvExpr/typeops.h"
-
-#include "SymTab/Indexer.h"
-#include "SymTab/Mangler.h"
-
-#include "Common/ScopedMap.h"
-#include "Common/SemanticError.h"
-#include "Common/UniqueName.h"
-#include "Common/utility.h"
 
 #include "CodeGen/OperatorTable.h"
-
-#include "InitTweak/InitTweak.h"
-
-#include <ext/functional> // temporary
+#include "Common/ScopedMap.h"            // for ScopedMap, ScopedMap<>::iter...
+#include "Common/SemanticError.h"        // for SemanticError
+#include "Common/UniqueName.h"           // for UniqueName
+#include "Common/utility.h"              // for toString
+#include "DeclMutator.h"                 // for DeclMutator
+#include "FindFunction.h"                // for findFunction, findAndReplace...
+#include "GenPoly/ErasableScopedMap.h"   // for ErasableScopedMap<>::const_i...
+#include "GenPoly/GenPoly.h"             // for TyVarMap, isPolyType, mangle...
+#include "InitTweak/InitTweak.h"         // for getFunctionName, isAssignment
+#include "Lvalue.h"                      // for generalizedLvalue
+#include "Parser/LinkageSpec.h"          // for C, Spec, Cforall, Intrinsic
+#include "PolyMutator.h"                 // for PolyMutator
+#include "ResolvExpr/TypeEnvironment.h"  // for EqvClass
+#include "ResolvExpr/typeops.h"          // for typesCompatible
+#include "ScopedSet.h"                   // for ScopedSet, ScopedSet<>::iter...
+#include "ScrubTyVars.h"                 // for ScrubTyVars
+#include "SymTab/Indexer.h"              // for Indexer
+#include "SymTab/Mangler.h"              // for Mangler
+#include "SynTree/Attribute.h"           // for Attribute
+#include "SynTree/Constant.h"            // for Constant
+#include "SynTree/Declaration.h"         // for DeclarationWithType, ObjectDecl
+#include "SynTree/Expression.h"          // for ApplicationExpr, UntypedExpr
+#include "SynTree/Initializer.h"         // for SingleInit, Initializer, Lis...
+#include "SynTree/Label.h"               // for Label, noLabels
+#include "SynTree/Mutator.h"             // for maybeMutate, Mutator, mutateAll
+#include "SynTree/Statement.h"           // for ExprStmt, DeclStmt, ReturnStmt
+#include "SynTree/SynTree.h"             // for UniqueId
+#include "SynTree/Type.h"                // for Type, FunctionType, PointerType
+#include "SynTree/TypeSubstitution.h"    // for TypeSubstitution, operator<<
 
 namespace GenPoly {

src/GenPoly/Box.h

@@ -16 +16 @@
 #pragma once
 
-#include <list>
-#include "SynTree/SynTree.h"
+#include <list>  // for list
+
+class Declaration;
 
 namespace GenPoly {

src/GenPoly/CopyParams.cc

@@ -14 +14 @@
 //
 
-#include <set>
-#include <map>
-#include <cassert>
+#include <cassert>                 // for assert
+#include <list>                    // for list, _List_iterator, _List_const_...
+#include <map>                     // for map, _Rb_tree_const_iterator, map<...
+#include <set>                     // for set, set<>::const_iterator
+#include <string>                  // for string, operator==
+#include <utility>                 // for pair
 
-#include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Statement.h"
-#include "SynTree/Visitor.h"
-#include "Common/UniqueName.h"
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Common/UniqueName.h"     // for UniqueName
+#include "SynTree/Declaration.h"   // for DeclarationWithType, TypeDecl, Fun...
+#include "SynTree/Expression.h"    // for VariableExpr, ApplicationExpr, Add...
+#include "SynTree/Label.h"         // for Label, noLabels
+#include "SynTree/Statement.h"     // for CompoundStmt, DeclStmt, ExprStmt
+#include "SynTree/SynTree.h"       // for UniqueId
+#include "SynTree/Type.h"          // for FunctionType, TypeInstType, Type
+#include "SynTree/Visitor.h"       // for acceptAll, Visitor
 
 namespace GenPoly {

src/GenPoly/DeclMutator.cc

@@ -16 +16 @@
 #include "DeclMutator.h"
 
-#include "SynTree/Expression.h"
-#include "SynTree/Statement.h"
+#include <memory>                  // for allocator_traits<>::value_type
+
+#include "Common/SemanticError.h"  // for SemanticError
+#include "SynTree/Declaration.h"   // for Declaration
+#include "SynTree/Expression.h"    // for Expression
+#include "SynTree/Label.h"         // for Label, noLabels
+#include "SynTree/Statement.h"     // for CatchStmt, Statement, CompoundStmt
 
 namespace GenPoly {

src/GenPoly/DeclMutator.h

@@ -16 +16 @@
 #pragma once
 
-#include <list>
-#include <vector>
+#include <list>               // for list
+#include <vector>             // for vector
 
-#include "SynTree/SynTree.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Mutator.h"
+#include "SynTree/Mutator.h"  // for Mutator
+#include "SynTree/SynTree.h"  // for Visitor Nodes
 
 namespace GenPoly {

src/GenPoly/FindFunction.cc

@@ -15 +15 @@
 
 #include "FindFunction.h"
-#include "SynTree/Type.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Visitor.h"
 
-#include "ScrubTyVars.h"
+#include <utility>                      // for pair
+
+#include "Common/SemanticError.h"       // for SemanticError
+#include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::iterator
+#include "GenPoly/GenPoly.h"            // for TyVarMap
+#include "ScrubTyVars.h"                // for ScrubTyVars
+#include "SynTree/Declaration.h"        // for DeclarationWithType, TypeDecl
+#include "SynTree/Mutator.h"            // for Mutator, mutateAll
+#include "SynTree/Type.h"               // for FunctionType, Type, Type::For...
 
 namespace GenPoly {

src/GenPoly/FindFunction.h

@@ -16 +16 @@
 #pragma once
 
-#include "SynTree/SynTree.h"
-#include "GenPoly.h"
+#include <list>       // for list
+
+#include "GenPoly.h"  // for TyVarMap
+
+class FunctionType;
+class Type;
 
 namespace GenPoly {

src/GenPoly/GenPoly.cc

@@ -15 +15 @@
 
 #include "GenPoly.h"
-#include "assert.h"
-
-#include "SynTree/Expression.h"
-#include "SynTree/Type.h"
-#include "ResolvExpr/typeops.h"
-
-#include <iostream>
-#include <iterator>
-#include <list>
-#include <typeindex>
-#include <typeinfo>
-#include <vector>
+
+#include <cassert>                      // for assertf, assert
+#include <iostream>                     // for operator<<, ostream, basic_os...
+#include <iterator>                     // for back_insert_iterator, back_in...
+#include <list>                         // for list, _List_iterator, list<>:...
+#include <typeindex>                    // for type_index
+#include <utility>                      // for pair
+#include <vector>                       // for vector
+
+#include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
+#include "ResolvExpr/typeops.h"         // for flatten
+#include "SynTree/Constant.h"           // for Constant
+#include "SynTree/Expression.h"         // for Expression, TypeExpr, Constan...
+#include "SynTree/Type.h"               // for Type, StructInstType, UnionIn...
+#include "SynTree/TypeSubstitution.h"   // for TypeSubstitution
+
 using namespace std;
 

src/GenPoly/GenPoly.h

@@ -16 +16 @@
 #pragma once
 
-#include <string>
-#include <iostream>
-#include <utility>
+#include <iostream>               // for ostream
+#include <string>                 // for string, allocator, operator+, basic...
 
-#include "ErasableScopedMap.h"
-
-#include "SymTab/Mangler.h"
-
-#include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
-#include "SynTree/TypeSubstitution.h"
+#include "ErasableScopedMap.h"    // for ErasableScopedMap
+#include "SymTab/Mangler.h"       // for Mangler
+#include "SynTree/Declaration.h"  // for TypeDecl::Data, AggregateDecl, Type...
+#include "SynTree/SynTree.h"      // for Visitor Nodes
 
 namespace GenPoly {
@@ -66 +62 @@
         Type *hasPolyBase( Type *type, const TyVarMap &tyVars, int *levels = 0, const TypeSubstitution *env = 0 );
 
-        /// true iff this type or some base of this type after dereferencing pointers is either polymorphic or a generic type with at least one 
+        /// true iff this type or some base of this type after dereferencing pointers is either polymorphic or a generic type with at least one
         /// polymorphic parameter; will look up substitution in env if provided.
         bool includesPolyType( Type *type, const TypeSubstitution *env = 0 );
 
-        /// true iff this type or some base of this type after dereferencing pointers is either polymorphic in tyVars, or a generic type with 
+        /// true iff this type or some base of this type after dereferencing pointers is either polymorphic in tyVars, or a generic type with
         /// at least one polymorphic parameter in tyVars; will look up substitution in env if provided.
         bool includesPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );

src/GenPoly/InstantiateGeneric.cc

@@ -13 +13 @@
 // Update Count     : 1
 //
-
-#include <cassert>
-#include <list>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
 #include "InstantiateGeneric.h"
 
-#include "GenPoly.h"
-#include "ScopedSet.h"
-#include "ScrubTyVars.h"
-
-#include "Common/PassVisitor.h"
-#include "Common/ScopedMap.h"
-#include "Common/UniqueName.h"
-#include "Common/utility.h"
-
-#include "ResolvExpr/typeops.h"
-
-#include "SynTree/Declaration.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Type.h"
-
-
-#include "InitTweak/InitTweak.h"
+#include <cassert>                     // for assertf, assert
+#include <iterator>                    // for back_inserter, inserter
+#include <list>                        // for list, _List_const_iterator
+#include <utility>                     // for move, pair
+#include <vector>                      // for vector
+
+#include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
+#include "Common/ScopedMap.h"          // for ScopedMap
+#include "Common/SemanticError.h"      // for SemanticError
+#include "Common/UniqueName.h"         // for UniqueName
+#include "Common/utility.h"            // for deleteAll, cloneAll
+#include "GenPoly.h"                   // for isPolyType, typesPolyCompatible
+#include "ScopedSet.h"                 // for ScopedSet, ScopedSet<>::iterator
+#include "ScrubTyVars.h"               // for ScrubTyVars
+#include "SynTree/Declaration.h"       // for StructDecl, UnionDecl, TypeDecl
+#include "SynTree/Expression.h"        // for TypeExpr, Expression
+#include "SynTree/Mutator.h"           // for mutateAll
+#include "SynTree/Type.h"              // for StructInstType, UnionInstType
+#include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
+#include "SynTree/Visitor.h"           // for acceptAll
 
 

src/GenPoly/InstantiateGeneric.h

@@ -16 +16 @@
 #pragma once
 
-#include "SynTree/SynTree.h"
+#include <list>  // for list
+
+class Declaration;
 
 namespace GenPoly {

src/GenPoly/Lvalue.cc

@@ -14 +14 @@
 //
 
-#include <cassert>
-
+#include <cassert>                       // for safe_dynamic_cast
+#include <string>                        // for string
+
+#include "Common/PassVisitor.h"
+#include "Common/SemanticError.h"        // for SemanticError
+#include "GenPoly.h"                     // for isPolyType
 #include "Lvalue.h"
 
-#include "GenPoly.h"
-
-#include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Statement.h"
-#include "SynTree/Visitor.h"
-#include "SynTree/Mutator.h"
-#include "SymTab/Indexer.h"
+#include "Parser/LinkageSpec.h"          // for Spec, isBuiltin, Intrinsic
+#include "ResolvExpr/TypeEnvironment.h"  // for AssertionSet, OpenVarSet
+#include "ResolvExpr/Unify.h"            // for unify
+#include "ResolvExpr/typeops.h"
 #include "SymTab/Autogen.h"
-
-#include "ResolvExpr/Resolver.h"
-#include "ResolvExpr/TypeEnvironment.h"
-#include "ResolvExpr/typeops.h"
-#include "ResolvExpr/Unify.h"
-
-#include "Common/UniqueName.h"
-#include "Common/utility.h"
-#include "Common/PassVisitor.h"
-
-#include "InitTweak/InitTweak.h"
+#include "SymTab/Indexer.h"              // for Indexer
+#include "SynTree/Declaration.h"         // for Declaration, FunctionDecl
+#include "SynTree/Expression.h"          // for Expression, ConditionalExpr
+#include "SynTree/Mutator.h"             // for mutateAll, Mutator
+#include "SynTree/Statement.h"           // for ReturnStmt, Statement (ptr o...
+#include "SynTree/Type.h"                // for PointerType, Type, FunctionType
+#include "SynTree/Visitor.h"             // for Visitor, acceptAll
 
 #if 0
@@ -223 +218 @@
                 // at inner &, record depth D of reference type
                 // at outer &, add D derefs.
-                void AddrRef::premutate( Expression * expr ) {
+                void AddrRef::premutate( Expression * ) {
                         GuardValue( current );
                         GuardValue( first );
@@ -230 +225 @@
                 }
 
-                void AddrRef::premutate( AddressExpr * addrExpr ) {
+                void AddrRef::premutate( AddressExpr * ) {
                         GuardValue( current );
                         GuardValue( first );

src/GenPoly/Lvalue.h

@@ -16 +16 @@
 #pragma once
 
-#include <list>
+#include <list>  // for list
 
-#include "SynTree/SynTree.h"
+class Declaration;
+class Expression;
 
 namespace GenPoly {

src/GenPoly/PolyMutator.cc

@@ -15 +15 @@
 
 #include "PolyMutator.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Statement.h"
-#include "SynTree/Mutator.h"
-#include "SynTree/Initializer.h"
+
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Common/utility.h"        // for ValueGuard
+#include "SynTree/Declaration.h"   // for Declaration, TypeDecl, TypeDecl::Data
+#include "SynTree/Expression.h"    // for Expression, UntypedExpr, StmtExpr ...
+#include "SynTree/Initializer.h"   // for SingleInit, Initializer (ptr only)
+#include "SynTree/Label.h"         // for Label, noLabels
+#include "SynTree/Mutator.h"       // for maybeMutate, mutateAll
+#include "SynTree/Statement.h"     // for CatchStmt, CompoundStmt, ForStmt
+
+class TypeSubstitution;
 
 namespace GenPoly {

src/GenPoly/PolyMutator.h

@@ -16 +16 @@
 #pragma once
 
-#include <map>
-#include <string>
-#include <list>
+#include <list>               // for list
 
-#include "GenPoly.h"
-
-#include "SynTree/SynTree.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Mutator.h"
+#include "GenPoly.h"          // for TyVarMap
+#include "SynTree/Mutator.h"  // for Mutator
+#include "SynTree/SynTree.h"  // for Visitor Nodes
 
 namespace GenPoly {

src/GenPoly/ScrubTyVars.cc

@@ -14 +14 @@
 //
 
-#include <sstream>
-#include <string>
+#include <utility>                      // for pair
 
-#include "GenPoly.h"
+#include "GenPoly.h"                    // for mangleType, TyVarMap, alignof...
+#include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
 #include "ScrubTyVars.h"
-
-#include "SynTree/Mutator.h"
-#include "SynTree/Type.h"
-#include "SynTree/Expression.h"
+#include "SynTree/Declaration.h"        // for TypeDecl, TypeDecl::Data, Typ...
+#include "SynTree/Expression.h"         // for Expression (ptr only), NameExpr
+#include "SynTree/Mutator.h"            // for Mutator
+#include "SynTree/Type.h"               // for PointerType, TypeInstType, Type
 
 namespace GenPoly {

src/GenPoly/ScrubTyVars.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ScrubTyVars.h -- 
+// ScrubTyVars.h --
 //
 // Author           : Richard C. Bilson
@@ -16 +16 @@
 #pragma once
 
-#include <string>
+#include <cassert>            // for assert
 
-#include "GenPoly.h"
+#include "GenPoly.h"          // for TyVarMap, isPolyType, isDynType
+#include "SynTree/Mutator.h"  // for Mutator
+#include "SynTree/Type.h"     // for Type (ptr only), PointerType (ptr only)
 
-#include "SynTree/SynTree.h"
-#include "SynTree/Mutator.h"
+class AlignofExpr;
+class Expression;
+class SizeofExpr;
 
 namespace GenPoly {
@@ -66 +69 @@
                         // return dynamicOnly ? isDynType( ty, tyVars ) : isPolyType( ty, tyVars );
                 }
-                
+
                 /// Mutates (possibly generic) aggregate types appropriately
                 Type* mutateAggregateType( Type *ty );
-                
+
                 const TyVarMap *tyVars;  ///< Type variables to scrub
                 ScrubMode mode;          ///< which type variables to scrub? [FromMap]

src/GenPoly/Specialize.cc

@@ -14 +14 @@
 //
 
-#include <cassert>
-
+#include <cassert>                       // for assert, assertf
+#include <iterator>                      // for back_insert_iterator, back_i...
+#include <map>                           // for _Rb_tree_iterator, _Rb_tree_...
+#include <memory>                        // for unique_ptr
+#include <string>                        // for string
+#include <tuple>                         // for get
+#include <utility>                       // for pair
+
+#include "Common/SemanticError.h"        // for SemanticError
+#include "Common/UniqueName.h"           // for UniqueName
+#include "Common/utility.h"              // for group_iterate
+#include "GenPoly.h"                     // for getFunctionType
+#include "InitTweak/InitTweak.h"         // for isIntrinsicCallExpr
+#include "Parser/LinkageSpec.h"          // for C
+#include "PolyMutator.h"                 // for PolyMutator
+#include "ResolvExpr/FindOpenVars.h"     // for findOpenVars
+#include "ResolvExpr/TypeEnvironment.h"  // for OpenVarSet, AssertionSet
 #include "Specialize.h"
-#include "GenPoly.h"
-#include "PolyMutator.h"
-
-#include "Parser/ParseNode.h"
-
-#include "SynTree/Expression.h"
-#include "SynTree/Statement.h"
-#include "SynTree/Type.h"
-#include "SynTree/Attribute.h"
-#include "SynTree/TypeSubstitution.h"
-#include "SynTree/Mutator.h"
-#include "ResolvExpr/FindOpenVars.h"
-#include "Common/UniqueName.h"
-#include "Common/utility.h"
-#include "InitTweak/InitTweak.h"
-#include "Tuples/Tuples.h"
+#include "SynTree/Attribute.h"           // for Attribute
+#include "SynTree/Declaration.h"         // for FunctionDecl, DeclarationWit...
+#include "SynTree/Expression.h"          // for ApplicationExpr, Expression
+#include "SynTree/Label.h"               // for Label, noLabels
+#include "SynTree/Mutator.h"             // for mutateAll
+#include "SynTree/Statement.h"           // for CompoundStmt, DeclStmt, Expr...
+#include "SynTree/Type.h"                // for FunctionType, TupleType, Type
+#include "SynTree/TypeSubstitution.h"    // for TypeSubstitution
+#include "SynTree/Visitor.h"             // for Visitor
 
 namespace GenPoly {
@@ -93 +101 @@
         }
 
+        // walk into tuple type and find the number of components
+        size_t singleParameterSize( Type * type ) {
+                if ( TupleType * tt = dynamic_cast< TupleType * >( type ) ) {
+                        size_t sz = 0;
+                        for ( Type * t : *tt ) {
+                                sz += singleParameterSize( t );
+                        }
+                        return sz;
+                } else {
+                        return 1;
+                }
+        }
+
+        // find the total number of components in a parameter list
+        size_t functionParameterSize( FunctionType * ftype ) {
+                size_t sz = 0;
+                for ( DeclarationWithType * p : ftype->get_parameters() ) {
+                        sz += singleParameterSize( p->get_type() );
+                }
+                return sz;
+        }
+
         bool needsTupleSpecialization( Type *formalType, Type *actualType ) {
                 // Needs tuple specialization if the structure of the formal type and actual type do not match.
@@ -103 +133 @@
                         FunctionType * aftype = getFunctionType( actualType->stripReferences() );
                         assertf( aftype, "formal type is a function type, but actual type is not: %s", toString( actualType ).c_str() );
+                        // Can't tuple specialize if parameter sizes deeply-differ.
+                        if ( functionParameterSize( fftype ) != functionParameterSize( aftype ) ) return false;
+                        // tuple-parameter sizes are the same, but actual parameter sizes differ - must tuple specialize
                         if ( fftype->get_parameters().size() != aftype->get_parameters().size() ) return true;
+                        // total parameter size can be the same, while individual parameters can have different structure
                         for ( auto params : group_iterate( fftype->get_parameters(), aftype->get_parameters() ) ) {
                                 DeclarationWithType * formal = std::get<0>(params);

src/GenPoly/Specialize.h

@@ -16 +16 @@
 #pragma once
 
-#include <list>
+#include <list>  // for list
 
-#include "SynTree/SynTree.h"
+class Declaration;
 
 namespace GenPoly {