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 #11419 from ethereum/sc-inline

Browse Source 
Properly support inliner in settings.optimizer.details
This commit is contained in:
Kamil Śliwak 2021-05-21 17:51:39 +02:00 committed by GitHub
commit 29c8f282e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -14,6 +14,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.
* Standard JSON: Properly allow the ``inliner`` setting under ``settings.optimizer.details``.
AST Changes: AST Changes:

2
libsolidity/interface/StandardCompiler.cpp
View File

@ -449,7 +449,7 @@ std::optional<Json::Value> checkOptimizerKeys(Json::Value const& _input)
std::optional<Json::Value> checkOptimizerDetailsKeys(Json::Value const& _input) std::optional<Json::Value> checkOptimizerDetailsKeys(Json::Value const& _input)
{ {
static set<string> keys{"peephole", "jumpdestRemover", "orderLiterals", "deduplicate", "cse", "constantOptimizer", "yul", "yulDetails"}; static set<string> keys{"peephole", "inliner", "jumpdestRemover", "orderLiterals", "deduplicate", "cse", "constantOptimizer", "yul", "yulDetails"};
return checkKeys(_input, keys, "settings.optimizer.details"); return checkKeys(_input, keys, "settings.optimizer.details");
} }

3
test/libsolidity/StandardCompiler.cpp
View File

@ -1195,7 +1195,8 @@ BOOST_AUTO_TEST_CASE(optimizer_settings_details_different)
"jumpdestRemover" : true, "jumpdestRemover" : true,
"orderLiterals" : false, "orderLiterals" : false,
"peephole" : true, "peephole" : true,
"yul": true "yul": true,
"inliner": true
} } } }
}, },
"sources": { "sources": {