cerc-io/solidity
11
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 #2833 from ethereum/statemutability-builtins

Browse Source 
Mark all built in functions with appropriate statemutability
This commit is contained in:
chriseth
2017-08-29 15:24:51 +02:00
committed by GitHub
parent e77e594120 79e84a8fa4
commit 93b1cc9702
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/ast/Types.cpp
+9 -8
View File
@@ -2169,7 +2169,6 @@ FunctionTypePointer FunctionType::newExpressionType(ContractDefinition const& _c
strings{""},
Kind::Creation,
false,
nullptr,
stateMutability
);
}
@@ -2421,8 +2420,8 @@ FunctionTypePointer FunctionType::interfaceFunctionType() const
m_returnParameterNames,
m_kind,
m_arbitraryParameters,
m_declaration,
m_stateMutability
m_stateMutability,
m_declaration
);
}
@@ -2449,8 +2448,8 @@ MemberList::MemberMap FunctionType::nativeMembers(ContractDefinition const*) con
strings(),
Kind::SetValue,
false,
nullptr,
StateMutability::NonPayable,
nullptr,
m_gasSet,
m_valueSet
)
@@ -2466,8 +2465,8 @@ MemberList::MemberMap FunctionType::nativeMembers(ContractDefinition const*) con
strings(),
Kind::SetGas,
false,
nullptr,
StateMutability::NonPayable,
nullptr,
m_gasSet,
m_valueSet
)
@@ -2574,6 +2573,8 @@ u256 FunctionType::externalIdentifier() const
bool FunctionType::isPure() const
{
// FIXME: replace this with m_stateMutability == StateMutability::Pure once
// the callgraph analyzer is in place
return
m_kind == Kind::SHA3 ||
m_kind == Kind::ECRecover ||
@@ -2602,8 +2603,8 @@ TypePointer FunctionType::copyAndSetGasOrValue(bool _setGas, bool _setValue) con
m_returnParameterNames,
m_kind,
m_arbitraryParameters,
m_declaration,
m_stateMutability,
m_declaration,
m_gasSet || _setGas,
m_valueSet || _setValue,
m_bound
@@ -2651,8 +2652,8 @@ FunctionTypePointer FunctionType::asMemberFunction(bool _inLibrary, bool _bound)
m_returnParameterNames,
kind,
m_arbitraryParameters,
m_declaration,
m_stateMutability,
m_declaration,
m_gasSet,
m_valueSet,
_bound
@@ -2870,7 +2871,7 @@ MemberList::MemberMap MagicType::nativeMembers(ContractDefinition const*) const
return MemberList::MemberMap({
{"coinbase", make_shared<IntegerType>(0, IntegerType::Modifier::Address)},
{"timestamp", make_shared<IntegerType>(256)},
{"blockhash", make_shared<FunctionType>(strings{"uint"}, strings{"bytes32"}, FunctionType::Kind::BlockHash)},
{"blockhash", make_shared<FunctionType>(strings{"uint"}, strings{"bytes32"}, FunctionType::Kind::BlockHash, false, StateMutability::View)},
{"difficulty", make_shared<IntegerType>(256)},
{"number", make_shared<IntegerType>(256)},
{"gaslimit", make_shared<IntegerType>(256)}
libsolidity/ast/Types.h
+1 -2
View File
@@ -899,7 +899,6 @@ public:
strings(),
_kind,
_arbitraryParameters,
nullptr,
_stateMutability
)
{
@@ -916,8 +915,8 @@ public:
strings _returnParameterNames = strings(),
Kind _kind = Kind::Internal,
bool _arbitraryParameters = false,
Declaration const* _declaration = nullptr,
StateMutability _stateMutability = StateMutability::NonPayable,
Declaration const* _declaration = nullptr,
bool _gasSet = false,
bool _valueSet = false,
bool _bound = false