aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AST.cpp7
-rw-r--r--ExpressionCompiler.cpp54
-rw-r--r--ExpressionCompiler.h9
-rw-r--r--Types.cpp7
-rw-r--r--Types.h7
5 files changed, 61 insertions, 23 deletions
diff --git a/AST.cpp b/AST.cpp
index 0ec0eb0c..6f5b1f38 100644
--- a/AST.cpp
+++ b/AST.cpp
@@ -489,15 +489,18 @@ void FunctionCall::checkTypeRequirements()
// and then ask if that is implicitly convertible to the struct represented by the
// function parameters
TypePointers const& parameterTypes = functionType->getParameterTypes();
- if (parameterTypes.size() != m_arguments.size())
+ if (functionType->getLocation() != FunctionType::Location::SHA3 && parameterTypes.size() != m_arguments.size())
BOOST_THROW_EXCEPTION(createTypeError("Wrong argument count for function call."));
if (m_names.empty())
{
for (size_t i = 0; i < m_arguments.size(); ++i)
- if (!m_arguments[i]->getType()->isImplicitlyConvertibleTo(*parameterTypes[i]))
+ if (functionType->getLocation() != FunctionType::Location::SHA3 &&
+ !m_arguments[i]->getType()->isImplicitlyConvertibleTo(*parameterTypes[i]))
BOOST_THROW_EXCEPTION(createTypeError("Invalid type for argument in function call."));
}
+ else if (functionType->getLocation() == FunctionType::Location::SHA3)
+ BOOST_THROW_EXCEPTION(createTypeError("Named arguments can't be used for SHA3."));
else
{
auto const& parameterNames = functionType->getParameterNames();
diff --git a/ExpressionCompiler.cpp b/ExpressionCompiler.cpp
index f0c3af22..4a1110db 100644
--- a/ExpressionCompiler.cpp
+++ b/ExpressionCompiler.cpp
@@ -206,7 +206,8 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
TypePointers const& parameterTypes = function.getParameterTypes();
vector<ASTPointer<Expression const>> const& callArguments = _functionCall.getArguments();
vector<ASTPointer<ASTString>> const& callArgumentNames = _functionCall.getNames();
- solAssert(callArguments.size() == parameterTypes.size(), "");
+ if (function.getLocation() != Location::SHA3)
+ solAssert(callArguments.size() == parameterTypes.size(), "");
vector<ASTPointer<Expression const>> arguments;
if (callArgumentNames.empty())
@@ -274,7 +275,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
m_context << u256(0) << eth::Instruction::CODECOPY;
unsigned length = bytecode.size();
- length += appendArgumentCopyToMemory(function.getParameterTypes(), arguments, length);
+ length += appendArgumentsCopyToMemory(arguments, function.getParameterTypes(), length);
// size, offset, endowment
m_context << u256(length) << u256(0);
if (function.valueSet())
@@ -325,9 +326,11 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
m_context << eth::Instruction::SUICIDE;
break;
case Location::SHA3:
- appendExpressionCopyToMemory(*function.getParameterTypes().front(), *arguments.front());
- m_context << u256(32) << u256(0) << eth::Instruction::SHA3;
+ {
+ unsigned length = appendArgumentsCopyToMemory(arguments);
+ m_context << u256(length) << u256(0) << eth::Instruction::SHA3;
break;
+ }
case Location::LOG0:
case Location::LOG1:
case Location::LOG2:
@@ -797,7 +800,7 @@ void ExpressionCompiler::appendExternalFunctionCall(FunctionType const& _functio
// reserve space for the function identifier
unsigned dataOffset = bare ? 0 : CompilerUtils::dataStartOffset;
- dataOffset += appendArgumentCopyToMemory(_functionType.getParameterTypes(), _arguments, dataOffset);
+ dataOffset += appendArgumentsCopyToMemory(_arguments, _functionType.getParameterTypes(), dataOffset);
//@todo only return the first return value for now
Type const* firstType = _functionType.getReturnParameterTypes().empty() ? nullptr :
@@ -833,28 +836,45 @@ void ExpressionCompiler::appendExternalFunctionCall(FunctionType const& _functio
}
}
-unsigned ExpressionCompiler::appendArgumentCopyToMemory(TypePointers const& _types,
- vector<ASTPointer<Expression const>> const& _arguments,
- unsigned _memoryOffset)
+unsigned ExpressionCompiler::appendArgumentsCopyToMemory(vector<ASTPointer<Expression const>> const& _arguments,
+ TypePointers const& _types,
+ unsigned _memoryOffset)
{
unsigned length = 0;
+ if (!_types.empty())
+ {
+ for (unsigned i = 0; i < _arguments.size(); ++i)
+ length += appendExpressionCopyToMemory(*_types[i], *_arguments[i], _memoryOffset + length);
+ return length;
+ }
+
+ // without type conversion
for (unsigned i = 0; i < _arguments.size(); ++i)
- length += appendExpressionCopyToMemory(*_types[i], *_arguments[i], _memoryOffset + length);
+ {
+ const bool wantPadding = false;
+ _arguments[i]->accept(*this);
+ length += moveTypeToMemory(*_arguments[i]->getType()->getRealType(), _arguments[i]->getLocation(), _memoryOffset + length, wantPadding);
+ }
return length;
}
-unsigned ExpressionCompiler::appendTypeConversionAndMoveToMemory(Type const& _expectedType, Type const& _type,
- Location const& _location, unsigned _memoryOffset)
+unsigned ExpressionCompiler::moveTypeToMemory(Type const& _type, Location const& _location, unsigned _memoryOffset, bool _padToWordBoundaries)
{
- appendTypeConversion(_type, _expectedType, true);
- unsigned const c_numBytes = CompilerUtils::getPaddedSize(_expectedType.getCalldataEncodedSize());
+ unsigned const c_encodedSize = _type.getCalldataEncodedSize();
+ unsigned const c_numBytes = _padToWordBoundaries ? CompilerUtils::getPaddedSize(c_encodedSize) : c_encodedSize;
if (c_numBytes == 0 || c_numBytes > 32)
BOOST_THROW_EXCEPTION(CompilerError()
<< errinfo_sourceLocation(_location)
- << errinfo_comment("Type " + _expectedType.toString() + " not yet supported."));
- bool const c_leftAligned = _expectedType.getCategory() == Type::Category::STRING;
- bool const c_padToWords = true;
- return CompilerUtils(m_context).storeInMemory(_memoryOffset, c_numBytes, c_leftAligned, c_padToWords);
+ << errinfo_comment("Type " + _type.toString() + " not yet supported."));
+ bool const c_leftAligned = _type.getCategory() == Type::Category::STRING;
+ return CompilerUtils(m_context).storeInMemory(_memoryOffset, c_numBytes, c_leftAligned, _padToWordBoundaries);
+}
+
+unsigned ExpressionCompiler::appendTypeConversionAndMoveToMemory(Type const& _expectedType, Type const& _type,
+ Location const& _location, unsigned _memoryOffset)
+{
+ appendTypeConversion(_type, _expectedType, true);
+ return moveTypeToMemory(_expectedType, _location, _memoryOffset);
}
unsigned ExpressionCompiler::appendExpressionCopyToMemory(Type const& _expectedType,
diff --git a/ExpressionCompiler.h b/ExpressionCompiler.h
index 7de577e6..006858cb 100644
--- a/ExpressionCompiler.h
+++ b/ExpressionCompiler.h
@@ -94,13 +94,16 @@ private:
bool bare = false);
/// Appends code that copies the given arguments to memory (with optional offset).
/// @returns the number of bytes copied to memory
- unsigned appendArgumentCopyToMemory(TypePointers const& _types,
- std::vector<ASTPointer<Expression const>> const& _arguments,
- unsigned _memoryOffset = 0);
+ unsigned appendArgumentsCopyToMemory(std::vector<ASTPointer<Expression const>> const& _arguments,
+ TypePointers const& _types = {},
+ 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 moves a type to memory
+ /// @returns the number of bytes copied to memory
+ unsigned moveTypeToMemory(Type const& _type, Location const& _location, unsigned _memoryOffset, bool _padToWordBoundaries = true);
/// Appends code that evaluates a single expression and copies it to memory (with optional offset).
/// @returns the number of bytes copied to memory
unsigned appendExpressionCopyToMemory(Type const& _expectedType, Expression const& _expression,
diff --git a/Types.cpp b/Types.cpp
index e6f1e8e1..7a7672c6 100644
--- a/Types.cpp
+++ b/Types.cpp
@@ -357,6 +357,13 @@ u256 IntegerConstantType::literalValue(Literal const*) const
return value;
}
+TypePointer IntegerConstantType::getRealType() const
+{
+ auto intType = getIntegerType();
+ solAssert(!!intType, std::string("getRealType called with invalid integer constant") + toString());
+ return intType;
+}
+
shared_ptr<IntegerType const> IntegerConstantType::getIntegerType() const
{
bigint value = m_value;
diff --git a/Types.h b/Types.h
index fcc77fea..7118f746 100644
--- a/Types.h
+++ b/Types.h
@@ -130,6 +130,8 @@ public:
/// i.e. it behaves differently in lvalue context and in value context.
virtual bool isValueType() const { return false; }
virtual unsigned getSizeOnStack() const { return 1; }
+ /// @returns the real type of some types, like e.g: IntegerConstant
+ virtual TypePointer getRealType() const { return shared_from_this(); }
/// Returns the list of all members of this type. Default implementation: no members.
virtual MemberList const& getMembers() const { return EmptyMemberList; }
@@ -140,7 +142,7 @@ public:
virtual u256 literalValue(Literal const*) const
{
BOOST_THROW_EXCEPTION(InternalCompilerError() << errinfo_comment("Literal value requested "
- "for type without literals."));
+ "for type without literals."));
}
protected:
@@ -175,6 +177,7 @@ public:
virtual MemberList const& getMembers() const { return isAddress() ? AddressMemberList : EmptyMemberList; }
virtual std::string toString() const override;
+ virtual TypePointer getRealType() const { return std::make_shared<IntegerType>(m_bits, m_modifier); }
int getNumBits() const { return m_bits; }
bool isHash() const { return m_modifier == Modifier::HASH || m_modifier == Modifier::ADDRESS; }
@@ -213,6 +216,7 @@ public:
virtual std::string toString() const override;
virtual u256 literalValue(Literal const* _literal) const override;
+ virtual TypePointer getRealType() const override;
/// @returns the smallest integer type that can hold the value or an empty pointer if not possible.
std::shared_ptr<IntegerType const> getIntegerType() const;
@@ -244,6 +248,7 @@ public:
virtual std::string toString() const override { return "string" + dev::toString(m_bytes); }
virtual u256 literalValue(Literal const* _literal) const override;
+ virtual TypePointer getRealType() const override { return std::make_shared<StaticStringType>(m_bytes); }
int getNumBytes() const { return m_bytes; }
generated by cgit (git 2.34.1) at 2024-11-14 08:07:01 +0800