diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-05-09 20:43:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-09 20:43:09 +0800 |
| commit | c80c422bfe8e9e518365495f9811ae61a5c0ecc2 (patch) | |
| tree | a448d572df111ba938bbca43098864852507236a /libjulia/optimiser/InlinableExpressionFunctionFinder.cpp | |
| parent | 87826a7d87991f9c054d27def6fb9a79eb18e3ae (diff) | |
| parent | 591c591af05f29bf42b8b162a4fcda5a9a8fae9f (diff) | |
| download | dexon-solidity-c80c422bfe8e9e518365495f9811ae61a5c0ecc2.tar dexon-solidity-c80c422bfe8e9e518365495f9811ae61a5c0ecc2.tar.gz dexon-solidity-c80c422bfe8e9e518365495f9811ae61a5c0ecc2.tar.bz2 dexon-solidity-c80c422bfe8e9e518365495f9811ae61a5c0ecc2.tar.lz dexon-solidity-c80c422bfe8e9e518365495f9811ae61a5c0ecc2.tar.xz dexon-solidity-c80c422bfe8e9e518365495f9811ae61a5c0ecc2.tar.zst dexon-solidity-c80c422bfe8e9e518365495f9811ae61a5c0ecc2.zip | |
Merge pull request #4100 from ethereum/julia-exceptions
Avoid using solAssert in libjulia
Diffstat (limited to 'libjulia/optimiser/InlinableExpressionFunctionFinder.cpp')
| -rw-r--r-- | libjulia/optimiser/InlinableExpressionFunctionFinder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjulia/optimiser/InlinableExpressionFunctionFinder.cpp b/libjulia/optimiser/InlinableExpressionFunctionFinder.cpp index 2097e091..e237063d 100644 --- a/libjulia/optimiser/InlinableExpressionFunctionFinder.cpp +++ b/libjulia/optimiser/InlinableExpressionFunctionFinder.cpp @@ -20,9 +20,9 @@ #include <libjulia/optimiser/InlinableExpressionFunctionFinder.h> -#include <libsolidity/inlineasm/AsmData.h> +#include <libjulia/optimiser/Utilities.h> -#include <libsolidity/interface/Exceptions.h> +#include <libsolidity/inlineasm/AsmData.h> using namespace std; using namespace dev; @@ -56,7 +56,7 @@ void InlinableExpressionFunctionFinder::operator()(FunctionDefinition const& _fu // We cannot overwrite previous settings, because this function definition // would not be valid here if we were searching inside a functionally inlinable // function body. - solAssert(m_disallowedIdentifiers.empty() && !m_foundDisallowedIdentifier, ""); + assertThrow(m_disallowedIdentifiers.empty() && !m_foundDisallowedIdentifier, OptimizerException, ""); m_disallowedIdentifiers = set<string>{retVariable, _function.name}; boost::apply_visitor(*this, *assignment.value); if (!m_foundDisallowedIdentifier) |