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

Merge pull request #11441 from ethereum/sourceLocationOfBlocks

Browse Source 
Properly set source location of bare blocks.
This commit is contained in:
chriseth 2021-05-31 20:31:50 +02:00 committed by GitHub
commit 7d1df95176
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -17,6 +17,7 @@ Compiler Features:
Bugfixes: Bugfixes:
* AST: Do not output value of Yul literal if it is not a valid UTF-8 string. * AST: Do not output value of Yul literal if it is not a valid UTF-8 string.
* SMTChecker: Fix internal error on struct constructor with fixed bytes member initialized with string literal. * SMTChecker: Fix internal error on struct constructor with fixed bytes member initialized with string literal.
* Source Locations: Properly set source location of scoped blocks.
* Standard JSON: Properly allow the ``inliner`` setting under ``settings.optimizer.details``. * Standard JSON: Properly allow the ``inliner`` setting under ``settings.optimizer.details``.
* Type Checker: Fix internal compiler error related to having mapping types in constructor parameter for abstract contracts. * Type Checker: Fix internal compiler error related to having mapping types in constructor parameter for abstract contracts.

2
libsolidity/codegen/ContractCompiler.cpp
View File

@ -1354,6 +1354,7 @@ bool ContractCompiler::visit(PlaceholderStatement const& _placeholderStatement)
bool ContractCompiler::visit(Block const& _block) bool ContractCompiler::visit(Block const& _block)
{ {
m_context.pushVisitedNodes(&_block);
if (_block.unchecked()) if (_block.unchecked())
{ {
solAssert(m_context.arithmetic() == Arithmetic::Checked, ""); solAssert(m_context.arithmetic() == Arithmetic::Checked, "");
@ -1372,6 +1373,7 @@ void ContractCompiler::endVisit(Block const& _block)
} }
// Frees local variables declared in the scope of this block. // Frees local variables declared in the scope of this block.
popScopedVariables(&_block); popScopedVariables(&_block);
m_context.popVisitedNodes();
} }
void ContractCompiler::appendMissingFunctions() void ContractCompiler::appendMissingFunctions()

37
test/libsolidity/StandardCompiler.cpp
View File

@ -1758,6 +1758,43 @@ BOOST_AUTO_TEST_CASE(dependency_tracking_of_abstract_contract_yul)
BOOST_REQUIRE(result["sources"].size() == 1); BOOST_REQUIRE(result["sources"].size() == 1);
} }
BOOST_AUTO_TEST_CASE(source_location_of_bare_block)
{
char const* input = R"(
{
"language": "Solidity",
"sources": {
"A.sol": {
"content": "contract A { constructor() { uint x = 2; { uint y = 3; } } }"
}
},
"settings": {
"outputSelection": {
"A.sol": {
"A": ["evm.bytecode.sourceMap"]
}
}
}
}
)";
Json::Value parsedInput;
BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
solidity::frontend::StandardCompiler compiler;
Json::Value result = compiler.compile(parsedInput);
string sourceMap = result["contracts"]["A.sol"]["A"]["evm"]["bytecode"]["sourceMap"].asString();
// Check that the bare block's source location is referenced.
string sourceRef =
";" +
to_string(string{"contract A { constructor() { uint x = 2; "}.size()) +
":" +
to_string(string{"{ uint y = 3; }"}.size());
BOOST_REQUIRE(sourceMap.find(sourceRef) != string::npos);
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
} // end namespaces } // end namespaces