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

Use "if" instead of "switch" in codegen for the deployment time address of a library

Browse Source
This commit is contained in:
Alex Beregszaszi 2019-02-25 23:59:13 +00:00
parent 6b12726f51
commit bd51589f1a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/codegen/ContractCompiler.cpp
View File

@ -177,6 +177,7 @@ size_t ContractCompiler::deployLibrary(ContractDefinition const& _contract)
solAssert(m_context.runtimeSub() != size_t(-1), "Runtime sub not registered"); solAssert(m_context.runtimeSub() != size_t(-1), "Runtime sub not registered");
m_context.pushSubroutineSize(m_context.runtimeSub()); m_context.pushSubroutineSize(m_context.runtimeSub());
m_context.pushSubroutineOffset(m_context.runtimeSub()); m_context.pushSubroutineOffset(m_context.runtimeSub());
// This code replaces the address added by appendDeployTimeAddress().
m_context.appendInlineAssembly(R"( m_context.appendInlineAssembly(R"(
{ {
// If code starts at 11, an mstore(0) writes to the full PUSH20 plus data // If code starts at 11, an mstore(0) writes to the full PUSH20 plus data
@ -184,8 +185,7 @@ size_t ContractCompiler::deployLibrary(ContractDefinition const& _contract)
let codepos := 11 let codepos := 11
codecopy(codepos, subOffset, subSize) codecopy(codepos, subOffset, subSize)
// Check that the first opcode is a PUSH20 // Check that the first opcode is a PUSH20
switch eq(0x73, byte(0, mload(codepos))) if iszero(eq(0x73, byte(0, mload(codepos)))) { invalid() }
case 0 { invalid() }
mstore(0, address()) mstore(0, address())
mstore8(codepos, 0x73) mstore8(codepos, 0x73)
return(codepos, subSize) return(codepos, subSize)