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

Merge pull request #506 from chriseth/fixconstructor

Browse Source 
Bugfix for static arrays in constructor parameter list.
This commit is contained in:
Bob Summerwill 2016-04-15 14:26:46 -04:00
commit c9ed7facba
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/codegen/Compiler.cpp
View File

@ -316,7 +316,7 @@ void Compiler::appendCalldataUnpacker(TypePointers const& _typeParameters, bool
} }
else else
{ {
m_context << Instruction::DUP1; m_context << Instruction::SWAP1 << Instruction::DUP2;
m_context << u256(arrayType.calldataEncodedSize(true)) << Instruction::ADD; m_context << u256(arrayType.calldataEncodedSize(true)) << Instruction::ADD;
} }
} }

20
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -2000,6 +2000,26 @@ BOOST_AUTO_TEST_CASE(constructor_with_long_arguments)
BOOST_CHECK(callContractFunction("b()") == encodeDyn(b)); BOOST_CHECK(callContractFunction("b()") == encodeDyn(b));
} }
BOOST_AUTO_TEST_CASE(constructor_static_array_argument)
{
char const* sourceCode = R"(
contract C {
uint public a;
uint[3] public b;
function C(uint _a, uint[3] _b) {
a = _a;
b = _b;
}
}
)";
compileAndRun(sourceCode, 0, "C", encodeArgs(u256(1), u256(2), u256(3), u256(4)));
BOOST_CHECK(callContractFunction("a()") == encodeArgs(u256(1)));
BOOST_CHECK(callContractFunction("b(uint256)", u256(0)) == encodeArgs(u256(2)));
BOOST_CHECK(callContractFunction("b(uint256)", u256(1)) == encodeArgs(u256(3)));
BOOST_CHECK(callContractFunction("b(uint256)", u256(2)) == encodeArgs(u256(4)));
}
BOOST_AUTO_TEST_CASE(functions_called_by_constructor) BOOST_AUTO_TEST_CASE(functions_called_by_constructor)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(