Changes in / [848439f:41b8ea4]

Location:

src

Files:

• ResolvExpr/ResolveAssertions.cc (modified) (1 diff)
• ResolvExpr/SatisfyAssertions.cpp (modified) (1 diff)
• SymTab/Autogen.cc (modified) (1 diff)

src/ResolvExpr/ResolveAssertions.cc

@@ -277 +277 @@
                         const DeclarationWithType * candidate = cdata.id;
 
-                        // build independent unification context for candidate
+                        // ignore deleted candidates.
+                        // NOTE: this behavior is different from main resolver.
+                        // further investigations might be needed to determine
+                        // if we should implement the same rule here
+                        // (i.e. error if unique best match is deleted)
+                        if (candidate->isDeleted) continue;
+
+                        // build independent unification context. for candidate
                         AssertionSet have, newNeed;
                         TypeEnvironment newEnv{ resn.alt.env };

src/ResolvExpr/SatisfyAssertions.cpp

@@ -170 +170 @@
                         const ast::DeclWithType * candidate = cdata.id;
 
+                        // ignore deleted candidates.
+                        // NOTE: this behavior is different from main resolver.
+                        // further investigations might be needed to determine
+                        // if we should implement the same rule here
+                        // (i.e. error if unique best match is deleted)
+                        if (candidate->isDeleted) continue;
+
                         // build independent unification context for candidate
                         ast::AssertionSet have, newNeed;

src/SymTab/Autogen.cc

@@ -339 +339 @@
                 } catch ( SemanticErrorException & ) {
                         // okay if decl does not resolve - that means the function should not be generated
-                        delete dcl;
+                        // delete dcl;
+                        delete dcl->statements;
+                        dcl->statements = nullptr;
+                        dcl->isDeleted = true;
+                        definitions.push_back( dcl );
+                        indexer.addId( dcl );
                 }
         }