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

Reject optimizer options as invalid in linker and Standard JSON modes

Browse Source
This commit is contained in:
Kamil Śliwak 2021-08-03 17:16:41 +02:00
parent b7c124911a
commit 7a36a1d1db
43 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.md
View File

@ -12,11 +12,12 @@ Compiler Features:
* SMTChecker: Support low level ``call`` as external calls to unknown code.
* SMTChecker: Add constraints to better correlate ``address(this).balance`` and ``msg.value``.
* SMTChecker: Support the ``value`` option for external function calls.
* Commandline Interface: Disallowed the ``--experimental-via-ir`` option to be used with Standard Json, Assembler and Linker modes.
Bugfixes:
* Code Generator: Use stable source order for ABI functions.
* Commandline Interface: Report optimizer options as invalid in Standard JSON and linker modes instead of ignoring them.
* Commandline Interface: Disallow the ``--experimental-via-ir`` option in Standard JSON, Assembler and Linker modes.
* Opcode Optimizer: Prevent the optimizer from running multiple times to avoid potential bytecode differences for referenced code.
* Name Resolver: Fix that when importing an aliased symbol using ``import {AliasedName} from "a.sol"`` it would use the original name of the symbol and not the aliased one.
* SMTChecker: Fix false negative caused by ``push`` on storage array references returned by internal functions.

20
solc/CommandLineParser.cpp
View File

@ -940,6 +940,26 @@ General Information)").c_str(),
if (!parseInputPathsAndRemappings())
return false;
if (
m_options.input.mode != InputMode::Compiler &&
m_options.input.mode != InputMode::CompilerWithASTImport &&
m_options.input.mode != InputMode::Assembler
)
{
if (!m_args[g_strOptimizeRuns].defaulted())
{
serr() << "Option --" << g_strOptimizeRuns << " is only valid in compiler and assembler modes." << endl;
return false;
}
for (string const& option: {g_strOptimize, g_strNoOptimizeYul, g_strOptimizeYul, g_strYulOptimizations})
if (m_args.count(option) > 0)
{
serr() << "Option --" << option << " is only valid in compiler and assembler modes." << endl;
return false;
}
}
if (m_options.input.mode == InputMode::StandardJson)
return true;

1
test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/args Normal file
View File

@ -0,0 +1 @@
--no-optimize-yul --link --libraries input.sol:L=0x1234567890123456789012345678901234567890

1
test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/err Normal file
View File

@ -0,0 +1 @@
Option --no-optimize-yul is only valid in compiler and assembler modes.

1
test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/exit Normal file
View File

@ -0,0 +1 @@
1

0
test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/input.bin Normal file
View File

1
test/cmdlineTests/linker_mode_invalid_option_optimize/args Normal file
View File

@ -0,0 +1 @@
--optimize --link --libraries input.sol:L=0x1234567890123456789012345678901234567890

1
test/cmdlineTests/linker_mode_invalid_option_optimize/err Normal file
View File

@ -0,0 +1 @@
Option --optimize is only valid in compiler and assembler modes.

1
test/cmdlineTests/linker_mode_invalid_option_optimize/exit Normal file
View File

@ -0,0 +1 @@
1

0
test/cmdlineTests/linker_mode_invalid_option_optimize/input.bin Normal file
View File

1
test/cmdlineTests/linker_mode_invalid_option_optimize_runs/args Normal file
View File

@ -0,0 +1 @@
--optimize-runs 1000 --link --libraries input.sol:L=0x1234567890123456789012345678901234567890

1
test/cmdlineTests/linker_mode_invalid_option_optimize_runs/err Normal file
View File

@ -0,0 +1 @@
Option --optimize-runs is only valid in compiler and assembler modes.

1
test/cmdlineTests/linker_mode_invalid_option_optimize_runs/exit Normal file
View File

@ -0,0 +1 @@
1

0
test/cmdlineTests/linker_mode_invalid_option_optimize_runs/input.bin Normal file
View File

1
test/cmdlineTests/linker_mode_invalid_option_optimize_yul/args Normal file
View File

@ -0,0 +1 @@
--optimize-yul --link --libraries input.sol:L=0x1234567890123456789012345678901234567890

1
test/cmdlineTests/linker_mode_invalid_option_optimize_yul/err Normal file
View File

@ -0,0 +1 @@
Option --optimize-yul is only valid in compiler and assembler modes.

1
test/cmdlineTests/linker_mode_invalid_option_optimize_yul/exit Normal file
View File

@ -0,0 +1 @@
1

0
test/cmdlineTests/linker_mode_invalid_option_optimize_yul/input.bin Normal file
View File

1
test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/args Normal file
View File

@ -0,0 +1 @@
--yul-optimizations a --link --libraries input.sol:L=0x1234567890123456789012345678901234567890

1
test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/err Normal file
View File

@ -0,0 +1 @@
Option --yul-optimizations is only valid in compiler and assembler modes.

1
test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/exit Normal file
View File

@ -0,0 +1 @@
1

0
test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/input.bin Normal file
View File

1
test/cmdlineTests/standard_invalid_option_no_optimize_yul/args Normal file
View File

@ -0,0 +1 @@
--no-optimize-yul

1
test/cmdlineTests/standard_invalid_option_no_optimize_yul/err Normal file
View File

@ -0,0 +1 @@
Option --no-optimize-yul is only valid in compiler and assembler modes.

1
test/cmdlineTests/standard_invalid_option_no_optimize_yul/exit Normal file
View File

@ -0,0 +1 @@
1

0
test/cmdlineTests/standard_invalid_option_no_optimize_yul/input.json Normal file
View File

1
test/cmdlineTests/standard_invalid_option_optimize/args Normal file
View File

@ -0,0 +1 @@
--optimize

1
test/cmdlineTests/standard_invalid_option_optimize/err Normal file
View File

@ -0,0 +1 @@
Option --optimize is only valid in compiler and assembler modes.

1
test/cmdlineTests/standard_invalid_option_optimize/exit Normal file
View File

@ -0,0 +1 @@
1

0
test/cmdlineTests/standard_invalid_option_optimize/input.json Normal file
View File

1
test/cmdlineTests/standard_invalid_option_optimize_runs/args Normal file
View File

@ -0,0 +1 @@
--optimize-runs 1000

1
test/cmdlineTests/standard_invalid_option_optimize_runs/err Normal file
View File

@ -0,0 +1 @@
Option --optimize-runs is only valid in compiler and assembler modes.

1
test/cmdlineTests/standard_invalid_option_optimize_runs/exit Normal file
View File

@ -0,0 +1 @@
1

0
test/cmdlineTests/standard_invalid_option_optimize_runs/input.json Normal file
View File

1
test/cmdlineTests/standard_invalid_option_optimize_yul/args Normal file
View File

@ -0,0 +1 @@
--optimize-yul

1
test/cmdlineTests/standard_invalid_option_optimize_yul/err Normal file
View File

@ -0,0 +1 @@
Option --optimize-yul is only valid in compiler and assembler modes.

1
test/cmdlineTests/standard_invalid_option_optimize_yul/exit Normal file
View File

@ -0,0 +1 @@
1

0
test/cmdlineTests/standard_invalid_option_optimize_yul/input.json Normal file
View File

1
test/cmdlineTests/standard_invalid_option_yul_optimizations/args Normal file
View File

@ -0,0 +1 @@
--yul-optimizations a

1
test/cmdlineTests/standard_invalid_option_yul_optimizations/err Normal file
View File

@ -0,0 +1 @@
Option --yul-optimizations is only valid in compiler and assembler modes.

1
test/cmdlineTests/standard_invalid_option_yul_optimizations/exit Normal file
View File

@ -0,0 +1 @@
1

0
test/cmdlineTests/standard_invalid_option_yul_optimizations/input.json Normal file
View File

3
test/solc/CommandLineParser.cpp
View File

@ -368,9 +368,6 @@ BOOST_AUTO_TEST_CASE(standard_json_mode_options)
"--combined-json=abi,bin", // Accepted but has no effect in Standard JSON mode
"--metadata-hash=swarm", // Ignored in Standard JSON mode
"--metadata-literal", // Ignored in Standard JSON mode
"--optimize", // Ignored in Standard JSON mode
"--optimize-runs=1000", // Ignored in Standard JSON mode
"--yul-optimizations=agf",
"--model-checker-contracts=" // Ignored in Standard JSON mode
"contract1.yul:A,"
"contract2.yul:B",