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

Mapping access with multi-slot keys.

Browse Source
This commit is contained in:
chriseth 2021-02-24 13:44:23 +01:00
parent 2d48052ae5
commit 5e9637bc39
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/codegen/YulUtilFunctions.cpp
View File

@ -2353,8 +2353,6 @@ string YulUtilFunctions::copyArrayFromStorageToMemoryFunction(ArrayType const& _
string YulUtilFunctions::mappingIndexAccessFunction(MappingType const& _mappingType, Type const& _keyType) string YulUtilFunctions::mappingIndexAccessFunction(MappingType const& _mappingType, Type const& _keyType)
{ {
solAssert(_keyType.sizeOnStack() <= 1, "");
string functionName = "mapping_index_access_" + _mappingType.identifier() + "_of_" + _keyType.identifier(); string functionName = "mapping_index_access_" + _mappingType.identifier() + "_of_" + _keyType.identifier();
return m_functionCollector.createFunction(functionName, [&]() { return m_functionCollector.createFunction(functionName, [&]() {
if (_mappingType.keyType()->isDynamicallySized()) if (_mappingType.keyType()->isDynamicallySized())
@ -2364,7 +2362,7 @@ string YulUtilFunctions::mappingIndexAccessFunction(MappingType const& _mappingT
} }
)") )")
("functionName", functionName) ("functionName", functionName)
("key", _keyType.sizeOnStack() > 0 ? "key" : "") ("key", suffixedVariableNameList("key_", 0, _keyType.sizeOnStack()))
("hash", packedHashFunction( ("hash", packedHashFunction(
{&_keyType, TypeProvider::uint256()}, {&_keyType, TypeProvider::uint256()},
{_mappingType.keyType(), TypeProvider::uint256()} {_mappingType.keyType(), TypeProvider::uint256()}

1
libsolidity/codegen/ir/IRGeneratorForStatements.cpp
View File

@ -2062,7 +2062,6 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
MappingType const& mappingType = dynamic_cast<MappingType const&>(baseType); MappingType const& mappingType = dynamic_cast<MappingType const&>(baseType);
Type const& keyType = *_indexAccess.indexExpression()->annotation().type; Type const& keyType = *_indexAccess.indexExpression()->annotation().type;
solAssert(keyType.sizeOnStack() <= 1, "");
string slot = m_context.newYulVariable(); string slot = m_context.newYulVariable();
Whiskers templ("let <slot> := <indexAccess>(<base><?+key>,<key></+key>)\n"); Whiskers templ("let <slot> := <indexAccess>(<base><?+key>,<key></+key>)\n");

24
test/libsolidity/semanticTests/storage/mapping_string_key.sol Normal file
View File

@ -0,0 +1,24 @@
contract C {
mapping (string => uint) m_nameToRecord;
function set(string calldata key, uint value) external {
m_nameToRecord[key] = value;
}
function get(string calldata key) external view returns (uint) {
return m_nameToRecord[key];
}
function setFixed(uint value) external {
m_nameToRecord["fixed"] = value;
}
function getFixed() external view returns (uint) {
return m_nameToRecord["fixed"];
}
}
// ====
// compileViaYul: also
// ----
// set(string,uint256): 0x40, 8, 3, "abc" ->
// get(string): 0x20, 3, "abc" -> 8
// get(string): 0x20, 3, "abe" -> 0
// getFixed() -> 0
// setFixed(uint256): 9 ->
// getFixed() -> 9