cerc-io/solidity
11
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 remote-tracking branch 'origin/develop' into breaking

Browse Source
This commit is contained in:
chriseth
2022-04-13 17:08:27 +02:00
parent 0d96c5c8a5 25923c1f08
commit a433511128
186 changed files with 3081 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/cmdlineTests/asm_json/args
+1 -1
View File
@@ -1 +1 @@
--asm-json
--asm-json --pretty-json
test/cmdlineTests/asm_json/output
+38 -33
View File
@@ -450,9 +450,9 @@ EVM assembly:
{
"begin": 77,
"end": 158,
"jumpType": "[in]",
"name": "JUMP",
"source": 0,
"value": "[in]"
"source": 0
},
{
"begin": 77,
@@ -477,9 +477,9 @@ EVM assembly:
{
"begin": 77,
"end": 158,
"jumpType": "[in]",
"name": "JUMP",
"source": 0,
"value": "[in]"
"source": 0
},
{
"begin": 77,
@@ -555,9 +555,9 @@ EVM assembly:
{
"begin": 118,
"end": 125,
"jumpType": "[in]",
"name": "JUMP",
"source": 0,
"value": "[in]"
"source": 0
},
{
"begin": 118,
@@ -657,9 +657,9 @@ EVM assembly:
{
"begin": 77,
"end": 158,
"jumpType": "[out]",
"name": "JUMP",
"source": 0,
"value": "[out]"
"source": 0
},
{
"begin": 88,
@@ -752,9 +752,9 @@ EVM assembly:
{
"begin": 334,
"end": 411,
"jumpType": "[out]",
"name": "JUMP",
"source": 1,
"value": "[out]"
"source": 1
},
{
"begin": 417,
@@ -792,9 +792,9 @@ EVM assembly:
{
"begin": 490,
"end": 514,
"jumpType": "[in]",
"name": "JUMP",
"source": 1,
"value": "[in]"
"source": 1
},
{
"begin": 490,
@@ -875,9 +875,9 @@ EVM assembly:
{
"begin": 417,
"end": 539,
"jumpType": "[out]",
"name": "JUMP",
"source": 1,
"value": "[out]"
"source": 1
},
{
"begin": 545,
@@ -946,9 +946,9 @@ EVM assembly:
{
"begin": 645,
"end": 678,
"jumpType": "[in]",
"name": "JUMP",
"source": 1,
"value": "[in]"
"source": 1
},
{
"begin": 645,
@@ -990,9 +990,9 @@ EVM assembly:
{
"begin": 545,
"end": 684,
"jumpType": "[out]",
"name": "JUMP",
"source": 1,
"value": "[out]"
"source": 1
},
{
"begin": 690,
@@ -1081,9 +1081,9 @@ EVM assembly:
{
"begin": 804,
"end": 883,
"jumpType": "[in]",
"name": "JUMP",
"source": 1,
"value": "[in]"
"source": 1
},
{
"begin": 804,
@@ -1159,9 +1159,9 @@ EVM assembly:
{
"begin": 949,
"end": 1002,
"jumpType": "[in]",
"name": "JUMP",
"source": 1,
"value": "[in]"
"source": 1
},
{
"begin": 949,
@@ -1221,9 +1221,9 @@ EVM assembly:
{
"begin": 690,
"end": 1019,
"jumpType": "[out]",
"name": "JUMP",
"source": 1,
"value": "[out]"
"source": 1
},
{
"begin": 1025,
@@ -1341,9 +1341,9 @@ EVM assembly:
{
"begin": 1270,
"end": 1290,
"jumpType": "[in]",
"name": "JUMP",
"source": 1,
"value": "[in]"
"source": 1
},
{
"begin": 1270,
@@ -1393,9 +1393,9 @@ EVM assembly:
{
"begin": 1304,
"end": 1324,
"jumpType": "[in]",
"name": "JUMP",
"source": 1,
"value": "[in]"
"source": 1
},
{
"begin": 1304,
@@ -1489,9 +1489,9 @@ EVM assembly:
{
"begin": 1464,
"end": 1482,
"jumpType": "[in]",
"name": "JUMP",
"source": 1,
"value": "[in]"
"source": 1
},
{
"begin": 1464,
@@ -1576,11 +1576,16 @@ EVM assembly:
{
"begin": 1211,
"end": 1516,
"jumpType": "[out]",
"name": "JUMP",
"source": 1,
"value": "[out]"
"source": 1
}
]
}
}
},
"sourceList":
[
"asm_json/input.sol",
"#utility.yul"
]
}
test/cmdlineTests/asm_json_no_pretty_print/args
+1
View File
@@ -0,0 +1 @@
--asm-json
test/cmdlineTests/asm_json_no_pretty_print/input.sol
+9
View File
@@ -0,0 +1,9 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity >=0.0;
contract C {
function f(uint x) public pure {
x += 42;
require(x > 100);
}
}
test/cmdlineTests/asm_json_no_pretty_print/output
+4
View File
File diff suppressed because one or more lines are too long
test/cmdlineTests/ast_compact_json_no_pretty_json/args
+1
View File
@@ -0,0 +1 @@
--ast-compact-json --allow-paths .
test/cmdlineTests/ast_compact_json_no_pretty_json/input.sol
+4
View File
@@ -0,0 +1,4 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity >=0.0;
contract C {}
test/cmdlineTests/ast_compact_json_no_pretty_json/output
+5
View File
@@ -0,0 +1,5 @@
JSON AST (compact format):
======= ast_compact_json_no_pretty_json/input.sol =======
{"absolutePath":"ast_compact_json_no_pretty_json/input.sol","exportedSymbols":{"C":[2]},"id":3,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"C","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":2,"linearizedBaseContracts":[2],"name":"C","nameLocation":"69:1:0","nodeType":"ContractDefinition","nodes":[],"scope":3,"src":"60:13:0","usedErrors":[]}],"src":"36:38:0"}
test/cmdlineTests/ast_compact_json_with_base_path/args
+1 -1
View File
@@ -1 +1 @@
--ast-compact-json --base-path . --allow-paths .
--ast-compact-json --pretty-json --base-path . --allow-paths .
test/cmdlineTests/pretty_json_combined/args → test/cmdlineTests/combined_json_abi/args
View File
test/cmdlineTests/pretty_json_combined/input.sol → test/cmdlineTests/combined_json_abi/input.sol
View File
test/cmdlineTests/pretty_json_combined/output → test/cmdlineTests/combined_json_abi/output
+1 -1
View File
@@ -1,7 +1,7 @@
{
"contracts":
{
"pretty_json_combined/input.sol:C":
"combined_json_abi/input.sol:C":
{
"abi": []
}
test/cmdlineTests/combined_json_no_pretty_print/args
+1
View File
@@ -0,0 +1 @@
--combined-json abi
test/cmdlineTests/combined_json_no_pretty_print/input.sol
+3
View File
@@ -0,0 +1,3 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity >=0.0;
contract C {}
test/cmdlineTests/combined_json_no_pretty_print/output
+1
View File
@@ -0,0 +1 @@
{"contracts":{"combined_json_no_pretty_print/input.sol:C":{"abi":[]}},"version": "<VERSION REMOVED>"}
test/cmdlineTests/combined_json_with_base_path/args
+1 -1
View File
@@ -1 +1 @@
--combined-json ast --base-path . --allow-paths .
--combined-json ast --pretty-json --base-path . --allow-paths .
test/cmdlineTests/combined_json_with_base_path/output
+111 -1
View File
@@ -1 +1,111 @@
{"contracts":{"combined_json_with_base_path/c.sol:C":{}},"sourceList":["combined_json_with_base_path/c.sol","combined_json_with_base_path/input.sol"],"sources":{"combined_json_with_base_path/c.sol":{"AST":{"absolutePath":"combined_json_with_base_path/c.sol","exportedSymbols":{"C":[5]},"id":6,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":4,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"C","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":5,"linearizedBaseContracts":[5],"name":"C","nameLocation":"69:1:0","nodeType":"ContractDefinition","nodes":[],"scope":6,"src":"60:13:0","usedErrors":[]}],"src":"36:38:0"}},"combined_json_with_base_path/input.sol":{"AST":{"absolutePath":"combined_json_with_base_path/input.sol","exportedSymbols":{"C":[5]},"id":3,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:1"},{"absolutePath":"combined_json_with_base_path/c.sol","file":"./c.sol","id":2,"nameLocation":"-1:-1:-1","nodeType":"ImportDirective","scope":3,"sourceUnit":6,"src":"60:17:1","symbolAliases":[],"unitAlias":""}],"src":"36:42:1"}}},"version": "<VERSION REMOVED>"}
{
"contracts":
{
"combined_json_with_base_path/c.sol:C": {}
},
"sourceList":
[
"combined_json_with_base_path/c.sol",
"combined_json_with_base_path/input.sol"
],
"sources":
{
"combined_json_with_base_path/c.sol":
{
"AST":
{
"absolutePath": "combined_json_with_base_path/c.sol",
"exportedSymbols":
{
"C":
[
5
]
},
"id": 6,
"license": "GPL-3.0",
"nodeType": "SourceUnit",
"nodes":
[
{
"id": 4,
"literals":
[
"solidity",
">=",
"0.0"
],
"nodeType": "PragmaDirective",
"src": "36:22:0"
},
{
"abstract": false,
"baseContracts": [],
"canonicalName": "C",
"contractDependencies": [],
"contractKind": "contract",
"fullyImplemented": true,
"id": 5,
"linearizedBaseContracts":
[
5
],
"name": "C",
"nameLocation": "69:1:0",
"nodeType": "ContractDefinition",
"nodes": [],
"scope": 6,
"src": "60:13:0",
"usedErrors": []
}
],
"src": "36:38:0"
}
},
"combined_json_with_base_path/input.sol":
{
"AST":
{
"absolutePath": "combined_json_with_base_path/input.sol",
"exportedSymbols":
{
"C":
[
5
]
},
"id": 3,
"license": "GPL-3.0",
"nodeType": "SourceUnit",
"nodes":
[
{
"id": 1,
"literals":
[
"solidity",
">=",
"0.0"
],
"nodeType": "PragmaDirective",
"src": "36:22:1"
},
{
"absolutePath": "combined_json_with_base_path/c.sol",
"file": "./c.sol",
"id": 2,
"nameLocation": "-1:-1:-1",
"nodeType": "ImportDirective",
"scope": 3,
"sourceUnit": 6,
"src": "60:17:1",
"symbolAliases": [],
"unitAlias": ""
}
],
"src": "36:42:1"
}
}
},
"version": "<VERSION REMOVED>"
}
test/cmdlineTests/combined_json_with_devdoc/args
+1
View File
@@ -0,0 +1 @@
--combined-json devdoc --pretty-json --allow-paths .
test/cmdlineTests/combined_json_with_devdoc/input.sol
+8
View File
@@ -0,0 +1,8 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity >=0.0;
/// @dev This is devdoc.
contract C {}
/// And this is a notice.
contract D {}
test/cmdlineTests/combined_json_with_devdoc/output
+25
View File
@@ -0,0 +1,25 @@
{
"contracts":
{
"combined_json_with_devdoc/input.sol:C":
{
"devdoc":
{
"details": "This is devdoc.",
"kind": "dev",
"methods": {},
"version": 1
}
},
"combined_json_with_devdoc/input.sol:D":
{
"devdoc":
{
"kind": "dev",
"methods": {},
"version": 1
}
}
},
"version": "<VERSION REMOVED>"
}
test/cmdlineTests/combined_json_with_userdoc/args
+1
View File
@@ -0,0 +1 @@
--combined-json userdoc --pretty-json --allow-paths .
test/cmdlineTests/combined_json_with_userdoc/input.sol
+8
View File
@@ -0,0 +1,8 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity >=0.0;
/// @notice Description for users.
contract C {}
/// @dev Description for developers.
contract D {}
test/cmdlineTests/combined_json_with_userdoc/output
+25
View File
@@ -0,0 +1,25 @@
{
"contracts":
{
"combined_json_with_userdoc/input.sol:C":
{
"userdoc":
{
"kind": "user",
"methods": {},
"notice": "Description for users.",
"version": 1
}
},
"combined_json_with_userdoc/input.sol:D":
{
"userdoc":
{
"kind": "user",
"methods": {},
"version": 1
}
}
},
"version": "<VERSION REMOVED>"
}
test/cmdlineTests/function_debug_info_via_yul/output
+1 -1
View File
@@ -13,7 +13,7 @@
},
"calldata_array_index_access_uint256_dyn_calldata":
{
"entryPoint": 145,
"entryPoint": 144,
"parameterSlots": 2,
"returnSlots": 1
}
test/cmdlineTests/recovery_ast_constructor/args
+1 -1
View File
@@ -1 +1 @@
--error-recovery --ast-compact-json --hashes
--error-recovery --ast-compact-json --pretty-json --hashes
test/cmdlineTests/standard_json_no_pretty_print/args
View File
test/cmdlineTests/standard_json_no_pretty_print/input.json
+10
View File
@@ -0,0 +1,10 @@
{
"language": "Solidity",
"sources":
{
"A":
{
"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C {}"
}
}
}
test/cmdlineTests/standard_json_no_pretty_print/output.json
+1
View File
@@ -0,0 +1 @@
{"sources":{"A":{"id":0}}}
test/cmdlineTests/storage_layout_user_defined/args
+1 -1
View File
@@ -1 +1 @@
--storage-layout
--storage-layout --pretty-json
test/cmdlineTests/storage_layout_user_defined/output
+84 -1
View File
@@ -1,4 +1,87 @@
======= storage_layout_user_defined/input.sol:C =======
Contract Storage Layout:
{"storage":[{"astId":7,"contract":"storage_layout_user_defined/input.sol:C","label":"a","offset":0,"slot":"0","type":"t_userDefinedValueType(MyInt128)2"},{"astId":10,"contract":"storage_layout_user_defined/input.sol:C","label":"b","offset":16,"slot":"0","type":"t_userDefinedValueType(MyInt128)2"},{"astId":13,"contract":"storage_layout_user_defined/input.sol:C","label":"c","offset":0,"slot":"1","type":"t_userDefinedValueType(MyInt128)2"},{"astId":16,"contract":"storage_layout_user_defined/input.sol:C","label":"d","offset":16,"slot":"1","type":"t_userDefinedValueType(MyInt8)4"},{"astId":19,"contract":"storage_layout_user_defined/input.sol:C","label":"e","offset":17,"slot":"1","type":"t_userDefinedValueType(MyInt8)4"},{"astId":22,"contract":"storage_layout_user_defined/input.sol:C","label":"f","offset":18,"slot":"1","type":"t_userDefinedValueType(MyInt8)4"},{"astId":25,"contract":"storage_layout_user_defined/input.sol:C","label":"g","offset":19,"slot":"1","type":"t_userDefinedValueType(MyInt8)4"},{"astId":28,"contract":"storage_layout_user_defined/input.sol:C","label":"h","offset":20,"slot":"1","type":"t_userDefinedValueType(MyInt8)4"}],"types":{"t_userDefinedValueType(MyInt128)2":{"encoding":"inplace","label":"MyInt128","numberOfBytes":"16"},"t_userDefinedValueType(MyInt8)4":{"encoding":"inplace","label":"MyInt8","numberOfBytes":"1"}}}
{
"storage":
[
{
"astId": 7,
"contract": "storage_layout_user_defined/input.sol:C",
"label": "a",
"offset": 0,
"slot": "0",
"type": "t_userDefinedValueType(MyInt128)2"
},
{
"astId": 10,
"contract": "storage_layout_user_defined/input.sol:C",
"label": "b",
"offset": 16,
"slot": "0",
"type": "t_userDefinedValueType(MyInt128)2"
},
{
"astId": 13,
"contract": "storage_layout_user_defined/input.sol:C",
"label": "c",
"offset": 0,
"slot": "1",
"type": "t_userDefinedValueType(MyInt128)2"
},
{
"astId": 16,
"contract": "storage_layout_user_defined/input.sol:C",
"label": "d",
"offset": 16,
"slot": "1",
"type": "t_userDefinedValueType(MyInt8)4"
},
{
"astId": 19,
"contract": "storage_layout_user_defined/input.sol:C",
"label": "e",
"offset": 17,
"slot": "1",
"type": "t_userDefinedValueType(MyInt8)4"
},
{
"astId": 22,
"contract": "storage_layout_user_defined/input.sol:C",
"label": "f",
"offset": 18,
"slot": "1",
"type": "t_userDefinedValueType(MyInt8)4"
},
{
"astId": 25,
"contract": "storage_layout_user_defined/input.sol:C",
"label": "g",
"offset": 19,
"slot": "1",
"type": "t_userDefinedValueType(MyInt8)4"
},
{
"astId": 28,
"contract": "storage_layout_user_defined/input.sol:C",
"label": "h",
"offset": 20,
"slot": "1",
"type": "t_userDefinedValueType(MyInt8)4"
}
],
"types":
{
"t_userDefinedValueType(MyInt128)2":
{
"encoding": "inplace",
"label": "MyInt128",
"numberOfBytes": "16"
},
"t_userDefinedValueType(MyInt8)4":
{
"encoding": "inplace",
"label": "MyInt8",
"numberOfBytes": "1"
}
}
}
test/cmdlineTests/storage_layout_user_defined_no_pretty_print/args
+1
View File
@@ -0,0 +1 @@
--storage-layout
test/cmdlineTests/storage_layout_user_defined_no_pretty_print/input.sol
+4
View File
@@ -0,0 +1,4 @@
// SPDX-License-Identifier: GPL v3
pragma solidity >=0.0;
contract C {}
test/cmdlineTests/storage_layout_user_defined_no_pretty_print/output
+4
View File
@@ -0,0 +1,4 @@
======= storage_layout_user_defined_no_pretty_print/input.sol:C =======
Contract Storage Layout:
{"storage":[]}
test/cmdlineTests/viair_subobject_optimization/output
-1
View File
@@ -125,7 +125,6 @@ sub_0: assembly {
eq
tag_4
jumpi
pop
0x00
dup1
revert