Skip to content

SMTChecker: Clean up includes and remove unused functionality #16019

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 2 commits into from
Apr 23, 2025
+24 −211
Merged

SMTChecker: Clean up includes and remove unused functionality #16019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1a9031
SMTChecker: Clean up includes
blishko Mar 29, 2025
629bb28
SMTChecker: Remove unused functionality
blishko Mar 29, 2025
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
3 changes: 2 additions & 1 deletion libsmtutil/SMTLib2Interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
#include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/predicate.hpp>

#include <range/v3/algorithm/find_if.hpp>
#include <range/v3/view/transform.hpp>
#include <range/v3/view/zip.hpp>

#include <array>
#include <fstream>
Expand Down
3 changes: 0 additions & 3 deletions libsmtutil/SMTPortfolio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@


#include <libsmtutil/BMCSolverInterface.h>
#include <libsolidity/interface/ReadFile.h>
#include <libsolutil/FixedHash.h>

#include <map>
#include <vector>

namespace solidity::smtutil
Expand Down
3 changes: 2 additions & 1 deletion libsmtutil/SolverInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
#include <libsolutil/CommonData.h>

#include <range/v3/algorithm/all_of.hpp>
#include <range/v3/view.hpp>
#include <range/v3/range/conversion.hpp>
#include <range/v3/view/split.hpp>

#include <cstdio>
#include <map>
Expand Down
2 changes: 0 additions & 2 deletions libsolidity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@ set(sources
formal/SymbolicTypes.h
formal/SymbolicVariables.cpp
formal/SymbolicVariables.h
formal/VariableUsage.cpp
formal/VariableUsage.h
formal/Z3CHCSmtLib2Interface.cpp
formal/Z3CHCSmtLib2Interface.h
formal/Z3SMTLib2Interface.cpp
Expand Down
2 changes: 2 additions & 0 deletions libsolidity/formal/ArraySlicePredicate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

#include <libsolidity/formal/ArraySlicePredicate.h>

#include <libsolidity/formal/SymbolicVariables.h>

#include <liblangutil/Exceptions.h>

using namespace solidity;
Expand Down
4 changes: 2 additions & 2 deletions libsolidity/formal/ArraySlicePredicate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
*/
// SPDX-License-Identifier: GPL-3.0

#include <libsolidity/formal/EncodingContext.h>
#pragma once

#include <libsolidity/formal/Predicate.h>
#include <libsolidity/formal/SymbolicVariables.h>

#include <libsmtutil/Sorts.h>

Expand Down
1 change: 0 additions & 1 deletion libsolidity/formal/BMC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ void BMC::analyze(SourceUnit const& _source, std::map<ASTNode const*, std::set<V
m_context.setSolver(m_interface.get());
m_context.reset();
m_context.setAssertionAccumulation(true);
m_variableUsage.setFunctionInlining(shouldInlineFunctionCall);
auto const& sources = sourceDependencies(_source);
createFreeConstants(sources);
createStateVariables(sources);
Expand Down
7 changes: 7 additions & 0 deletions libsolidity/formal/EncodingContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,19 @@

#include <libsolidity/formal/EncodingContext.h>

#include <libsolidity/ast/AST.h>

#include <libsolidity/formal/SymbolicTypes.h>

using namespace solidity;
using namespace solidity::util;
using namespace solidity::frontend::smt;

bool EncodingContext::IdCompare::operator()(ASTNode const* lhs, ASTNode const* rhs) const
{
return lhs->id() < rhs->id();
}

EncodingContext::EncodingContext():
m_state(*this)
{
Expand Down
5 changes: 1 addition & 4 deletions libsolidity/formal/EncodingContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,7 @@ class EncodingContext

struct IdCompare
{
bool operator()(ASTNode const* lhs, ASTNode const* rhs) const
{
return lhs->id() < rhs->id();
}
bool operator()(ASTNode const* lhs, ASTNode const* rhs) const;
};

/// Variables.
Expand Down
2 changes: 2 additions & 0 deletions libsolidity/formal/ExpressionFormatter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

#include <libsolidity/formal/SymbolicTypes.h>

#include <libsolidity/ast/AST.h>

#include <libsolutil/Algorithms.h>
#include <libsolutil/CommonData.h>

Expand Down
2 changes: 1 addition & 1 deletion libsolidity/formal/Predicate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#include <boost/algorithm/string/join.hpp>

#include <range/v3/view.hpp>
#include <range/v3/view/enumerate.hpp>
#include <utility>

using namespace solidity;
Expand Down
3 changes: 2 additions & 1 deletion libsolidity/formal/Predicate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
#pragma once


#include <libsolidity/ast/AST.h>
#include <libsolidity/ast/ASTForward.h>
#include <libsolidity/ast/Types.h>

#include <libsmtutil/SolverInterface.h>
#include <libsmtutil/Sorts.h>
Expand Down
9 changes: 0 additions & 9 deletions libsolidity/formal/SMTEncoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,6 @@ void SMTEncoder::initContract(ContractDefinition const& _contract)
m_context.pushSolver();
createStateVariables(_contract);
clearIndices(m_currentContract, nullptr);
m_variableUsage.setCurrentContract(_contract);
m_checked = true;
}

Expand Down Expand Up @@ -2813,14 +2812,6 @@ Expression const* SMTEncoder::cleanExpression(Expression const& _expr)
return expr;
}

std::set<VariableDeclaration const*> SMTEncoder::touchedVariables(ASTNode const& _node)
{
std::vector<CallableDeclaration const*> callStack;
for (auto const& call: m_callStack)
callStack.push_back(call.first);
return m_variableUsage.touchedVariables(_node, callStack);
}

Declaration const* SMTEncoder::expressionToDeclaration(Expression const& _expr) const
{
if (auto const* identifier = dynamic_cast<Identifier const*>(&_expr))
Expand Down
2 changes: 0 additions & 2 deletions libsolidity/formal/SMTEncoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <libsolidity/formal/EncodingContext.h>
#include <libsolidity/formal/ModelCheckerSettings.h>
#include <libsolidity/formal/SymbolicVariables.h>
#include <libsolidity/formal/VariableUsage.h>

#include <libsolidity/ast/AST.h>
#include <libsolidity/ast/ASTVisitor.h>
Expand Down Expand Up @@ -454,7 +453,6 @@ class SMTEncoder: public ASTConstVisitor
smtutil::Expression constraints;
};

smt::VariableUsage m_variableUsage;
bool m_arrayAssignmentHappened = false;

/// Stores the instances of an Uninterpreted Function applied to arguments.
Expand Down
1 change: 1 addition & 0 deletions libsolidity/formal/SymbolicTypes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

#include <libsolidity/formal/EncodingContext.h>

#include <libsolidity/ast/AST.h>
#include <libsolidity/ast/TypeProvider.h>
#include <libsolidity/ast/Types.h>
#include <libsolutil/CommonData.h>
Expand Down
1 change: 0 additions & 1 deletion libsolidity/formal/SymbolicTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#pragma once

#include <libsolidity/formal/SymbolicVariables.h>
#include <libsolidity/ast/AST.h>
#include <libsolidity/ast/Types.h>

namespace solidity::frontend::smt
Expand Down
2 changes: 2 additions & 0 deletions libsolidity/formal/SymbolicVariables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

#include <libsolidity/formal/SymbolicVariables.h>

#include <libsolidity/ast/AST.h>

#include <libsolidity/formal/EncodingContext.h>
#include <libsolidity/formal/SymbolicTypes.h>

Expand Down
118 changes: 0 additions & 118 deletions libsolidity/formal/VariableUsage.cpp
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions libsolidity/formal/VariableUsage.h
View file
Open in desktop

This file was deleted.