Changeset 8135d4c for src/GenPoly/Specialize.cc

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

File:

• src/GenPoly/Specialize.cc (modified) (3 diffs)

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);