aboutsummaryrefslogtreecommitdiffstats
path: root/test/libsolidity/Assembly.cpp
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-12-18 18:36:58 +0800
committerGitHub <noreply@github.com>2018-12-18 18:36:58 +0800
commit4e475cdbe91e38e7b129248d4578b3a4fbf926be (patch)
tree5dbf391d521abb7e87338efe8da0d3129a19fbab /test/libsolidity/Assembly.cpp
parent4b43aecaeb44651568f7d6590e41fdf3a497ff26 (diff)
parent1b8570f829ead5859c60e92e51e814e3baa50dc9 (diff)
downloaddexon-solidity-4e475cdbe91e38e7b129248d4578b3a4fbf926be.tar
dexon-solidity-4e475cdbe91e38e7b129248d4578b3a4fbf926be.tar.gz
dexon-solidity-4e475cdbe91e38e7b129248d4578b3a4fbf926be.tar.bz2
dexon-solidity-4e475cdbe91e38e7b129248d4578b3a4fbf926be.tar.lz
dexon-solidity-4e475cdbe91e38e7b129248d4578b3a4fbf926be.tar.xz
dexon-solidity-4e475cdbe91e38e7b129248d4578b3a4fbf926be.tar.zst
dexon-solidity-4e475cdbe91e38e7b129248d4578b3a4fbf926be.zip
Merge pull request #5625 from ethereum/single-check
Do check for callvalue only once if no payable functions
Diffstat (limited to 'test/libsolidity/Assembly.cpp')
-rw-r--r--test/libsolidity/Assembly.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
index aa10147c..5d8c89a4 100644
--- a/test/libsolidity/Assembly.cpp
+++ b/test/libsolidity/Assembly.cpp
@@ -165,14 +165,14 @@ BOOST_AUTO_TEST_CASE(location_test)
auto codegenCharStream = make_shared<CharStream>("", "--CODEGEN--");
vector<SourceLocation> locations =
- vector<SourceLocation>(hasShifts ? 21 : 22, SourceLocation(2, 82, sourceCode)) +
- vector<SourceLocation>(2, SourceLocation(20, 79, sourceCode)) +
- vector<SourceLocation>(1, SourceLocation(8, 17, codegenCharStream)) +
- vector<SourceLocation>(3, SourceLocation(5, 7, codegenCharStream)) +
+ vector<SourceLocation>(4, SourceLocation(2, 82, sourceCode)) +
+ vector<SourceLocation>(1, SourceLocation(8, 17, codegenCharStream)) +
+ vector<SourceLocation>(3, SourceLocation(5, 7, codegenCharStream)) +
vector<SourceLocation>(1, SourceLocation(30, 31, codegenCharStream)) +
vector<SourceLocation>(1, SourceLocation(27, 28, codegenCharStream)) +
vector<SourceLocation>(1, SourceLocation(20, 32, codegenCharStream)) +
- vector<SourceLocation>(1, SourceLocation(5, 7, codegenCharStream)) +
+ vector<SourceLocation>(1, SourceLocation(5, 7, codegenCharStream)) +
+ vector<SourceLocation>(hasShifts ? 19 : 20, SourceLocation(2, 82, sourceCode)) +
vector<SourceLocation>(24, SourceLocation(20, 79, sourceCode)) +
vector<SourceLocation>(1, SourceLocation(49, 58, sourceCode)) +
vector<SourceLocation>(1, SourceLocation(72, 74, sourceCode)) +