mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Fixes after rebase
This commit is contained in:
parent
f09c6fffc9
commit
337b952f53
@ -856,8 +856,8 @@ unsigned ExpressionCompiler::appendSameTypeArgumentsCopyToMemory(TypePointer con
|
|||||||
return length;
|
return length;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned ExpressionCompiler::appendExpressionCopyToMemory(Type const& _expectedType,
|
unsigned ExpressionCompiler::appendTypeConversionAndMoveToMemory(Type const& _expectedType, Type const& _type,
|
||||||
Expression const& _expression, unsigned _memoryOffset)
|
Location const& _location, unsigned _memoryOffset)
|
||||||
{
|
{
|
||||||
appendTypeConversion(_type, _expectedType, true);
|
appendTypeConversion(_type, _expectedType, true);
|
||||||
unsigned const c_numBytes = CompilerUtils::getPaddedSize(_expectedType.getCalldataEncodedSize());
|
unsigned const c_numBytes = CompilerUtils::getPaddedSize(_expectedType.getCalldataEncodedSize());
|
||||||
|
@ -97,6 +97,10 @@ private:
|
|||||||
unsigned appendArgumentsCopyToMemory(TypePointers const& _types,
|
unsigned appendArgumentsCopyToMemory(TypePointers const& _types,
|
||||||
std::vector<ASTPointer<Expression const>> const& _arguments,
|
std::vector<ASTPointer<Expression const>> const& _arguments,
|
||||||
unsigned _memoryOffset = 0);
|
unsigned _memoryOffset = 0);
|
||||||
|
/// Appends code that copies a type to memory.
|
||||||
|
/// @returns the number of bytes copied to memory
|
||||||
|
unsigned appendTypeConversionAndMoveToMemory(Type const& _expectedType, Type const& _type,
|
||||||
|
Location const& _location, unsigned _memoryOffset = 0);
|
||||||
/// Appends code that copies the given arguments that should all have the
|
/// Appends code that copies the given arguments that should all have the
|
||||||
/// same @a _type to memory (with optional offset).
|
/// same @a _type to memory (with optional offset).
|
||||||
/// @returns the number of bytes copied to memory
|
/// @returns the number of bytes copied to memory
|
||||||
|
Loading…
Reference in New Issue
Block a user