Changeset aac5dfd for src/ResolvExpr

Timestamp:

Dec 12, 2020, 7:30:31 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

5d1aa2f

Parents:

6ce9a4f2 (diff), 4803a901 (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/ResolvExpr

Files:

• CandidateFinder.cpp (modified) (1 diff)
• CastCost.cc (modified) (1 diff)
• RenameVars.cc (modified) (5 diffs)
• Resolver.cc (modified) (2 diffs)
• SatisfyAssertions.cpp (modified) (1 diff)
• Unify.cc (modified) (1 diff)

src/ResolvExpr/CandidateFinder.cpp

@@ -220 +220 @@
 
         void makeUnifiableVars(
-                const ast::ParameterizedType * type, ast::OpenVarSet & unifiableVars,
+                const ast::FunctionType * type, ast::OpenVarSet & unifiableVars,
                 ast::AssertionSet & need
         ) {

src/ResolvExpr/CastCost.cc

@@ -165 +165 @@
                                 } else {
                                         ast::TypeEnvironment newEnv{ env };
-                                        if ( auto wParams = pointerType->base.as< ast::ParameterizedType >() ) {
+                                        if ( auto wParams = pointerType->base.as< ast::FunctionType >() ) {
                                                 newEnv.add( wParams->forall );
                                         }

src/ResolvExpr/RenameVars.cc

@@ -93 +93 @@
                 }
 
-                template<typename NodeT>
-                const NodeT * openLevel( const NodeT * type ) {
+                const ast::FunctionType * openLevel( const ast::FunctionType * type ) {
                         if ( type->forall.empty() ) return type;
 
@@ -100 +99 @@
 
                         // Load new names from this forall clause and perform renaming.
-                        NodeT * mutType = ast::mutate( type );
+                        auto mutType = ast::mutate( type );
                         assert( type == mutType && "mutated type must be unique from ForallSubstitutor" );
                         for ( ast::ptr< ast::TypeDecl > & td : mutType->forall ) {
+                                assertf(dynamic_cast<ast::FunctionType *>(mutType), "renaming vars in non-function type");
                                 std::ostringstream output;
                                 output << "_" << resetCount << "_" << level << "_" << td->name;
@@ -119 +119 @@
                 }
 
-                void closeLevel( const ast::ParameterizedType * type ) {
+                void closeLevel( const ast::FunctionType * type ) {
                         if ( type->forall.empty() ) return;
 
@@ -149 +149 @@
                         return renaming.openLevel( type );
                 }
+
+                /*
                 const ast::StructInstType * previsit( const ast::StructInstType * type ) {
                         return renaming.openLevel( type );
@@ -158 +160 @@
                         return renaming.openLevel( type );
                 }
+                */
+
                 const ast::TypeInstType * previsit( const ast::TypeInstType * type ) {
-                        return renaming.rename( renaming.openLevel( type ) );
+                        return renaming.rename( type );
                 }
-                void postvisit( const ast::ParameterizedType * type ) {
+                void postvisit( const ast::FunctionType * type ) {
                         renaming.closeLevel( type );
                 }

src/ResolvExpr/Resolver.cc

@@ -968 +968 @@
         namespace {
                 /// Finds deleted expressions in an expression tree
-                struct DeleteFinder_new final : public ast::WithShortCircuiting {
+                struct DeleteFinder_new final : public ast::WithShortCircuiting, public ast::WithVisitorRef<DeleteFinder_new> {
                         const ast::DeletedExpr * result = nullptr;
 
@@ -976 +976 @@
                         }
 
-                        void previsit( const ast::Expr * ) {
+                        void previsit( const ast::Expr * expr ) {
                                 if ( result ) { visit_children = false; }
+                                if (expr->inferred.hasParams()) {
+                                        for (auto & imp : expr->inferred.inferParams() ) {
+                                                imp.second.expr->accept(*visitor);
+                                        }
+                                }
                         }
                 };

src/ResolvExpr/SatisfyAssertions.cpp

@@ -194 +194 @@
                         // if we should implement the same rule here
                         // (i.e. error if unique best match is deleted)
-                        if (candidate->isDeleted) continue;
+                        if (candidate->isDeleted && candidate->linkage == ast::Linkage::AutoGen) continue;
 
                         // build independent unification context for candidate

src/ResolvExpr/Unify.cc

@@ -898 +898 @@
                 static void markAssertions(
                         ast::AssertionSet & assn1, ast::AssertionSet & assn2,
-                        const ast::ParameterizedType * type
+                        const ast::FunctionType * type
                 ) {
                         for ( const auto & tyvar : type->forall ) {