cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SMTChecker] Handle InaccessibleDynamicType

Browse Source
This commit is contained in:
Martin Blicha 2021-03-16 21:55:45 +01:00
parent a27c9c39b2
commit 852e877ae7
8 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -8,6 +8,7 @@ Compiler Features:
Bugfixes:
* AST Output: Fix ``kind`` field of ``ModifierInvocation`` for base constructor calls.
* SMTChecker: Fix internal error on public getter returning dynamic data on older EVM versions where these are not available.
AST Changes:

14
libsolidity/formal/SMTEncoder.cpp
View File

@ -2443,14 +2443,13 @@ void SMTEncoder::createExpr(Expression const& _e)
void SMTEncoder::defineExpr(Expression const& _e, smtutil::Expression _value)
{
auto type = _e.annotation().type;
createExpr(_e);
solAssert(_value.sort->kind != smtutil::Kind::Function, "Equality operator applied to type that is not fully supported");
m_context.addAssertion(expr(_e) == _value);
if (!smt::isInaccessibleDynamic(*type))
m_context.addAssertion(expr(_e) == _value);
if (
auto type = _e.annotation().type;
m_checked && smt::isNumber(*type)
)
if (m_checked && smt::isNumber(*type))
m_context.addAssertion(smtutil::Expression::implies(
currentPathConditions(),
smt::symbolicUnknownConstraints(expr(_e), type)
@ -2469,8 +2468,11 @@ void SMTEncoder::defineExpr(Expression const& _e, vector<optional<smtutil::Expre
symbTuple->increaseIndex();
auto const& symbComponents = symbTuple->components();
solAssert(symbComponents.size() == _values.size(), "");
auto tupleType = dynamic_cast<TupleType const*>(_e.annotation().type);
solAssert(tupleType, "");
solAssert(tupleType->components().size() == symbComponents.size(), "");
for (unsigned i = 0; i < symbComponents.size(); ++i)
if (_values[i])
if (_values[i] && !smt::isInaccessibleDynamic(*tupleType->components()[i]))
m_context.addAssertion(symbTuple->component(i) == *_values[i]);
}

5
libsolidity/formal/SymbolicTypes.cpp
View File

@ -386,6 +386,11 @@ bool isNonRecursiveStruct(frontend::Type const& _type)
return structType && !structType->recursive();
}
bool isInaccessibleDynamic(frontend::Type const& _type)
{
return _type.category() == frontend::Type::Category::InaccessibleDynamic;
}
smtutil::Expression minValue(frontend::IntegerType const& _type)
{
return smtutil::Expression(_type.minValue());

1
libsolidity/formal/SymbolicTypes.h
View File

@ -59,6 +59,7 @@ bool isArray(frontend::Type const& _type);
bool isTuple(frontend::Type const& _type);
bool isStringLiteral(frontend::Type const& _type);
bool isNonRecursiveStruct(frontend::Type const& _type);
bool isInaccessibleDynamic(frontend::Type const& _type);
/// Returns a new symbolic variable, according to _type.
/// Also returns whether the type is abstract or not,

15
test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_1.sol Normal file
View File

@ -0,0 +1,15 @@
pragma experimental SMTChecker;
contract C {
struct S {
string a;
uint256 y;
}
S public s;
function g() public view returns (uint256) {
this.s();
}
}
// ====
// EVMVersion: <=spuriousDragon
// ----
// Warning 6321: (133-140): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.

10
test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_2.sol Normal file
View File

@ -0,0 +1,10 @@
pragma experimental SMTChecker;
contract C {
function f() public returns(bool[]memory) {
this.f();
}
}
// ====
// EVMVersion: <=spuriousDragon
// ----
// Warning 6321: (74-86): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.

14
test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_3.sol Normal file
View File

@ -0,0 +1,14 @@
pragma experimental SMTChecker;
contract C {
struct S {
string a;
}
S public s;
function g() public view returns (uint256) {
this.s();
}
}
// ====
// EVMVersion: <=spuriousDragon
// ----
// Warning 6321: (120-127): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.

11
test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_4.sol Normal file
View File

@ -0,0 +1,11 @@
pragma experimental SMTChecker;
contract C {
string public s;
function g() public view returns (uint256) {
this.s();
}
}
// ====
// EVMVersion: <=spuriousDragon
// ----
// Warning 6321: (98-105): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.