diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-08-08 18:27:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 18:27:37 +0800 |
| commit | 64e3c9913f6ecfde8f2fe0121c93e92080916b95 (patch) | |
| tree | 758b8c8cc5e4ff4f12d0f7cbd824982e4adad8ce /libsolidity/codegen/CompilerUtils.cpp | |
| parent | 4dc3335cda18bae7c683227a9795a7cc1de95fd2 (diff) | |
| parent | b11e39e25ee14b2d56db86ea48e3229a7a6cad52 (diff) | |
| download | dexon-solidity-64e3c9913f6ecfde8f2fe0121c93e92080916b95.tar.gz dexon-solidity-64e3c9913f6ecfde8f2fe0121c93e92080916b95.tar.zst dexon-solidity-64e3c9913f6ecfde8f2fe0121c93e92080916b95.zip | |
Merge pull request #4736 from ethereum/removeFillRight
Remove remaining instances of ``fillRight``.
Diffstat (limited to 'libsolidity/codegen/CompilerUtils.cpp')
| -rw-r--r-- | libsolidity/codegen/CompilerUtils.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp index bd3ec8f5..b30851fb 100644 --- a/libsolidity/codegen/CompilerUtils.cpp +++ b/libsolidity/codegen/CompilerUtils.cpp @@ -947,20 +947,12 @@ void CompilerUtils::convertType( { TupleType const& sourceTuple = dynamic_cast<TupleType const&>(_typeOnStack); TupleType const& targetTuple = dynamic_cast<TupleType const&>(_targetType); - // fillRight: remove excess values at right side, !fillRight: remove eccess values at left side - bool fillRight = !targetTuple.components().empty() && ( - !targetTuple.components().back() || - targetTuple.components().front() - ); + solAssert(targetTuple.components().size() == sourceTuple.components().size(), ""); unsigned depth = sourceTuple.sizeOnStack(); for (size_t i = 0; i < sourceTuple.components().size(); ++i) { TypePointer sourceType = sourceTuple.components()[i]; - TypePointer targetType; - if (fillRight && i < targetTuple.components().size()) - targetType = targetTuple.components()[i]; - else if (!fillRight && targetTuple.components().size() + i >= sourceTuple.components().size()) - targetType = targetTuple.components()[targetTuple.components().size() - (sourceTuple.components().size() - i)]; + TypePointer targetType = targetTuple.components()[i]; if (!sourceType) { solAssert(!targetType, ""); |