mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Fix SMTChecker bug when a public library function is called internally by an internal library function, which in turn is called internally by a contract.
This commit is contained in:
parent
40f0329baa
commit
9a8dd4242f
@ -23,6 +23,7 @@ Bugfixes:
|
||||
* Solidity Upgrade Tool ``solidity-upgrade``: Fix the tool returning success code on uncaught exceptions.
|
||||
* SMTChecker: Fix display error for negative integers that are one more than powers of two.
|
||||
* SMTChecker: Improved readability for large integers that are powers of two or almost powers of two in error messages.
|
||||
* SMTChecker: Fix internal error when a public library function is called internally.
|
||||
|
||||
|
||||
### 0.8.17 (2022-09-08)
|
||||
|
@ -1172,7 +1172,14 @@ void CHC::defineInterfacesAndSummaries(SourceUnit const& _source)
|
||||
|
||||
m_summaries[contract].emplace(function, createSummaryBlock(*function, *contract));
|
||||
|
||||
if (!function->isConstructor() && function->isPublic() && resolved.count(function))
|
||||
if (
|
||||
!function->isConstructor() &&
|
||||
function->isPublic() &&
|
||||
// Public library functions should have interfaces only for the libraries
|
||||
// they're declared in.
|
||||
(!function->libraryFunction() || (function->scope() == contract)) &&
|
||||
resolved.count(function)
|
||||
)
|
||||
{
|
||||
m_externalSummaries[contract].emplace(function, createSummaryBlock(*function, *contract));
|
||||
|
||||
|
@ -3162,12 +3162,11 @@ void SMTEncoder::collectFreeFunctions(set<SourceUnit const*, ASTNode::CompareByI
|
||||
auto contract = dynamic_cast<ContractDefinition const*>(node.get());
|
||||
contract && contract->isLibrary()
|
||||
)
|
||||
{
|
||||
for (auto function: contract->definedFunctions())
|
||||
if (!function->isPublic())
|
||||
// We need to add public library functions too because they can be called
|
||||
// internally by internal library functions that are considered free functions.
|
||||
m_freeFunctions.insert(function);
|
||||
}
|
||||
}
|
||||
|
||||
void SMTEncoder::createFreeConstants(set<SourceUnit const*, ASTNode::CompareByID> const& _sources)
|
||||
{
|
||||
|
@ -29,6 +29,10 @@ using namespace solidity::frontend::test;
|
||||
|
||||
SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, EVMVersion{})
|
||||
{
|
||||
auto contract = m_reader.stringSetting("SMTContract", "");
|
||||
if (!contract.empty())
|
||||
m_modelCheckerSettings.contracts.contracts[""] = {contract};
|
||||
|
||||
auto const& showUnproved = m_reader.stringSetting("SMTShowUnproved", "yes");
|
||||
if (showUnproved == "no")
|
||||
m_modelCheckerSettings.showUnproved = false;
|
||||
|
@ -0,0 +1,26 @@
|
||||
library L {
|
||||
function f1(uint x) public pure {
|
||||
assert(x > 0); // should fail
|
||||
}
|
||||
function f(uint x) internal pure { f1(x); }
|
||||
}
|
||||
|
||||
contract C {
|
||||
function g(uint x) external pure {
|
||||
// This should trigger the assertion failure
|
||||
// since it calls `f` internally, which calls
|
||||
// `f1` internally.
|
||||
return L.f(x);
|
||||
}
|
||||
|
||||
function h(uint x) external pure {
|
||||
// This should not trigger the assertion failure
|
||||
// since it delegatecalls and that's not supported.
|
||||
return L.f1(x);
|
||||
}
|
||||
}
|
||||
// ====
|
||||
// SMTContract: C
|
||||
// ----
|
||||
// Warning 4588: (533-540): Assertion checker does not yet implement this type of function call.
|
||||
// Warning 6328: (58-71): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)\n L.f(0) -- internal call\n L.f1(0) -- internal call
|
@ -0,0 +1,24 @@
|
||||
library L {
|
||||
function f1(uint x) public pure {
|
||||
assert(x > 0); // should fail
|
||||
}
|
||||
function f() internal pure {
|
||||
f1(0); // should cause the assertion in `f1` to fail
|
||||
}
|
||||
function g() internal pure {
|
||||
f1(1); // should not cause the assertion in `f1` to fail
|
||||
}
|
||||
}
|
||||
|
||||
contract C {
|
||||
function f() external pure {
|
||||
return L.f(); // should cause the assertion to fail
|
||||
}
|
||||
function g() external pure {
|
||||
return L.g(); // should not cause the assertion to fail
|
||||
}
|
||||
}
|
||||
// ====
|
||||
// SMTContract: C
|
||||
// ----
|
||||
// Warning 6328: (58-71): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()\n L.f() -- internal call\n L.f1(0) -- internal call
|
Loading…
Reference in New Issue
Block a user