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

Change references to FunctionType::Location

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-03-16 11:58:17 +00:00
parent 7123f25210
commit 3ae88377d6
8 changed files with 124 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libsolidity/analysis/GlobalContext.cpp
View File

@ -39,39 +39,39 @@ m_magicVariables(vector<shared_ptr<MagicVariableDeclaration const>>{make_shared<
make_shared<MagicVariableDeclaration>("tx", make_shared<MagicType>(MagicType::Kind::Transaction)), make_shared<MagicVariableDeclaration>("tx", make_shared<MagicType>(MagicType::Kind::Transaction)),
make_shared<MagicVariableDeclaration>("now", make_shared<IntegerType>(256)), make_shared<MagicVariableDeclaration>("now", make_shared<IntegerType>(256)),
make_shared<MagicVariableDeclaration>("suicide", make_shared<MagicVariableDeclaration>("suicide",
make_shared<FunctionType>(strings{"address"}, strings{}, FunctionType::Location::Selfdestruct)), make_shared<FunctionType>(strings{"address"}, strings{}, FunctionType::Kind::Selfdestruct)),
make_shared<MagicVariableDeclaration>("selfdestruct", make_shared<MagicVariableDeclaration>("selfdestruct",
make_shared<FunctionType>(strings{"address"}, strings{}, FunctionType::Location::Selfdestruct)), make_shared<FunctionType>(strings{"address"}, strings{}, FunctionType::Kind::Selfdestruct)),
make_shared<MagicVariableDeclaration>("addmod", make_shared<MagicVariableDeclaration>("addmod",
make_shared<FunctionType>(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Location::AddMod)), make_shared<FunctionType>(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Kind::AddMod)),
make_shared<MagicVariableDeclaration>("mulmod", make_shared<MagicVariableDeclaration>("mulmod",
make_shared<FunctionType>(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Location::MulMod)), make_shared<FunctionType>(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Kind::MulMod)),
make_shared<MagicVariableDeclaration>("sha3", make_shared<MagicVariableDeclaration>("sha3",
make_shared<FunctionType>(strings(), strings{"bytes32"}, FunctionType::Location::SHA3, true)), make_shared<FunctionType>(strings(), strings{"bytes32"}, FunctionType::Kind::SHA3, true)),
make_shared<MagicVariableDeclaration>("keccak256", make_shared<MagicVariableDeclaration>("keccak256",
make_shared<FunctionType>(strings(), strings{"bytes32"}, FunctionType::Location::SHA3, true)), make_shared<FunctionType>(strings(), strings{"bytes32"}, FunctionType::Kind::SHA3, true)),
make_shared<MagicVariableDeclaration>("log0", make_shared<MagicVariableDeclaration>("log0",
make_shared<FunctionType>(strings{"bytes32"}, strings{}, FunctionType::Location::Log0)), make_shared<FunctionType>(strings{"bytes32"}, strings{}, FunctionType::Kind::Log0)),
make_shared<MagicVariableDeclaration>("log1", make_shared<MagicVariableDeclaration>("log1",
make_shared<FunctionType>(strings{"bytes32", "bytes32"}, strings{}, FunctionType::Location::Log1)), make_shared<FunctionType>(strings{"bytes32", "bytes32"}, strings{}, FunctionType::Kind::Log1)),
make_shared<MagicVariableDeclaration>("log2", make_shared<MagicVariableDeclaration>("log2",
make_shared<FunctionType>(strings{"bytes32", "bytes32", "bytes32"}, strings{}, FunctionType::Location::Log2)), make_shared<FunctionType>(strings{"bytes32", "bytes32", "bytes32"}, strings{}, FunctionType::Kind::Log2)),
make_shared<MagicVariableDeclaration>("log3", make_shared<MagicVariableDeclaration>("log3",
make_shared<FunctionType>(strings{"bytes32", "bytes32", "bytes32", "bytes32"}, strings{}, FunctionType::Location::Log3)), make_shared<FunctionType>(strings{"bytes32", "bytes32", "bytes32", "bytes32"}, strings{}, FunctionType::Kind::Log3)),
make_shared<MagicVariableDeclaration>("log4", make_shared<MagicVariableDeclaration>("log4",
make_shared<FunctionType>(strings{"bytes32", "bytes32", "bytes32", "bytes32", "bytes32"}, strings{}, FunctionType::Location::Log4)), make_shared<FunctionType>(strings{"bytes32", "bytes32", "bytes32", "bytes32", "bytes32"}, strings{}, FunctionType::Kind::Log4)),
make_shared<MagicVariableDeclaration>("sha256", make_shared<MagicVariableDeclaration>("sha256",
make_shared<FunctionType>(strings(), strings{"bytes32"}, FunctionType::Location::SHA256, true)), make_shared<FunctionType>(strings(), strings{"bytes32"}, FunctionType::Kind::SHA256, true)),
make_shared<MagicVariableDeclaration>("ecrecover", make_shared<MagicVariableDeclaration>("ecrecover",
make_shared<FunctionType>(strings{"bytes32", "uint8", "bytes32", "bytes32"}, strings{"address"}, FunctionType::Location::ECRecover)), make_shared<FunctionType>(strings{"bytes32", "uint8", "bytes32", "bytes32"}, strings{"address"}, FunctionType::Kind::ECRecover)),
make_shared<MagicVariableDeclaration>("ripemd160", make_shared<MagicVariableDeclaration>("ripemd160",
make_shared<FunctionType>(strings(), strings{"bytes20"}, FunctionType::Location::RIPEMD160, true)), make_shared<FunctionType>(strings(), strings{"bytes20"}, FunctionType::Kind::RIPEMD160, true)),
make_shared<MagicVariableDeclaration>("assert", make_shared<MagicVariableDeclaration>("assert",
make_shared<FunctionType>(strings{"bool"}, strings{}, FunctionType::Location::Assert)), make_shared<FunctionType>(strings{"bool"}, strings{}, FunctionType::Kind::Assert)),
make_shared<MagicVariableDeclaration>("require", make_shared<MagicVariableDeclaration>("require",
make_shared<FunctionType>(strings{"bool"}, strings{}, FunctionType::Location::Require)), make_shared<FunctionType>(strings{"bool"}, strings{}, FunctionType::Kind::Require)),
make_shared<MagicVariableDeclaration>("revert", make_shared<MagicVariableDeclaration>("revert",
make_shared<FunctionType>(strings(), strings(), FunctionType::Location::Revert))}) make_shared<FunctionType>(strings(), strings(), FunctionType::Kind::Revert))})
{ {
} }

15
libsolidity/analysis/TypeChecker.cpp
View File

@ -582,7 +582,7 @@ bool TypeChecker::visit(EventDefinition const& _eventDef)
void TypeChecker::endVisit(FunctionTypeName const& _funType) void TypeChecker::endVisit(FunctionTypeName const& _funType)
{ {
FunctionType const& fun = dynamic_cast<FunctionType const&>(*_funType.annotation().type); FunctionType const& fun = dynamic_cast<FunctionType const&>(*_funType.annotation().type);
if (fun.location() == FunctionType::Location::External) if (fun.kind() == FunctionType::Kind::External)
if (!fun.canBeUsedExternally(false)) if (!fun.canBeUsedExternally(false))
typeError(_funType.location(), "External function type uses internal types."); typeError(_funType.location(), "External function type uses internal types.");
} }
@ -886,15 +886,14 @@ void TypeChecker::endVisit(ExpressionStatement const& _statement)
{ {
if (auto callType = dynamic_cast<FunctionType const*>(type(call->expression()).get())) if (auto callType = dynamic_cast<FunctionType const*>(type(call->expression()).get()))
{ {
using Location = FunctionType::Location; auto kind = callType->kind();
Location location = callType->location();
if ( if (
location == Location::Bare || kind == FunctionType::Kind::Bare ||
location == Location::BareCallCode || kind == FunctionType::Kind::BareCallCode ||
location == Location::BareDelegateCall kind == FunctionType::Kind::BareDelegateCall
) )
warning(_statement.location(), "Return value of low-level calls not used."); warning(_statement.location(), "Return value of low-level calls not used.");
else if (location == Location::Send) else if (kind == FunctionType::Kind::Send)
warning(_statement.location(), "Failure condition of 'send' ignored. Consider using 'transfer' instead."); warning(_statement.location(), "Failure condition of 'send' ignored. Consider using 'transfer' instead.");
} }
} }
@ -1387,7 +1386,7 @@ void TypeChecker::endVisit(NewExpression const& _newExpression)
TypePointers{type}, TypePointers{type},
strings(), strings(),
strings(), strings(),
FunctionType::Location::ObjectCreation FunctionType::Kind::ObjectCreation
); );
_newExpression.annotation().isPure = true; _newExpression.annotation().isPure = true;
} }

16
libsolidity/ast/Types.cpp
View File

@ -462,11 +462,11 @@ MemberList::MemberMap IntegerType::nativeMembers(ContractDefinition const*) cons
if (isAddress()) if (isAddress())
return { return {
{"balance", make_shared<IntegerType >(256)}, {"balance", make_shared<IntegerType >(256)},
{"call", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Location::Bare, true, false, true)}, {"call", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Kind::Bare, true, false, true)},
{"callcode", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Location::BareCallCode, true, false, true)}, {"callcode", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Kind::BareCallCode, true, false, true)},
{"delegatecall", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Location::BareDelegateCall, true)}, {"delegatecall", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Kind::BareDelegateCall, true)},
{"send", make_shared<FunctionType>(strings{"uint"}, strings{"bool"}, FunctionType::Location::Send)}, {"send", make_shared<FunctionType>(strings{"uint"}, strings{"bool"}, FunctionType::Kind::Send)},
{"transfer", make_shared<FunctionType>(strings{"uint"}, strings(), FunctionType::Location::Transfer)} {"transfer", make_shared<FunctionType>(strings{"uint"}, strings(), FunctionType::Kind::Transfer)}
}; };
else else
return MemberList::MemberMap(); return MemberList::MemberMap();
@ -1466,7 +1466,7 @@ MemberList::MemberMap ArrayType::nativeMembers(ContractDefinition const*) const
TypePointers{make_shared<IntegerType>(256)}, TypePointers{make_shared<IntegerType>(256)},
strings{string()}, strings{string()},
strings{string()}, strings{string()},
isByteArray() ? FunctionType::Location::ByteArrayPush : FunctionType::Location::ArrayPush isByteArray() ? FunctionType::Kind::ByteArrayPush : FunctionType::Kind::ArrayPush
)}); )});
} }
return members; return members;
@ -1766,7 +1766,7 @@ FunctionTypePointer StructType::constructorType() const
TypePointers{copyForLocation(DataLocation::Memory, false)}, TypePointers{copyForLocation(DataLocation::Memory, false)},
paramNames, paramNames,
strings(), strings(),
FunctionType::Location::Internal FunctionType::Kind::Internal
); );
} }
@ -2821,7 +2821,7 @@ MemberList::MemberMap MagicType::nativeMembers(ContractDefinition const*) const
return MemberList::MemberMap({ return MemberList::MemberMap({
{"coinbase", make_shared<IntegerType>(0, IntegerType::Modifier::Address)}, {"coinbase", make_shared<IntegerType>(0, IntegerType::Modifier::Address)},
{"timestamp", make_shared<IntegerType>(256)}, {"timestamp", make_shared<IntegerType>(256)},
{"blockhash", make_shared<FunctionType>(strings{"uint"}, strings{"bytes32"}, FunctionType::Location::BlockHash)}, {"blockhash", make_shared<FunctionType>(strings{"uint"}, strings{"bytes32"}, FunctionType::Kind::BlockHash)},
{"difficulty", make_shared<IntegerType>(256)}, {"difficulty", make_shared<IntegerType>(256)},
{"number", make_shared<IntegerType>(256)}, {"number", make_shared<IntegerType>(256)},
{"gaslimit", make_shared<IntegerType>(256)} {"gaslimit", make_shared<IntegerType>(256)}

8
libsolidity/codegen/CompilerUtils.cpp
View File

@ -135,7 +135,7 @@ void CompilerUtils::storeInMemoryDynamic(Type const& _type, bool _padToWordBound
} }
else if ( else if (
_type.category() == Type::Category::Function && _type.category() == Type::Category::Function &&
dynamic_cast<FunctionType const&>(_type).location() == FunctionType::Location::External dynamic_cast<FunctionType const&>(_type).kind() == FunctionType::Kind::External
) )
{ {
solUnimplementedAssert(_padToWordBoundaries, "Non-padded store for function not implemented."); solUnimplementedAssert(_padToWordBoundaries, "Non-padded store for function not implemented.");
@ -795,7 +795,7 @@ void CompilerUtils::convertType(Type const& _typeOnStack, Type const& _targetTyp
IntegerType const& targetType = dynamic_cast<IntegerType const&>(_targetType); IntegerType const& targetType = dynamic_cast<IntegerType const&>(_targetType);
solAssert(targetType.isAddress(), "Function type can only be converted to address."); solAssert(targetType.isAddress(), "Function type can only be converted to address.");
FunctionType const& typeOnStack = dynamic_cast<FunctionType const&>(_typeOnStack); FunctionType const& typeOnStack = dynamic_cast<FunctionType const&>(_typeOnStack);
solAssert(typeOnStack.location() == FunctionType::Location::External, "Only external function type can be converted."); solAssert(typeOnStack.kind() == FunctionType::Kind::External, "Only external function type can be converted.");
// stack: <address> <function_id> // stack: <address> <function_id>
m_context << Instruction::POP; m_context << Instruction::POP;
@ -820,7 +820,7 @@ void CompilerUtils::pushZeroValue(Type const& _type)
{ {
if (auto const* funType = dynamic_cast<FunctionType const*>(&_type)) if (auto const* funType = dynamic_cast<FunctionType const*>(&_type))
{ {
if (funType->location() == FunctionType::Location::Internal) if (funType->kind() == FunctionType::Kind::Internal)
{ {
m_context << m_context.lowLevelFunctionTag("$invalidFunction", 0, 0, [](CompilerContext& _context) { m_context << m_context.lowLevelFunctionTag("$invalidFunction", 0, 0, [](CompilerContext& _context) {
_context.appendInvalid(); _context.appendInvalid();
@ -983,7 +983,7 @@ unsigned CompilerUtils::loadFromMemoryHelper(Type const& _type, bool _fromCallda
unsigned numBytes = _type.calldataEncodedSize(_padToWords); unsigned numBytes = _type.calldataEncodedSize(_padToWords);
bool isExternalFunctionType = false; bool isExternalFunctionType = false;
if (auto const* funType = dynamic_cast<FunctionType const*>(&_type)) if (auto const* funType = dynamic_cast<FunctionType const*>(&_type))
if (funType->location() == FunctionType::Location::External) if (funType->kind() == FunctionType::Kind::External)
isExternalFunctionType = true; isExternalFunctionType = true;
if (numBytes == 0) if (numBytes == 0)
{ {

158
libsolidity/codegen/ExpressionCompiler.cpp
View File

@ -434,7 +434,6 @@ bool ExpressionCompiler::visit(BinaryOperation const& _binaryOperation)
bool ExpressionCompiler::visit(FunctionCall const& _functionCall) bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
{ {
CompilerContext::LocationSetter locationSetter(m_context, _functionCall); CompilerContext::LocationSetter locationSetter(m_context, _functionCall);
using Location = FunctionType::Location;
if (_functionCall.annotation().isTypeConversion) if (_functionCall.annotation().isTypeConversion)
{ {
solAssert(_functionCall.arguments().size() == 1, ""); solAssert(_functionCall.arguments().size() == 1, "");
@ -499,10 +498,10 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
FunctionType const& function = *functionType; FunctionType const& function = *functionType;
if (function.bound()) if (function.bound())
// Only delegatecall and internal functions can be bound, this might be lifted later. // Only delegatecall and internal functions can be bound, this might be lifted later.
solAssert(function.location() == Location::DelegateCall || function.location() == Location::Internal, ""); solAssert(function.kind() == FunctionType::Kind::DelegateCall || function.kind() == FunctionType::Kind::Internal, "");
switch (function.location()) switch (function.kind())
{ {
case Location::Internal: case FunctionType::Kind::Internal:
{ {
// Calling convention: Caller pushes return address and arguments // Calling convention: Caller pushes return address and arguments
// Callee removes them and pushes return values // Callee removes them and pushes return values
@ -538,16 +537,16 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
m_context.adjustStackOffset(returnParametersSize - parameterSize - 1); m_context.adjustStackOffset(returnParametersSize - parameterSize - 1);
break; break;
} }
case Location::External: case FunctionType::Kind::External:
case Location::CallCode: case FunctionType::Kind::CallCode:
case Location::DelegateCall: case FunctionType::Kind::DelegateCall:
case Location::Bare: case FunctionType::Kind::Bare:
case Location::BareCallCode: case FunctionType::Kind::BareCallCode:
case Location::BareDelegateCall: case FunctionType::Kind::BareDelegateCall:
_functionCall.expression().accept(*this); _functionCall.expression().accept(*this);
appendExternalFunctionCall(function, arguments); appendExternalFunctionCall(function, arguments);
break; break;
case Location::Creation: case FunctionType::Kind::Creation:
{ {
_functionCall.expression().accept(*this); _functionCall.expression().accept(*this);
solAssert(!function.gasSet(), "Gas limit set for contract creation."); solAssert(!function.gasSet(), "Gas limit set for contract creation.");
@ -592,7 +591,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
m_context << swapInstruction(1) << Instruction::POP; m_context << swapInstruction(1) << Instruction::POP;
break; break;
} }
case Location::SetGas: case FunctionType::Kind::SetGas:
{ {
// stack layout: contract_address function_id [gas] [value] // stack layout: contract_address function_id [gas] [value]
_functionCall.expression().accept(*this); _functionCall.expression().accept(*this);
@ -608,7 +607,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
m_context << Instruction::POP; m_context << Instruction::POP;
break; break;
} }
case Location::SetValue: case FunctionType::Kind::SetValue:
// stack layout: contract_address function_id [gas] [value] // stack layout: contract_address function_id [gas] [value]
_functionCall.expression().accept(*this); _functionCall.expression().accept(*this);
// Note that function is not the original function, but the ".value" function. // Note that function is not the original function, but the ".value" function.
@ -617,8 +616,8 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
m_context << Instruction::POP; m_context << Instruction::POP;
arguments.front()->accept(*this); arguments.front()->accept(*this);
break; break;
case Location::Send: case FunctionType::Kind::Send:
case Location::Transfer: case FunctionType::Kind::Transfer:
_functionCall.expression().accept(*this); _functionCall.expression().accept(*this);
// Provide the gas stipend manually at first because we may send zero ether. // Provide the gas stipend manually at first because we may send zero ether.
// Will be zeroed if we send more than zero ether. // Will be zeroed if we send more than zero ether.
@ -637,7 +636,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
TypePointers{}, TypePointers{},
strings(), strings(),
strings(), strings(),
Location::Bare, FunctionType::Kind::Bare,
false, false,
nullptr, nullptr,
false, false,
@ -647,24 +646,24 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
), ),
{} {}
); );
if (function.location() == Location::Transfer) if (function.kind() == FunctionType::Kind::Transfer)
{ {
// Check if zero (out of stack or not enough balance). // Check if zero (out of stack or not enough balance).
m_context << Instruction::ISZERO; m_context << Instruction::ISZERO;
m_context.appendConditionalInvalid(); m_context.appendConditionalInvalid();
} }
break; break;
case Location::Selfdestruct: case FunctionType::Kind::Selfdestruct:
arguments.front()->accept(*this); arguments.front()->accept(*this);
utils().convertType(*arguments.front()->annotation().type, *function.parameterTypes().front(), true); utils().convertType(*arguments.front()->annotation().type, *function.parameterTypes().front(), true);
m_context << Instruction::SELFDESTRUCT; m_context << Instruction::SELFDESTRUCT;
break; break;
case Location::Revert: case FunctionType::Kind::Revert:
// memory offset returned - zero length // memory offset returned - zero length
m_context << u256(0) << u256(0); m_context << u256(0) << u256(0);
m_context << Instruction::REVERT; m_context << Instruction::REVERT;
break; break;
case Location::SHA3: case FunctionType::Kind::SHA3:
{ {
TypePointers argumentTypes; TypePointers argumentTypes;
for (auto const& arg: arguments) for (auto const& arg: arguments)
@ -678,13 +677,13 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
m_context << Instruction::SHA3; m_context << Instruction::SHA3;
break; break;
} }
case Location::Log0: case FunctionType::Kind::Log0:
case Location::Log1: case FunctionType::Kind::Log1:
case Location::Log2: case FunctionType::Kind::Log2:
case Location::Log3: case FunctionType::Kind::Log3:
case Location::Log4: case FunctionType::Kind::Log4:
{ {
unsigned logNumber = int(function.location()) - int(Location::Log0); unsigned logNumber = int(function.kind()) - int(FunctionType::Kind::Log0);
for (unsigned arg = logNumber; arg > 0; --arg) for (unsigned arg = logNumber; arg > 0; --arg)
{ {
arguments[arg]->accept(*this); arguments[arg]->accept(*this);
@ -701,7 +700,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
m_context << logInstruction(logNumber); m_context << logInstruction(logNumber);
break; break;
} }
case Location::Event: case FunctionType::Kind::Event:
{ {
_functionCall.expression().accept(*this); _functionCall.expression().accept(*this);
auto const& event = dynamic_cast<EventDefinition const&>(function.declaration()); auto const& event = dynamic_cast<EventDefinition const&>(function.declaration());
@ -755,50 +754,50 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
m_context << logInstruction(numIndexed); m_context << logInstruction(numIndexed);
break; break;
} }
case Location::BlockHash: case FunctionType::Kind::BlockHash:
{ {
arguments[0]->accept(*this); arguments[0]->accept(*this);
utils().convertType(*arguments[0]->annotation().type, *function.parameterTypes()[0], true); utils().convertType(*arguments[0]->annotation().type, *function.parameterTypes()[0], true);
m_context << Instruction::BLOCKHASH; m_context << Instruction::BLOCKHASH;
break; break;
} }
case Location::AddMod: case FunctionType::Kind::AddMod:
case Location::MulMod: case FunctionType::Kind::MulMod:
{ {
for (unsigned i = 0; i < 3; i ++) for (unsigned i = 0; i < 3; i ++)
{ {
arguments[2 - i]->accept(*this); arguments[2 - i]->accept(*this);
utils().convertType(*arguments[2 - i]->annotation().type, IntegerType(256)); utils().convertType(*arguments[2 - i]->annotation().type, IntegerType(256));
} }
if (function.location() == Location::AddMod) if (function.kind() == FunctionType::Kind::AddMod)
m_context << Instruction::ADDMOD; m_context << Instruction::ADDMOD;
else else
m_context << Instruction::MULMOD; m_context << Instruction::MULMOD;
break; break;
} }
case Location::ECRecover: case FunctionType::Kind::ECRecover:
case Location::SHA256: case FunctionType::Kind::SHA256:
case Location::RIPEMD160: case FunctionType::Kind::RIPEMD160:
{ {
_functionCall.expression().accept(*this); _functionCall.expression().accept(*this);
static const map<Location, u256> contractAddresses{{Location::ECRecover, 1}, static const map<FunctionType::Kind, u256> contractAddresses{{FunctionType::Kind::ECRecover, 1},
{Location::SHA256, 2}, {FunctionType::Kind::SHA256, 2},
{Location::RIPEMD160, 3}}; {FunctionType::Kind::RIPEMD160, 3}};
m_context << contractAddresses.find(function.location())->second; m_context << contractAddresses.find(function.kind())->second;
for (unsigned i = function.sizeOnStack(); i > 0; --i) for (unsigned i = function.sizeOnStack(); i > 0; --i)
m_context << swapInstruction(i); m_context << swapInstruction(i);
appendExternalFunctionCall(function, arguments); appendExternalFunctionCall(function, arguments);
break; break;
} }
case Location::ByteArrayPush: case FunctionType::Kind::ByteArrayPush:
case Location::ArrayPush: case FunctionType::Kind::ArrayPush:
{ {
_functionCall.expression().accept(*this); _functionCall.expression().accept(*this);
solAssert(function.parameterTypes().size() == 1, ""); solAssert(function.parameterTypes().size() == 1, "");
solAssert(!!function.parameterTypes()[0], ""); solAssert(!!function.parameterTypes()[0], "");
TypePointer paramType = function.parameterTypes()[0]; TypePointer paramType = function.parameterTypes()[0];
shared_ptr<ArrayType> arrayType = shared_ptr<ArrayType> arrayType =
function.location() == Location::ArrayPush ? function.kind() == FunctionType::Kind::ArrayPush ?
make_shared<ArrayType>(DataLocation::Storage, paramType) : make_shared<ArrayType>(DataLocation::Storage, paramType) :
make_shared<ArrayType>(DataLocation::Storage); make_shared<ArrayType>(DataLocation::Storage);
// get the current length // get the current length
@ -822,13 +821,13 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
utils().moveToStackTop(1 + type->sizeOnStack()); utils().moveToStackTop(1 + type->sizeOnStack());
utils().moveToStackTop(1 + type->sizeOnStack()); utils().moveToStackTop(1 + type->sizeOnStack());
// stack: newLength argValue storageSlot slotOffset // stack: newLength argValue storageSlot slotOffset
if (function.location() == Location::ArrayPush) if (function.kind() == FunctionType::Kind::ArrayPush)
StorageItem(m_context, *paramType).storeValue(*type, _functionCall.location(), true); StorageItem(m_context, *paramType).storeValue(*type, _functionCall.location(), true);
else else
StorageByteArrayElement(m_context).storeValue(*type, _functionCall.location(), true); StorageByteArrayElement(m_context).storeValue(*type, _functionCall.location(), true);
break; break;
} }
case Location::ObjectCreation: case FunctionType::Kind::ObjectCreation:
{ {
// Will allocate at the end of memory (MSIZE) and not write at all unless the base // Will allocate at the end of memory (MSIZE) and not write at all unless the base
// type is dynamically sized. // type is dynamically sized.
@ -878,15 +877,15 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
m_context << Instruction::POP; m_context << Instruction::POP;
break; break;
} }
case Location::Assert: case FunctionType::Kind::Assert:
case Location::Require: case FunctionType::Kind::Require:
{ {
arguments.front()->accept(*this); arguments.front()->accept(*this);
utils().convertType(*arguments.front()->annotation().type, *function.parameterTypes().front(), false); utils().convertType(*arguments.front()->annotation().type, *function.parameterTypes().front(), false);
// jump if condition was met // jump if condition was met
m_context << Instruction::ISZERO << Instruction::ISZERO; m_context << Instruction::ISZERO << Instruction::ISZERO;
auto success = m_context.appendConditionalJump(); auto success = m_context.appendConditionalJump();
if (function.location() == Location::Assert) if (function.kind() == FunctionType::Kind::Assert)
// condition was not met, flag an error // condition was not met, flag an error
m_context << Instruction::INVALID; m_context << Instruction::INVALID;
else else
@ -922,7 +921,7 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
*funType->selfType(), *funType->selfType(),
true true
); );
if (funType->location() == FunctionType::Location::Internal) if (funType->kind() == FunctionType::Kind::Internal)
{ {
FunctionDefinition const& funDef = dynamic_cast<decltype(funDef)>(funType->declaration()); FunctionDefinition const& funDef = dynamic_cast<decltype(funDef)>(funType->declaration());
utils().pushCombinedFunctionEntryLabel(funDef); utils().pushCombinedFunctionEntryLabel(funDef);
@ -930,7 +929,7 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
} }
else else
{ {
solAssert(funType->location() == FunctionType::Location::DelegateCall, ""); solAssert(funType->kind() == FunctionType::Kind::DelegateCall, "");
auto contract = dynamic_cast<ContractDefinition const*>(funType->declaration().scope()); auto contract = dynamic_cast<ContractDefinition const*>(funType->declaration().scope());
solAssert(contract && contract->isLibrary(), ""); solAssert(contract && contract->isLibrary(), "");
m_context.appendLibraryAddress(contract->fullyQualifiedName()); m_context.appendLibraryAddress(contract->fullyQualifiedName());
@ -949,9 +948,9 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
solAssert(_memberAccess.annotation().type, "_memberAccess has no type"); solAssert(_memberAccess.annotation().type, "_memberAccess has no type");
if (auto funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type.get())) if (auto funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type.get()))
{ {
switch (funType->location()) switch (funType->kind())
{ {
case FunctionType::Location::Internal: case FunctionType::Kind::Internal:
// We do not visit the expression here on purpose, because in the case of an // We do not visit the expression here on purpose, because in the case of an
// internal library function call, this would push the library address forcing // internal library function call, this would push the library address forcing
// us to link against it although we actually do not need it. // us to link against it although we actually do not need it.
@ -960,31 +959,31 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
else else
solAssert(false, "Function not found in member access"); solAssert(false, "Function not found in member access");
break; break;
case FunctionType::Location::Event: case FunctionType::Kind::Event:
if (!dynamic_cast<EventDefinition const*>(_memberAccess.annotation().referencedDeclaration)) if (!dynamic_cast<EventDefinition const*>(_memberAccess.annotation().referencedDeclaration))
solAssert(false, "event not found"); solAssert(false, "event not found");
// no-op, because the parent node will do the job // no-op, because the parent node will do the job
break; break;
case FunctionType::Location::External: case FunctionType::Kind::External:
case FunctionType::Location::Creation: case FunctionType::Kind::Creation:
case FunctionType::Location::DelegateCall: case FunctionType::Kind::DelegateCall:
case FunctionType::Location::CallCode: case FunctionType::Kind::CallCode:
case FunctionType::Location::Send: case FunctionType::Kind::Send:
case FunctionType::Location::Bare: case FunctionType::Kind::Bare:
case FunctionType::Location::BareCallCode: case FunctionType::Kind::BareCallCode:
case FunctionType::Location::BareDelegateCall: case FunctionType::Kind::BareDelegateCall:
case FunctionType::Location::Transfer: case FunctionType::Kind::Transfer:
_memberAccess.expression().accept(*this); _memberAccess.expression().accept(*this);
m_context << funType->externalIdentifier(); m_context << funType->externalIdentifier();
break; break;
case FunctionType::Location::Log0: case FunctionType::Kind::Log0:
case FunctionType::Location::Log1: case FunctionType::Kind::Log1:
case FunctionType::Location::Log2: case FunctionType::Kind::Log2:
case FunctionType::Location::Log3: case FunctionType::Kind::Log3:
case FunctionType::Location::Log4: case FunctionType::Kind::Log4:
case FunctionType::Location::ECRecover: case FunctionType::Kind::ECRecover:
case FunctionType::Location::SHA256: case FunctionType::Kind::SHA256:
case FunctionType::Location::RIPEMD160: case FunctionType::Kind::RIPEMD160:
default: default:
solAssert(false, "unsupported member function"); solAssert(false, "unsupported member function");
} }
@ -1372,7 +1371,7 @@ void ExpressionCompiler::appendCompareOperatorCode(Token::Value _operator, Type
{ {
if (FunctionType const* funType = dynamic_cast<decltype(funType)>(&_type)) if (FunctionType const* funType = dynamic_cast<decltype(funType)>(&_type))
{ {
if (funType->location() == FunctionType::Location::Internal) if (funType->kind() == FunctionType::Kind::Internal)
{ {
// We have to remove the upper bits (construction time value) because they might // We have to remove the upper bits (construction time value) because they might
// be "unknown" in one of the operands and not in the other. // be "unknown" in one of the operands and not in the other.
@ -1555,11 +1554,10 @@ void ExpressionCompiler::appendExternalFunctionCall(
if (_functionType.bound()) if (_functionType.bound())
utils().moveToStackTop(gasValueSize, _functionType.selfType()->sizeOnStack()); utils().moveToStackTop(gasValueSize, _functionType.selfType()->sizeOnStack());
using FunctionKind = FunctionType::Location; auto funKind = _functionType.kind();
FunctionKind funKind = _functionType.location(); bool returnSuccessCondition = funKind == FunctionType::Kind::Bare || funKind == FunctionType::Kind::BareCallCode;
bool returnSuccessCondition = funKind == FunctionKind::Bare || funKind == FunctionKind::BareCallCode; bool isCallCode = funKind == FunctionType::Kind::BareCallCode || funKind == FunctionType::Kind::CallCode;
bool isCallCode = funKind == FunctionKind::BareCallCode || funKind == FunctionKind::CallCode; bool isDelegateCall = funKind == FunctionType::Kind::BareDelegateCall || funKind == FunctionType::Kind::DelegateCall;
bool isDelegateCall = funKind == FunctionKind::BareDelegateCall || funKind == FunctionKind::DelegateCall;
unsigned retSize = 0; unsigned retSize = 0;
if (returnSuccessCondition) if (returnSuccessCondition)
@ -1576,7 +1574,7 @@ void ExpressionCompiler::appendExternalFunctionCall(
TypePointers parameterTypes = _functionType.parameterTypes(); TypePointers parameterTypes = _functionType.parameterTypes();
bool manualFunctionId = false; bool manualFunctionId = false;
if ( if (
(funKind == FunctionKind::Bare || funKind == FunctionKind::BareCallCode || funKind == FunctionKind::BareDelegateCall) && (funKind == FunctionType::Kind::Bare || funKind == FunctionType::Kind::BareCallCode || funKind == FunctionType::Kind::BareDelegateCall) &&
!_arguments.empty() !_arguments.empty()
) )
{ {
@ -1611,7 +1609,7 @@ void ExpressionCompiler::appendExternalFunctionCall(
argumentTypes.push_back(_arguments[i]->annotation().type); argumentTypes.push_back(_arguments[i]->annotation().type);
} }
if (funKind == FunctionKind::ECRecover) if (funKind == FunctionType::Kind::ECRecover)
{ {
// Clears 32 bytes of currently free memory and advances free memory pointer. // Clears 32 bytes of currently free memory and advances free memory pointer.
// Output area will be "start of input area" - 32. // Output area will be "start of input area" - 32.
@ -1667,7 +1665,7 @@ void ExpressionCompiler::appendExternalFunctionCall(
// put on stack: <size of output> <memory pos of output> <size of input> <memory pos of input> // put on stack: <size of output> <memory pos of output> <size of input> <memory pos of input>
m_context << u256(retSize); m_context << u256(retSize);
utils().fetchFreeMemoryPointer(); // This is the start of input utils().fetchFreeMemoryPointer(); // This is the start of input
if (funKind == FunctionKind::ECRecover) if (funKind == FunctionType::Kind::ECRecover)
{ {
// In this case, output is 32 bytes before input and has already been cleared. // In this case, output is 32 bytes before input and has already been cleared.
m_context << u256(32) << Instruction::DUP2 << Instruction::SUB << Instruction::SWAP1; m_context << u256(32) << Instruction::DUP2 << Instruction::SUB << Instruction::SWAP1;
@ -1693,7 +1691,7 @@ void ExpressionCompiler::appendExternalFunctionCall(
bool existenceChecked = false; bool existenceChecked = false;
// Check the the target contract exists (has code) for non-low-level calls. // Check the the target contract exists (has code) for non-low-level calls.
if (funKind == FunctionKind::External || funKind == FunctionKind::CallCode || funKind == FunctionKind::DelegateCall) if (funKind == FunctionType::Kind::External || funKind == FunctionType::Kind::CallCode || funKind == FunctionType::Kind::DelegateCall)
{ {
m_context << Instruction::DUP1 << Instruction::EXTCODESIZE << Instruction::ISZERO; m_context << Instruction::DUP1 << Instruction::EXTCODESIZE << Instruction::ISZERO;
m_context.appendConditionalInvalid(); m_context.appendConditionalInvalid();
@ -1741,14 +1739,14 @@ void ExpressionCompiler::appendExternalFunctionCall(
{ {
// already there // already there
} }
else if (funKind == FunctionKind::RIPEMD160) else if (funKind == FunctionType::Kind::RIPEMD160)
{ {
// fix: built-in contract returns right-aligned data // fix: built-in contract returns right-aligned data
utils().fetchFreeMemoryPointer(); utils().fetchFreeMemoryPointer();
utils().loadFromMemoryDynamic(IntegerType(160), false, true, false); utils().loadFromMemoryDynamic(IntegerType(160), false, true, false);
utils().convertType(IntegerType(160), FixedBytesType(20)); utils().convertType(IntegerType(160), FixedBytesType(20));
} }
else if (funKind == FunctionKind::ECRecover) else if (funKind == FunctionType::Kind::ECRecover)
{ {
// Output is 32 bytes before input / free mem pointer. // Output is 32 bytes before input / free mem pointer.
// Failing ecrecover cannot be detected, so we clear output before the call. // Failing ecrecover cannot be detected, so we clear output before the call.

4
libsolidity/codegen/LValue.cpp
View File

@ -199,7 +199,7 @@ void StorageItem::retrieveValue(SourceLocation const&, bool _remove) const
} }
else if (FunctionType const* fun = dynamic_cast<decltype(fun)>(m_dataType)) else if (FunctionType const* fun = dynamic_cast<decltype(fun)>(m_dataType))
{ {
if (fun->location() == FunctionType::Location::External) if (fun->kind() == FunctionType::Kind::External)
{ {
CompilerUtils(m_context).splitExternalFunctionType(false); CompilerUtils(m_context).splitExternalFunctionType(false);
cleaned = true; cleaned = true;
@ -256,7 +256,7 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
if (FunctionType const* fun = dynamic_cast<decltype(fun)>(m_dataType)) if (FunctionType const* fun = dynamic_cast<decltype(fun)>(m_dataType))
{ {
solAssert(_sourceType == *m_dataType, "function item stored but target is not equal to source"); solAssert(_sourceType == *m_dataType, "function item stored but target is not equal to source");
if (fun->location() == FunctionType::Location::External) if (fun->kind() == FunctionType::Kind::External)
// Combine the two-item function type into a single stack slot. // Combine the two-item function type into a single stack slot.
utils.combineExternalFunctionType(false); utils.combineExternalFunctionType(false);
else else

14
libsolidity/formal/Why3Translator.cpp
View File

@ -588,14 +588,14 @@ bool Why3Translator::visit(FunctionCall const& _node)
return true; return true;
} }
FunctionType const& function = dynamic_cast<FunctionType const&>(*_node.expression().annotation().type); FunctionType const& function = dynamic_cast<FunctionType const&>(*_node.expression().annotation().type);
switch (function.location()) switch (function.kind())
{ {
case FunctionType::Location::AddMod: case FunctionType::Kind::AddMod:
case FunctionType::Location::MulMod: case FunctionType::Kind::MulMod:
{ {
//@todo require that third parameter is not zero //@todo require that third parameter is not zero
add("(of_int (mod (Int.("); add("(of_int (mod (Int.(");
add(function.location() == FunctionType::Location::AddMod ? "+" : "*"); add(function.kind() == FunctionType::Kind::AddMod ? "+" : "*");
add(") (to_int "); add(") (to_int ");
_node.arguments().at(0)->accept(*this); _node.arguments().at(0)->accept(*this);
add(") (to_int "); add(") (to_int ");
@ -605,7 +605,7 @@ bool Why3Translator::visit(FunctionCall const& _node)
add(")))"); add(")))");
return false; return false;
} }
case FunctionType::Location::Internal: case FunctionType::Kind::Internal:
{ {
if (!_node.names().empty()) if (!_node.names().empty())
{ {
@ -626,7 +626,7 @@ bool Why3Translator::visit(FunctionCall const& _node)
add(")"); add(")");
return false; return false;
} }
case FunctionType::Location::Bare: case FunctionType::Kind::Bare:
{ {
if (!_node.arguments().empty()) if (!_node.arguments().empty())
{ {
@ -654,7 +654,7 @@ bool Why3Translator::visit(FunctionCall const& _node)
add(")"); add(")");
return false; return false;
} }
case FunctionType::Location::SetValue: case FunctionType::Kind::SetValue:
{ {
add("let amount = "); add("let amount = ");
solAssert(_node.arguments().size() == 1, ""); solAssert(_node.arguments().size() == 1, "");

2
test/libsolidity/SolidityTypes.cpp
View File

@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE(type_identifiers)
TupleType t({e.type(), s.type(), stringArray, nullptr}); TupleType t({e.type(), s.type(), stringArray, nullptr});
BOOST_CHECK_EQUAL(t.identifier(), "t_tuple$_t_type$_t_enum$_Enum_$4_$_$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$_t_array$_t_string_storage_$20_storage_ptr_$__$"); BOOST_CHECK_EQUAL(t.identifier(), "t_tuple$_t_type$_t_enum$_Enum_$4_$_$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$_t_array$_t_string_storage_$20_storage_ptr_$__$");
TypePointer sha3fun = make_shared<FunctionType>(strings{}, strings{}, FunctionType::Location::SHA3); TypePointer sha3fun = make_shared<FunctionType>(strings{}, strings{}, FunctionType::Kind::SHA3);
BOOST_CHECK_EQUAL(sha3fun->identifier(), "t_function_sha3$__$returns$__$"); BOOST_CHECK_EQUAL(sha3fun->identifier(), "t_function_sha3$__$returns$__$");
FunctionType metaFun(TypePointers{sha3fun}, TypePointers{s.type()}); FunctionType metaFun(TypePointers{sha3fun}, TypePointers{s.type()});