Changeset 81da70a5

Timestamp:

Jun 25, 2020, 5:00:18 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

276f105

Parents:

8ff586c

Message:

actually fill inferred params and disable a check

Location:

src

Files:

• AST/Convert.cpp (modified) (1 diff)
• ResolvExpr/SatisfyAssertions.cpp (modified) (3 diffs)

src/AST/Convert.cpp

@@ -593 +593 @@
                                 auto res = tgtInferParams.emplace(srcParam.first, ParamEntry(
                                         srcParam.second.decl,
-                                        get<Declaration>().accept1(srcParam.second.declptr),
+                                        get<Declaration>().accept1(srcParam.second.declptr)->clone(),
                                         get<Type>().accept1(srcParam.second.actualType),
                                         get<Type>().accept1(srcParam.second.formalType),

src/ResolvExpr/SatisfyAssertions.cpp

@@ -229 +229 @@
                 InferMatcher( InferCache & inferred ) : inferred( inferred ) {}
 
-                const ast::Expr * postmutate( const ast::Expr * expr ) {
+                const ast::Expr * postvisit( const ast::Expr * expr ) {
                         // Skip if no slots to find
                         if ( expr->inferred.mode != ast::Expr::InferUnion::Slots ) return expr;
@@ -239 +239 @@
                                 auto it = inferred.find( slot );
                                 if ( it == inferred.end() ) {
-                                        assert(!"missing assertion");
+                                        std::cerr << "missing assertion " << slot << std::endl;
+                                        continue;
                                 }
 
@@ -245 +246 @@
                                 for ( auto & entry : it->second ) {
                                         // recurse on inferParams of resolved expressions
-                                        entry.second.expr = postmutate( entry.second.expr );
+                                        entry.second.expr = postvisit( entry.second.expr );
                                         auto res = newInferred.emplace( entry );
                                         assert( res.second && "all assertions newly placed" );