diff options
| author | chriseth <chris@ethereum.org> | 2018-09-03 22:51:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 22:51:05 +0800 |
| commit | 758bc1614c156869e04b559f0cc8b8958d985b45 (patch) | |
| tree | ca1297ed0cc70208d67a0aebd226de5848e4bfa9 /libsolidity/codegen | |
| parent | 6e5e05779c6085c1fc58d38390cc5cb447068ecb (diff) | |
| parent | 94c327c1aeaf1fb09a53f1e4979b16f357b690c7 (diff) | |
| download | dexon-solidity-758bc1614c156869e04b559f0cc8b8958d985b45.tar dexon-solidity-758bc1614c156869e04b559f0cc8b8958d985b45.tar.gz dexon-solidity-758bc1614c156869e04b559f0cc8b8958d985b45.tar.bz2 dexon-solidity-758bc1614c156869e04b559f0cc8b8958d985b45.tar.lz dexon-solidity-758bc1614c156869e04b559f0cc8b8958d985b45.tar.xz dexon-solidity-758bc1614c156869e04b559f0cc8b8958d985b45.tar.zst dexon-solidity-758bc1614c156869e04b559f0cc8b8958d985b45.zip | |
Merge pull request #4851 from anurag-git/anurag_issue_4824
Removed unused "FunctionType::Kind::CallCode"
Diffstat (limited to 'libsolidity/codegen')
| -rw-r--r-- | libsolidity/codegen/ExpressionCompiler.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp index 53a06090..fbb1879a 100644 --- a/libsolidity/codegen/ExpressionCompiler.cpp +++ b/libsolidity/codegen/ExpressionCompiler.cpp @@ -566,7 +566,6 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall) break; } case FunctionType::Kind::External: - case FunctionType::Kind::CallCode: case FunctionType::Kind::DelegateCall: case FunctionType::Kind::BareCall: case FunctionType::Kind::BareCallCode: @@ -1169,7 +1168,6 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess) _memberAccess.expression().accept(*this); m_context << funType->externalIdentifier(); break; - case FunctionType::Kind::CallCode: case FunctionType::Kind::External: case FunctionType::Kind::Creation: case FunctionType::Kind::Send: @@ -1831,7 +1829,7 @@ void ExpressionCompiler::appendExternalFunctionCall( 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 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 useStaticCall = funKind == FunctionType::Kind::BareStaticCall || (_functionType.stateMutability() <= StateMutability::View && m_context.evmVersion().hasStaticCall()); @@ -1959,7 +1957,7 @@ void ExpressionCompiler::appendExternalFunctionCall( bool existenceChecked = false; // 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; // TODO: error message? |