Changeset aac5dfd for src/ResolvExpr/SatisfyAssertions.cpp

Timestamp:

Dec 12, 2020, 7:30:31 PM (4 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

File:

• src/ResolvExpr/SatisfyAssertions.cpp (modified) (1 diff)

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