diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-10-04 21:11:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 21:11:43 +0800 |
| commit | 66b188cce9a7f17c51b7a58c1296d574ad34fa61 (patch) | |
| tree | 0327f70c9861519208c4dda673f9071b1eebfbae | |
| parent | f6fb7d96d3eb0d45ee93fbe25f01cb9f06b28b78 (diff) | |
| parent | a9847c955106dbf74d47d68122a634c787e0d00b (diff) | |
| download | dexon-solidity-66b188cce9a7f17c51b7a58c1296d574ad34fa61.tar dexon-solidity-66b188cce9a7f17c51b7a58c1296d574ad34fa61.tar.gz dexon-solidity-66b188cce9a7f17c51b7a58c1296d574ad34fa61.tar.bz2 dexon-solidity-66b188cce9a7f17c51b7a58c1296d574ad34fa61.tar.lz dexon-solidity-66b188cce9a7f17c51b7a58c1296d574ad34fa61.tar.xz dexon-solidity-66b188cce9a7f17c51b7a58c1296d574ad34fa61.tar.zst dexon-solidity-66b188cce9a7f17c51b7a58c1296d574ad34fa61.zip | |
Merge pull request #3022 from ethereum/assert
Use solAssert and not assert
| -rw-r--r-- | libsolidity/ast/Types.cpp | 2 | ||||
| -rw-r--r-- | libsolidity/formal/Z3Interface.cpp | 2 | ||||
| -rw-r--r-- | libsolidity/interface/GasEstimator.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index a39b5775..a3cbe50a 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -89,7 +89,7 @@ pair<u256, unsigned> const* StorageOffsets::offset(size_t _index) const MemberList& MemberList::operator=(MemberList&& _other) { - assert(&_other != this); + solAssert(&_other != this, ""); m_memberTypes = move(_other.m_memberTypes); m_storageOffsets = move(_other.m_storageOffsets); diff --git a/libsolidity/formal/Z3Interface.cpp b/libsolidity/formal/Z3Interface.cpp index fbbd7a58..0ceed3a7 100644 --- a/libsolidity/formal/Z3Interface.cpp +++ b/libsolidity/formal/Z3Interface.cpp @@ -135,7 +135,7 @@ z3::expr Z3Interface::toZ3Expr(Expression const& _expr) return m_context.int_val(n.c_str()); } - assert(arity.count(n) && arity.at(n) == arguments.size()); + solAssert(arity.count(n) && arity.at(n) == arguments.size(), ""); if (n == "ite") return z3::ite(arguments[0], arguments[1], arguments[2]); else if (n == "not") diff --git a/libsolidity/interface/GasEstimator.cpp b/libsolidity/interface/GasEstimator.cpp index 852b392c..22cc0266 100644 --- a/libsolidity/interface/GasEstimator.cpp +++ b/libsolidity/interface/GasEstimator.cpp @@ -48,7 +48,7 @@ GasEstimator::ASTGasConsumptionSelfAccumulated GasEstimator::structuralEstimatio ControlFlowGraph cfg(_items); for (BasicBlock const& block: cfg.optimisedBlocks()) { - assertThrow(!!block.startState, OptimizerException, ""); + solAssert(!!block.startState, ""); GasMeter meter(block.startState->copy()); auto const end = _items.begin() + block.end; for (auto iter = _items.begin() + block.begin; iter != end; ++iter) |