cerc-io/solidity
15
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

Merge pull request #11482 from ethereum/fixUnreachable2

Browse Source 
Fix control-flow handling of modifiers without body.
This commit is contained in:
chriseth 2021-06-03 16:56:05 +02:00 committed by GitHub
commit a8ffa6c08d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/analysis/ControlFlowBuilder.cpp
View File

@ -308,7 +308,7 @@ bool ControlFlowBuilder::visit(ModifierInvocation const& _modifierInvocation)
_modifierInvocation.name().annotation().referencedDeclaration _modifierInvocation.name().annotation().referencedDeclaration
); );
if (!modifierDefinition) return false; if (!modifierDefinition) return false;
solAssert(!!modifierDefinition, ""); if (!modifierDefinition->isImplemented()) return false;
solAssert(!!m_returnNode, ""); solAssert(!!m_returnNode, "");
m_placeholderEntry = newLabel(); m_placeholderEntry = newLabel();

5
libsolidity/analysis/ControlFlowBuilder.h
View File

@ -29,9 +29,8 @@
namespace solidity::frontend namespace solidity::frontend
{ {
/** Helper class that builds the control flow of a function or modifier. /**
* Modifiers are not yet applied to the functions. This is done in a second * Helper class that builds the control flow of a function or modifier.
* step in the CFG class.
*/ */
class ControlFlowBuilder: private ASTConstVisitor, private yul::ASTWalker class ControlFlowBuilder: private ASTConstVisitor, private yul::ASTWalker
{ {

1
test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_2.sol
View File

@ -23,5 +23,4 @@ contract C is B {
// ==== // ====
// SMTEngine: all // SMTEngine: all
// ---- // ----
// Warning 5740: (62-111): Unreachable code.
// Warning 6328: (66-75): CHC: Assertion violation happens here.\nCounterexample:\ns = false\n\nTransaction trace:\nB.constructor()\nState: s = false\nA.f() // Warning 6328: (66-75): CHC: Assertion violation happens here.\nCounterexample:\ns = false\n\nTransaction trace:\nB.constructor()\nState: s = false\nA.f()

1
test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_3.sol
View File

@ -18,5 +18,4 @@ contract B is A {
// ==== // ====
// SMTEngine: all // SMTEngine: all
// ---- // ----
// Warning 5740: (62-123): Unreachable code.
// Warning 6328: (94-104): CHC: Assertion violation happens here.\nCounterexample:\ns = true\nx = true\n\nTransaction trace:\nB.constructor()\nState: s = false\nA.f() // Warning 6328: (94-104): CHC: Assertion violation happens here.\nCounterexample:\ns = true\nx = true\n\nTransaction trace:\nB.constructor()\nState: s = false\nA.f()

8
test/libsolidity/syntaxTests/controlFlow/modifiers/implemented_without_placeholder.sol Normal file
View File

@ -0,0 +1,8 @@
abstract contract A {
function f() public view mod {
require(block.timestamp > 10);
}
modifier mod() virtual { }
}
// ----
// SyntaxError 2883: (129-132): Modifier body does not contain '_'.

6
test/libsolidity/syntaxTests/controlFlow/modifiers/non_implemented_modifer.sol Normal file
View File

@ -0,0 +1,6 @@
abstract contract A {
function f() public view mod {
require(block.timestamp > 10);
}
modifier mod() virtual;
}