Skip to content

[SMTChecker] Fix comparison of CHCVerificationTarget for proper std::set ordering #16147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2025
+5 −13
Merged

[SMTChecker] Fix comparison of CHCVerificationTarget for proper std::set ordering #16147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions libsolidity/formal/CHC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,10 @@ class CHC: public SMTEncoder

friend bool operator<(CHCVerificationTarget const& _a, CHCVerificationTarget const& _b)
{
return _a.errorId < _b.errorId;
}
};

struct SafeTargetsCompare
{
bool operator()(CHCVerificationTarget const & _lhs, CHCVerificationTarget const & _rhs) const
{
if (_lhs.errorNode->id() == _rhs.errorNode->id())
return _lhs.type < _rhs.type;
if (_a.errorNode->id() == _b.errorNode->id())
return _a.type < _b.type;
else
return _lhs.errorNode->id() == _rhs.errorNode->id();
return _a.errorNode->id() < _b.errorNode->id();
}
};

Expand All @@ -96,7 +88,7 @@ class CHC: public SMTEncoder
std::string message;
};

std::map<ASTNode const*, std::set<CHCVerificationTarget, SafeTargetsCompare>, smt::EncodingContext::IdCompare> const& safeTargets() const { return m_safeTargets; }
std::map<ASTNode const*, std::set<CHCVerificationTarget>, smt::EncodingContext::IdCompare> const& safeTargets() const { return m_safeTargets; }
std::map<ASTNode const*, std::map<VerificationTargetType, ReportTargetInfo>, smt::EncodingContext::IdCompare> const& unsafeTargets() const { return m_unsafeTargets; }

/// This is used if the Horn solver is not directly linked into this binary.
Expand Down Expand Up @@ -434,7 +426,7 @@ class CHC: public SMTEncoder
std::map<unsigned, CHCVerificationTarget> m_verificationTargets;

/// Targets proved safe.
std::map<ASTNode const*, std::set<CHCVerificationTarget, SafeTargetsCompare>, smt::EncodingContext::IdCompare> m_safeTargets;
std::map<ASTNode const*, std::set<CHCVerificationTarget>, smt::EncodingContext::IdCompare> m_safeTargets;
/// Targets proved unsafe.
std::map<ASTNode const*, std::map<VerificationTargetType, ReportTargetInfo>, smt::EncodingContext::IdCompare> m_unsafeTargets;
/// Targets not proved.
Expand Down