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

Removed unused "FunctionType::Kind::CallCode" from Types.h and all its usage

Browse Source
This commit is contained in:
Anurag Dashputre 2018-08-23 13:09:00 +05:30
parent 410d288dfc
commit 94c327c1ae
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsolidity/ast/Types.cpp
View File

@ -2496,7 +2496,7 @@ TypePointers FunctionType::returnParameterTypesWithoutDynamicTypes() const
{ {
TypePointers returnParameterTypes = m_returnParameterTypes; TypePointers returnParameterTypes = m_returnParameterTypes;
if (m_kind == Kind::External || m_kind == Kind::CallCode || m_kind == Kind::DelegateCall) if (m_kind == Kind::External || m_kind == Kind::DelegateCall)
for (auto& param: returnParameterTypes) for (auto& param: returnParameterTypes)
if (param->isDynamicallySized() && !param->dataStoredIn(DataLocation::Storage)) if (param->isDynamicallySized() && !param->dataStoredIn(DataLocation::Storage))
param = make_shared<InaccessibleDynamicType>(); param = make_shared<InaccessibleDynamicType>();
@ -2518,7 +2518,6 @@ string FunctionType::richIdentifier() const
{ {
case Kind::Internal: id += "internal"; break; case Kind::Internal: id += "internal"; break;
case Kind::External: id += "external"; break; case Kind::External: id += "external"; break;
case Kind::CallCode: id += "callcode"; break;
case Kind::DelegateCall: id += "delegatecall"; break; case Kind::DelegateCall: id += "delegatecall"; break;
case Kind::BareCall: id += "barecall"; break; case Kind::BareCall: id += "barecall"; break;
case Kind::BareCallCode: id += "barecallcode"; break; case Kind::BareCallCode: id += "barecallcode"; break;
@ -2700,7 +2699,6 @@ unsigned FunctionType::sizeOnStack() const
switch(kind) switch(kind)
{ {
case Kind::External: case Kind::External:
case Kind::CallCode:
case Kind::DelegateCall: case Kind::DelegateCall:
size = 2; size = 2;
break; break;
@ -2933,7 +2931,6 @@ string FunctionType::externalSignature() const
{ {
case Kind::Internal: case Kind::Internal:
case Kind::External: case Kind::External:
case Kind::CallCode:
case Kind::DelegateCall: case Kind::DelegateCall:
case Kind::Event: case Kind::Event:
break; break;

1
libsolidity/ast/Types.h
View File

@ -899,7 +899,6 @@ public:
{ {
Internal, ///< stack-call using plain JUMP Internal, ///< stack-call using plain JUMP
External, ///< external call using CALL External, ///< external call using CALL
CallCode, ///< external call using CALLCODE, i.e. not exchanging the storage
DelegateCall, ///< external call using DELEGATECALL, i.e. not exchanging the storage DelegateCall, ///< external call using DELEGATECALL, i.e. not exchanging the storage
BareCall, ///< CALL without function hash BareCall, ///< CALL without function hash
BareCallCode, ///< CALLCODE without function hash BareCallCode, ///< CALLCODE without function hash

6
libsolidity/codegen/ExpressionCompiler.cpp
View File

@ -566,7 +566,6 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
break; break;
} }
case FunctionType::Kind::External: case FunctionType::Kind::External:
case FunctionType::Kind::CallCode:
case FunctionType::Kind::DelegateCall: case FunctionType::Kind::DelegateCall:
case FunctionType::Kind::BareCall: case FunctionType::Kind::BareCall:
case FunctionType::Kind::BareCallCode: case FunctionType::Kind::BareCallCode:
@ -1169,7 +1168,6 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
_memberAccess.expression().accept(*this); _memberAccess.expression().accept(*this);
m_context << funType->externalIdentifier(); m_context << funType->externalIdentifier();
break; break;
case FunctionType::Kind::CallCode:
case FunctionType::Kind::External: case FunctionType::Kind::External:
case FunctionType::Kind::Creation: case FunctionType::Kind::Creation:
case FunctionType::Kind::Send: case FunctionType::Kind::Send:
@ -1831,7 +1829,7 @@ void ExpressionCompiler::appendExternalFunctionCall(
solAssert(funKind != FunctionType::Kind::BareStaticCall || m_context.evmVersion().hasStaticCall(), ""); solAssert(funKind != FunctionType::Kind::BareStaticCall || m_context.evmVersion().hasStaticCall(), "");
bool returnSuccessCondition = funKind == FunctionType::Kind::BareCall || funKind == FunctionType::Kind::BareCallCode || funKind == FunctionType::Kind::BareDelegateCall || funKind == FunctionType::Kind::BareStaticCall; bool returnSuccessCondition = funKind == FunctionType::Kind::BareCall || funKind == FunctionType::Kind::BareCallCode || funKind == FunctionType::Kind::BareDelegateCall || funKind == FunctionType::Kind::BareStaticCall;
bool isCallCode = funKind == FunctionType::Kind::BareCallCode || funKind == FunctionType::Kind::CallCode; bool isCallCode = funKind == FunctionType::Kind::BareCallCode;
bool isDelegateCall = funKind == FunctionType::Kind::BareDelegateCall || funKind == FunctionType::Kind::DelegateCall; bool isDelegateCall = funKind == FunctionType::Kind::BareDelegateCall || funKind == FunctionType::Kind::DelegateCall;
bool useStaticCall = funKind == FunctionType::Kind::BareStaticCall || (_functionType.stateMutability() <= StateMutability::View && m_context.evmVersion().hasStaticCall()); bool useStaticCall = funKind == FunctionType::Kind::BareStaticCall || (_functionType.stateMutability() <= StateMutability::View && m_context.evmVersion().hasStaticCall());
@ -1959,7 +1957,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 == FunctionType::Kind::External || funKind == FunctionType::Kind::CallCode || funKind == FunctionType::Kind::DelegateCall) if (funKind == FunctionType::Kind::External || funKind == FunctionType::Kind::DelegateCall)
{ {
m_context << Instruction::DUP1 << Instruction::EXTCODESIZE << Instruction::ISZERO; m_context << Instruction::DUP1 << Instruction::EXTCODESIZE << Instruction::ISZERO;
// TODO: error message? // TODO: error message?