cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10849 from ethereum/fixMergeConflict

Browse Source 
Fix merge conflict.
This commit is contained in:
chriseth 2021-01-26 15:14:08 +01:00 committed by GitHub
commit 2f2d2224b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libsolidity/codegen/ir/IRGeneratorForStatements.cpp
View File

@ -2454,7 +2454,6 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
templ("retVars", retVars);
solAssert(retVars.empty() == returnInfo.returnTypes.empty(), "");
templ("roundUp", m_utils.roundUpFunction());
templ("abiDecode", m_context.abiFunctions().tupleDecoder(returnInfo.returnTypes, true));
templ("dynamicReturnSize", returnInfo.dynamicReturnSize);