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

Ensure we fail gracefully when user tries to optimize Yul code

Browse Source
This commit is contained in:
Bhargava Shastry 2019-02-06 14:39:43 +01:00
parent 0b392fff7e
commit 7751fa740f
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -6,6 +6,7 @@ Bugfixes:
* Type Checker: Dissallow mappings with data locations other than 'storage' * Type Checker: Dissallow mappings with data locations other than 'storage'
* Type Checker: Fix internal error when a struct array index does not fit into a uint256. * Type Checker: Fix internal error when a struct array index does not fit into a uint256.
* Type system: Properly report packed encoded size for arrays and structs (mostly unused until now). * Type system: Properly report packed encoded size for arrays and structs (mostly unused until now).
* Commandline interface: Allow yul optimizer only for strict assembly.
Language Features: Language Features:

3
libsolidity/interface/AssemblyStack.cpp
View File

@ -84,7 +84,8 @@ bool AssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string
void AssemblyStack::optimize() void AssemblyStack::optimize()
{ {
solAssert(m_language != Language::Assembly, "Optimization requested for loose assembly."); if (m_language != Language::StrictAssembly)
solUnimplemented("Optimizer for both loose assembly and Yul is not yet implemented");
solAssert(m_analysisSuccessful, "Analysis was not successful."); solAssert(m_analysisSuccessful, "Analysis was not successful.");
m_analysisSuccessful = false; m_analysisSuccessful = false;
optimize(*m_parserResult); optimize(*m_parserResult);

6
solc/CommandLineInterface.cpp
View File

@ -861,13 +861,11 @@ bool CommandLineInterface::processInput()
return false; return false;
} }
} }
if (optimize && inputLanguage == Input::Assembly) if (optimize && inputLanguage != Input::StrictAssembly)
{ {
serr() << serr() <<
"Optimizer cannot be used for loose assembly. Use --" << "Optimizer can only be used for strict assembly. Use --" <<
g_strStrictAssembly << g_strStrictAssembly <<
" or --" <<
g_strYul <<
"." << "." <<
endl; endl;
return false; return false;

3
test/cmdlineTests.sh
View File

@ -332,13 +332,12 @@ printTask "Testing assemble, yul, strict-assembly and optimize..."
# Test options above in conjunction with --optimize. # Test options above in conjunction with --optimize.
# Using both, --assemble and --optimize should fail. # Using both, --assemble and --optimize should fail.
! echo '{}' | "$SOLC" - --assemble --optimize &>/dev/null ! echo '{}' | "$SOLC" - --assemble --optimize &>/dev/null
! echo '{}' | "$SOLC" - --yul --optimize &>/dev/null
# Test yul and strict assembly output # Test yul and strict assembly output
# Non-empty code results in non-empty binary representation with optimizations turned off, # Non-empty code results in non-empty binary representation with optimizations turned off,
# while it results in empty binary representation with optimizations turned on. # while it results in empty binary representation with optimizations turned on.
test_solc_assembly_output "{ let x:u256 := 0:u256 }" "{ let x:u256 := 0:u256 }" "--yul" test_solc_assembly_output "{ let x:u256 := 0:u256 }" "{ let x:u256 := 0:u256 }" "--yul"
test_solc_assembly_output "{ let x:u256 := 0:u256 }" "{ }" "--yul --optimize"
test_solc_assembly_output "{ let x := 0 }" "{ let x := 0 }" "--strict-assembly" test_solc_assembly_output "{ let x := 0 }" "{ let x := 0 }" "--strict-assembly"
test_solc_assembly_output "{ let x := 0 }" "{ }" "--strict-assembly --optimize" test_solc_assembly_output "{ let x := 0 }" "{ }" "--strict-assembly --optimize"
) )