Changeset 40a1392 for src/ResolvExpr/ResolveAssertions.cc

Timestamp:

Oct 9, 2020, 6:12:50 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

04423b53

Parents:

3ca7ef3 (diff), 8fc9a5f (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 into master

File:

• src/ResolvExpr/ResolveAssertions.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 };