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

Fix source location for `if` statements.

Browse Source
This commit is contained in:
Christian Parpart 2021-06-16 12:38:34 +02:00 committed by chriseth
parent 46514ffad2
commit f9f32c910d
9 changed files with 18 additions and 16 deletions
Changelog.md
libyul
AsmParser.cpp
test
cmdlineTests
combined_json_generated_sources
output
optimizer_inliner_dynamic_reference
output
optimizer_inliner_dynamic_reference_constructor
output
standard_generatedSources
output.json
standard_optimizer_generatedSources
output.json
strict_asm_optimizer_steps
output
libyul/objectCompiler
jump_tags.yul

1
Changelog.md
View File

@ -18,6 +18,7 @@ Bugfixes:
* Type Checker: Fix internal error and prevent static calls to unimplemented modifiers.
* Yul Code Generator: Fix internal compiler error when using a long literal with bitwise negation.
* Yul Code Generator: Fix source location references for calls to builtin functions.
* Yul Parser: Fix source location references for ``if`` statements.
### 0.8.6 (2021-06-22)

1
libyul/AsmParser.cpp
View File

@ -107,6 +107,7 @@ Statement Parser::parseStatement()
advance();
_if.condition = make_unique<Expression>(parseExpression());
_if.body = parseBlock();
_if.debugData = updateLocationEndFrom(_if.debugData, _if.body.debugData->location);
return Statement{move(_if)};
}
case Token::Switch:

10
test/cmdlineTests/combined_json_generated_sources/output
View File

@ -103,7 +103,7 @@
"src": "127:35:1"
},
"nodeType": "YulIf",
"src": "124:2:1"
"src": "124:122:1"
},
{
"nodeType": "YulAssignment",
@ -188,7 +188,7 @@
"src": "297:30:1"
},
"nodeType": "YulIf",
"src": "294:2:1"
"src": "294:117:1"
},
{
"nodeType": "YulAssignment",
@ -316,7 +316,7 @@
"src": "461:41:1"
},
"nodeType": "YulIf",
"src": "458:2:1"
"src": "458:128:1"
}
]
},
@ -431,7 +431,7 @@
"src": "712:32:1"
},
"nodeType": "YulIf",
"src": "709:2:1"
"src": "709:119:1"
},
{
"nodeType": "YulBlock",
@ -542,7 +542,7 @@
"src": "914:30:1"
},
"nodeType": "YulIf",
"src": "911:2:1"
"src": "911:117:1"
},
{
"nodeType": "YulAssignment",

4
test/cmdlineTests/optimizer_inliner_dynamic_reference/output
View File

@ -162,7 +162,7 @@ sub_0: assembly {
dup3
/* "#utility.yul":257:270 */
gt
/* "#utility.yul":254:256 */
/* "#utility.yul":254:390 */
iszero
tag_30
jumpi
@ -188,7 +188,7 @@ sub_0: assembly {
0x00
/* "#utility.yul":365:380 */
revert
/* "#utility.yul":254:256 */
/* "#utility.yul":254:390 */
tag_30:
pop
/* "#utility.yul":406:415 */

4
test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output
View File

@ -167,7 +167,7 @@ sub_0: assembly {
dup3
/* "#utility.yul":257:270 */
gt
/* "#utility.yul":254:256 */
/* "#utility.yul":254:390 */
iszero
tag_26
jumpi
@ -193,7 +193,7 @@ sub_0: assembly {
0x00
/* "#utility.yul":365:380 */
revert
/* "#utility.yul":254:256 */
/* "#utility.yul":254:390 */
tag_26:
pop
/* "#utility.yul":406:415 */

2
test/cmdlineTests/standard_generatedSources/output.json
View File

File diff suppressed because one or more lines are too long

2
test/cmdlineTests/standard_optimizer_generatedSources/output.json
View File

File diff suppressed because one or more lines are too long

4
test/cmdlineTests/strict_asm_optimizer_steps/output
View File

@ -36,7 +36,7 @@ Text representation:
mstore
/* "strict_asm_optimizer_steps/input.yul":61:72 */
callvalue
/* "strict_asm_optimizer_steps/input.yul":58:60 */
/* "strict_asm_optimizer_steps/input.yul":58:89 */
iszero
tag_1
jumpi
@ -46,7 +46,7 @@ Text representation:
dup1
/* "strict_asm_optimizer_steps/input.yul":75:87 */
revert
/* "strict_asm_optimizer_steps/input.yul":58:60 */
/* "strict_asm_optimizer_steps/input.yul":58:89 */
tag_1:
/* "strict_asm_optimizer_steps/input.yul":138:162 */
dataSize(sub_0)

6
test/libyul/objectCompiler/jump_tags.yul
View File

@ -28,14 +28,14 @@ object "Contract" {
// tag_5:
// /* "source":78:79 */
// dup1
// /* "source":75:77 */
// /* "source":75:89 */
// iszero
// tag_7
// jumpi
// /* "source":82:87 */
// pop
// jump(tag_6)
// /* "source":75:77 */
// /* "source":75:89 */
// tag_7:
// /* "source":90:102 */
// tag_8
@ -64,4 +64,4 @@ object "Contract" {
// tag_9:
// Bytecode: 6026565b600b6001600e565b5b565b8015601857506024565b602260028201600e565b505b565b602e6001600e565b
// Opcodes: PUSH1 0x26 JUMP JUMPDEST PUSH1 0xB PUSH1 0x1 PUSH1 0xE JUMP JUMPDEST JUMPDEST JUMP JUMPDEST DUP1 ISZERO PUSH1 0x18 JUMPI POP PUSH1 0x24 JUMP JUMPDEST PUSH1 0x22 PUSH1 0x2 DUP3 ADD PUSH1 0xE JUMP JUMPDEST POP JUMPDEST JUMP JUMPDEST PUSH1 0x2E PUSH1 0x1 PUSH1 0xE JUMP JUMPDEST
// SourceMappings: 33:21:0:-:0;;;48:4;50:1;48:4;:::i;:::-;33:21;:::o;59:45::-;78:1;75:2;;;82:5;;;75:2;90:12;99:1;96;92:9;90:12;:::i;:::-;59:45;;:::o;:::-;109:4;111:1;109:4;:::i;:::-
// SourceMappings: 33:21:0:-:0;;;48:4;50:1;48:4;:::i;:::-;33:21;:::o;59:45::-;78:1;75:14;;;82:5;;;75:14;90:12;99:1;96;92:9;90:12;:::i;:::-;59:45;;:::o;:::-;109:4;111:1;109:4;:::i;:::-