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 #10893 from ethereum/string2BytesSol2Yul

Browse Source 
[Sol->Yul] Fixing string calldata to bytes calldata conversion.
This commit is contained in:
Daniel Kirchner 2021-02-04 10:33:40 +01:00 committed by GitHub
commit 5faefdea65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsolidity/codegen/YulUtilFunctions.cpp
View File

@ -3391,7 +3391,11 @@ string YulUtilFunctions::copyStructToStorageFunction(StructType const& _from, St
string YulUtilFunctions::arrayConversionFunction(ArrayType const& _from, ArrayType const& _to) string YulUtilFunctions::arrayConversionFunction(ArrayType const& _from, ArrayType const& _to)
{ {
solAssert(_to.location() != DataLocation::CallData, ""); if (_to.dataStoredIn(DataLocation::CallData))
solAssert(
_from.dataStoredIn(DataLocation::CallData) && _from.isByteArray() && _to.isByteArray(),
""
);
// Other cases are done explicitly in LValue::storeValue, and only possible by assignment. // Other cases are done explicitly in LValue::storeValue, and only possible by assignment.
if (_to.location() == DataLocation::Storage) if (_to.location() == DataLocation::Storage)
@ -3409,16 +3413,22 @@ string YulUtilFunctions::arrayConversionFunction(ArrayType const& _from, ArrayTy
return m_functionCollector.createFunction(functionName, [&]() { return m_functionCollector.createFunction(functionName, [&]() {
Whiskers templ(R"( Whiskers templ(R"(
function <functionName>(value<?fromCalldataDynamic>, length</fromCalldataDynamic>) -> converted { function <functionName>(value<?fromCalldataDynamic>, length</fromCalldataDynamic>) -> converted <?toCalldataDynamic>, outLength</toCalldataDynamic> {
<body> <body>
<?toCalldataDynamic>
outLength := <length>
</toCalldataDynamic>
} }
)"); )");
templ("functionName", functionName); templ("functionName", functionName);
templ("fromCalldataDynamic", _from.dataStoredIn(DataLocation::CallData) && _from.isDynamicallySized()); templ("fromCalldataDynamic", _from.dataStoredIn(DataLocation::CallData) && _from.isDynamicallySized());
templ("toCalldataDynamic", _to.dataStoredIn(DataLocation::CallData) && _to.isDynamicallySized());
templ("length", _from.isDynamicallySized() ? "length" : _from.length().str());
if ( if (
_from == _to || _from == _to ||
(_from.dataStoredIn(DataLocation::Memory) && _to.dataStoredIn(DataLocation::Memory)) || (_from.dataStoredIn(DataLocation::Memory) && _to.dataStoredIn(DataLocation::Memory)) ||
(_from.dataStoredIn(DataLocation::CallData) && _to.dataStoredIn(DataLocation::CallData)) ||
_to.dataStoredIn(DataLocation::Storage) _to.dataStoredIn(DataLocation::Storage)
) )
templ("body", "converted := value"); templ("body", "converted := value");

9
test/libsolidity/semanticTests/array/copying/bytes_calldata_to_string_calldata.sol Normal file
View File

@ -0,0 +1,9 @@
contract C {
function f(bytes calldata c) public returns (string calldata s) {
return string(c);
}
}
// ====
// compileViaYul: also
// ----
// f(bytes): 0x20, 3, "abc" -> 0x20, 3, "abc"

9
test/libsolidity/semanticTests/array/copying/string_calldata_to_bytes_calldata.sol Normal file
View File

@ -0,0 +1,9 @@
contract C {
function f(string calldata s) public returns (bytes calldata m) {
return bytes(s);
}
}
// ====
// compileViaYul: also
// ----
// f(string): 0x20, 3, "abc" -> 0x20, 3, "abc"