mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #2518 from ethereum/fixInternalVariableAlreadyPresent
Fix internal variable already present error.
This commit is contained in:
commit
05a26fc98c
@ -1,5 +1,8 @@
|
|||||||
### 0.4.13 (unreleased)
|
### 0.4.13 (unreleased)
|
||||||
|
|
||||||
|
Bugfixes:
|
||||||
|
* Code Generator: Correctly unregister modifier variables.
|
||||||
|
|
||||||
### 0.4.12 (2017-07-03)
|
### 0.4.12 (2017-07-03)
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
|
@ -928,7 +928,10 @@ void ContractCompiler::appendModifierOrFunctionCode()
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
for (VariableDeclaration const* localVariable: modifier.localVariables())
|
for (VariableDeclaration const* localVariable: modifier.localVariables())
|
||||||
|
{
|
||||||
|
addedVariables.push_back(localVariable);
|
||||||
appendStackVariableInitialisation(*localVariable);
|
appendStackVariableInitialisation(*localVariable);
|
||||||
|
}
|
||||||
|
|
||||||
stackSurplus =
|
stackSurplus =
|
||||||
CompilerUtils::sizeOnStack(modifier.parameters()) +
|
CompilerUtils::sizeOnStack(modifier.parameters()) +
|
||||||
|
@ -9696,6 +9696,33 @@ BOOST_AUTO_TEST_CASE(keccak256_assembly)
|
|||||||
BOOST_CHECK(callContractFunction("i()") == fromHex("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"));
|
BOOST_CHECK(callContractFunction("i()") == fromHex("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(multi_modifiers)
|
||||||
|
{
|
||||||
|
// This triggered a bug in some version because the variable in the modifier was not
|
||||||
|
// unregistered correctly.
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract C {
|
||||||
|
uint public x;
|
||||||
|
modifier m1 {
|
||||||
|
address a1 = msg.sender;
|
||||||
|
x++;
|
||||||
|
_;
|
||||||
|
}
|
||||||
|
function f1() m1() {
|
||||||
|
x += 7;
|
||||||
|
}
|
||||||
|
function f2() m1() {
|
||||||
|
x += 3;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)";
|
||||||
|
compileAndRun(sourceCode, 0, "C");
|
||||||
|
BOOST_CHECK(callContractFunction("f1()") == bytes());
|
||||||
|
BOOST_CHECK(callContractFunction("x()") == encodeArgs(u256(8)));
|
||||||
|
BOOST_CHECK(callContractFunction("f2()") == bytes());
|
||||||
|
BOOST_CHECK(callContractFunction("x()") == encodeArgs(u256(12)));
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE_END()
|
BOOST_AUTO_TEST_SUITE_END()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user