Changeset b067d9b for src/GenPoly/GenPoly.cc

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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

File:

• src/GenPoly/GenPoly.cc (modified) (5 diffs)

src/GenPoly/GenPoly.cc

@@ -24 +24 @@
 #include <vector>                       // for vector
 
+#include "AST/Type.hpp"
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
 #include "ResolvExpr/typeops.h"         // for flatten
@@ -262 +263 @@
                 } else {
                         return dynamic_cast< FunctionType* >( ty ); // pointer if FunctionType, NULL otherwise
+                }
+        }
+
+        const ast::FunctionType * getFunctionType( const ast::Type * ty ) {
+                if ( auto pty = dynamic_cast< const ast::PointerType * >( ty ) ) {
+                        return pty->base.as< ast::FunctionType >();
+                } else {
+                        return dynamic_cast< const ast::FunctionType * >( ty );
                 }
         }
@@ -440 +449 @@
         }
 
-        bool needsBoxing( Type * param, Type * arg, const TyVarMap &exprTyVars, TypeSubstitution * env ) {
+        bool needsBoxing( Type * param, Type * arg, const TyVarMap &exprTyVars, const TypeSubstitution * env ) {
                 // is parameter is not polymorphic, don't need to box
                 if ( ! isPolyType( param, exprTyVars ) ) return false;
@@ -450 +459 @@
         }
 
-        bool needsBoxing( Type * param, Type * arg, ApplicationExpr * appExpr, TypeSubstitution * env ) {
+        bool needsBoxing( Type * param, Type * arg, ApplicationExpr * appExpr, const TypeSubstitution * env ) {
                 FunctionType * function = getFunctionType( appExpr->function->result );
                 assertf( function, "ApplicationExpr has non-function type: %s", toString( appExpr->function->result ).c_str() );
@@ -459 +468 @@
 
         void addToTyVarMap( TypeDecl * tyVar, TyVarMap &tyVarMap ) {
-                // xxx - should this actually be insert?
-                tyVarMap[ tyVar->get_name() ] = TypeDecl::Data{ tyVar };
+                tyVarMap.insert( tyVar->name, TypeDecl::Data{ tyVar } );
         }