cerc-io/solidity
10
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

Make most of the parameters mandatory in encodeToMemory

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-09-26 18:50:43 +01:00
parent 9c62647f19
commit a657d3b1a1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsolidity/codegen/CompilerUtils.h
View File

@ -102,10 +102,10 @@ public:
/// @note the locations of target reference types are ignored, because it will always be /// @note the locations of target reference types are ignored, because it will always be
/// memory. /// memory.
void encodeToMemory( void encodeToMemory(
TypePointers const& _givenTypes = {}, TypePointers const& _givenTypes,
TypePointers const& _targetTypes = {}, TypePointers const& _targetTypes,
bool _padToWords = true, bool _padToWords,
bool _copyDynamicDataInPlace = false, bool _copyDynamicDataInPlace,
bool _encodeAsLibraryTypes = false bool _encodeAsLibraryTypes = false
); );

4
libsolidity/codegen/ExpressionCompiler.cpp
View File

@ -581,7 +581,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
_context << Instruction::ADD; _context << Instruction::ADD;
} }
); );
utils().encodeToMemory(argumentTypes, function.parameterTypes()); utils().encodeToMemory(argumentTypes, function.parameterTypes(), true, false);
// now on stack: memory_end_ptr // now on stack: memory_end_ptr
// need: size, offset, endowment // need: size, offset, endowment
utils().toSizeAfterFreeMemoryPointer(); utils().toSizeAfterFreeMemoryPointer();
@ -751,7 +751,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
nonIndexedParamTypes.push_back(function.parameterTypes()[arg]); nonIndexedParamTypes.push_back(function.parameterTypes()[arg]);
} }
utils().fetchFreeMemoryPointer(); utils().fetchFreeMemoryPointer();
utils().encodeToMemory(nonIndexedArgTypes, nonIndexedParamTypes); utils().encodeToMemory(nonIndexedArgTypes, nonIndexedParamTypes, true, false);
// need: topic1 ... topicn memsize memstart // need: topic1 ... topicn memsize memstart
utils().toSizeAfterFreeMemoryPointer(); utils().toSizeAfterFreeMemoryPointer();
m_context << logInstruction(numIndexed); m_context << logInstruction(numIndexed);