aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-10-04 20:05:55 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-10-04 20:05:55 +0800
commita9847c955106dbf74d47d68122a634c787e0d00b (patch)
tree47de56afd35f31d69cc4aa2030544ddc92769224
parent30908415bfdb463adafc4aabab48cbe56d105012 (diff)
downloaddexon-solidity-a9847c955106dbf74d47d68122a634c787e0d00b.tar
dexon-solidity-a9847c955106dbf74d47d68122a634c787e0d00b.tar.gz
dexon-solidity-a9847c955106dbf74d47d68122a634c787e0d00b.tar.bz2
dexon-solidity-a9847c955106dbf74d47d68122a634c787e0d00b.tar.lz
dexon-solidity-a9847c955106dbf74d47d68122a634c787e0d00b.tar.xz
dexon-solidity-a9847c955106dbf74d47d68122a634c787e0d00b.tar.zst
dexon-solidity-a9847c955106dbf74d47d68122a634c787e0d00b.zip
Use solAssert and not assert
-rw-r--r--libsolidity/ast/Types.cpp2
-rw-r--r--libsolidity/formal/Z3Interface.cpp2
-rw-r--r--libsolidity/interface/GasEstimator.cpp2
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 522928f0..21bad2d6 100644
--- a/libsolidity/formal/Z3Interface.cpp
+++ b/libsolidity/formal/Z3Interface.cpp
@@ -142,7 +142,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)