cerc-io/solidity
10
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 #11842 from v-sreekesh/reserve-basefee

Browse Source 
[BREAKING] Revert commit and Make basefee a reserved identifier in 0.9.0
This commit is contained in:
Leo 2022-03-07 10:16:41 +01:00 committed by GitHub
commit 1d4cc6dc73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -7,6 +7,7 @@ Breaking changes:
* Inline Assembly: Consider functions, function parameters and return variables for shadowing checks. * Inline Assembly: Consider functions, function parameters and return variables for shadowing checks.
* Commandline Interface: Remapping targets are not automatically added to allowed paths. * Commandline Interface: Remapping targets are not automatically added to allowed paths.
* Commandline Interface: Assembler mode no longer enables all outputs by default. * Commandline Interface: Assembler mode no longer enables all outputs by default.
* General: The identifier ``basefee`` is a reserved identifier in Yul for all EVM versions.
### 0.8.13 (unreleased) ### 0.8.13 (unreleased)

2
docs/090-breaking-changes.rst
View File

@ -15,7 +15,7 @@ Silent Changes of the Semantics
New Restrictions New Restrictions
================ ================
... - Make ``basefee`` a reserved identifier in assembly.
Interface Changes Interface Changes
================= =================

14
libyul/backends/evm/EVMDialect.cpp
View File

@ -109,22 +109,14 @@ pair<YulString, BuiltinFunctionForEVM> createFunction(
return {name, f}; return {name, f};
} }
set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion) set<YulString> createReservedIdentifiers()
{ {
// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the name
// basefee for VMs before london.
auto baseFeeException = [&](evmasm::Instruction _instr) -> bool
{
return _instr == evmasm::Instruction::BASEFEE && _evmVersion < langutil::EVMVersion::london();
};
set<YulString> reserved; set<YulString> reserved;
for (auto const& instr: evmasm::c_instructions) for (auto const& instr: evmasm::c_instructions)
{ {
string name = instr.first; string name = instr.first;
transform(name.begin(), name.end(), name.begin(), [](unsigned char _c) { return tolower(_c); }); transform(name.begin(), name.end(), name.begin(), [](unsigned char _c) { return tolower(_c); });
if (!baseFeeException(instr.second)) reserved.emplace(name);
reserved.emplace(name);
} }
reserved += vector<YulString>{ reserved += vector<YulString>{
"linkersymbol"_yulstring, "linkersymbol"_yulstring,
@ -292,7 +284,7 @@ EVMDialect::EVMDialect(langutil::EVMVersion _evmVersion, bool _objectAccess):
m_objectAccess(_objectAccess), m_objectAccess(_objectAccess),
m_evmVersion(_evmVersion), m_evmVersion(_evmVersion),
m_functions(createBuiltins(_evmVersion, _objectAccess)), m_functions(createBuiltins(_evmVersion, _objectAccess)),
m_reserved(createReservedIdentifiers(_evmVersion)) m_reserved(createReservedIdentifiers())
{ {
} }

3
scripts/error_codes.py
View File

@ -201,8 +201,7 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
# The warning may or may not exist in a compiler build. # The warning may or may not exist in a compiler build.
"4591", # "There are more than 256 warnings. Ignoring the rest." "4591", # "There are more than 256 warnings. Ignoring the rest."
# Due to 3805, the warning lists look different for different compiler builds. # Due to 3805, the warning lists look different for different compiler builds.
"1834", # Unimplemented feature error, as we do not test it anymore via cmdLineTests "1834" # Unimplemented feature error, as we do not test it anymore via cmdLineTests
"5430" # basefee being used in inline assembly for EVMVersion < london
} }
assert len(test_ids & white_ids) == 0, "The sets are not supposed to intersect" assert len(test_ids & white_ids) == 0, "The sets are not supposed to intersect"
test_ids |= white_ids test_ids |= white_ids

7
test/libsolidity/semanticTests/inlineAssembly/basefee_berlin_function.sol → test/libsolidity/syntaxTests/inlineAssembly/basefee_berlin_function.sol
View File

@ -15,8 +15,7 @@ contract C {
} }
} }
// ==== // ====
// compileViaYul: also // EVMVersion: =berlin
// EVMVersion: <=berlin
// ---- // ----
// f() -> 0 // DeclarationError 5017: (98-105): The identifier "basefee" is reserved and can not be used.
// g() -> 1000 // DeclarationError 5017: (242-307): The identifier "basefee" is reserved and can not be used.

9
test/libsolidity/syntaxTests/types/magic_block_basefee_error.sol
View File

@ -2,8 +2,15 @@ contract C {
function f() public view returns (uint) { function f() public view returns (uint) {
return block.basefee; return block.basefee;
} }
function g() public view returns (uint ret) {
assembly {
ret := basefee()
}
}
} }
// ==== // ====
// EVMVersion: <=berlin // EVMVersion: =berlin
// ---- // ----
// TypeError 5921: (74-87): "basefee" is not supported by the VM version. // TypeError 5921: (74-87): "basefee" is not supported by the VM version.
// TypeError 5430: (183-190): The "basefee" instruction is only available for London-compatible VMs (you are currently compiling for "berlin").
// DeclarationError 8678: (176-192): Variable count for assignment to "ret" does not match number of values (1 vs. 0)