cerc-io/solidity
10
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 #11993 from ethereum/remove-trailing-whitespace-after-location-with-no-snippet

Browse Source 
Don't include whitespace after `@src` tag if there's no snippet
This commit is contained in:
chriseth 2021-09-20 14:10:59 +02:00 committed by GitHub
commit 2c3322cbf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libyul/AsmPrinter.cpp
View File

@ -293,7 +293,7 @@ string AsmPrinter::formatSourceLocation(
":" +
to_string(_location.end);
return joinHumanReadable(vector<string>{sourceLocation, solidityCodeSnippet}, " ");
return sourceLocation + (solidityCodeSnippet.empty() ? "" : " ") + solidityCodeSnippet;
}
string AsmPrinter::formatDebugData(shared_ptr<DebugData const> const& _debugData, bool _statement)

12
test/cmdlineTests/standard_yul_source_locations/output.json
View File

@ -599,15 +599,15 @@ object \"C_54\" {
let newFreePtr := add(160, and(add(argSize, 31), not(31)))
if or(gt(newFreePtr, sub(shl(64, 1), 1)), lt(newFreePtr, 160))
{
mstore(/** @src -1:-1:-1 */ 0, /** @src 0:79:435 \"contract C...\" */ shl(224, 0x4e487b71))
mstore(/** @src -1:-1:-1 */ 0, /** @src 0:79:435 \"contract C...\" */ shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(/** @src -1:-1:-1 */ 0, /** @src 0:79:435 \"contract C...\" */ 0x24)
revert(/** @src -1:-1:-1 */ 0, /** @src 0:79:435 \"contract C...\" */ 0x24)
}
mstore(64, newFreePtr)
codecopy(160, programSize, argSize)
if slt(argSize, 32)
{
revert(/** @src -1:-1:-1 */ 0, 0)
revert(/** @src -1:-1:-1 */ 0, 0)
}
/// @src 0:79:435 \"contract C...\"
constructor_C(mload(160))
@ -1431,15 +1431,15 @@ object \"D_72\" {
let newFreePtr := add(160, and(add(argSize, 31), not(31)))
if or(gt(newFreePtr, sub(shl(64, 1), 1)), lt(newFreePtr, 160))
{
mstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166 \"contract D is C(3)...\" */ shl(224, 0x4e487b71))
mstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166 \"contract D is C(3)...\" */ shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(/** @src -1:-1:-1 */ 0, /** @src 1:91:166 \"contract D is C(3)...\" */ 0x24)
revert(/** @src -1:-1:-1 */ 0, /** @src 1:91:166 \"contract D is C(3)...\" */ 0x24)
}
mstore(64, newFreePtr)
codecopy(160, programSize, argSize)
if slt(argSize, 32)
{
revert(/** @src -1:-1:-1 */ 0, 0)
revert(/** @src -1:-1:-1 */ 0, 0)
}
/// @src 1:91:166 \"contract D is C(3)...\"
constructor_D(mload(160))