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

Reverse stack items processing order in YulUtilFunctions::inlineArrayConversionFunction

Browse Source
This commit is contained in:
wechman 2022-08-12 09:03:55 +02:00
parent efcf92948c
commit a88ad6e4d5
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libsolidity/codegen/YulUtilFunctions.cpp
View File

@ -32,6 +32,9 @@
#include <libsolidity/ast/TypeProvider.h> #include <libsolidity/ast/TypeProvider.h>
#include <range/v3/view/enumerate.hpp> #include <range/v3/view/enumerate.hpp>
#include <range/v3/view/reverse.hpp>
#include <numeric>
using namespace std; using namespace std;
using namespace solidity; using namespace solidity;
@ -3884,10 +3887,17 @@ string YulUtilFunctions::inlineArrayConversionFunction(InlineArrayType const& _f
_to.identifier(); _to.identifier();
vector<map<string, string>> memberSetValues; vector<map<string, string>> memberSetValues;
unsigned stackItemIndex = 0; unsigned stackItemIndex = std::accumulate(
_from.components().begin(),
_from.components().end(),
0u,
[](unsigned sum, Type const* component) {return sum + component->sizeOnStack();}
);
for (auto&& [index, type]: _from.components() | ranges::views::enumerate) for (auto&& [index, type]: _from.components() | ranges::views::enumerate | ranges::views::reverse)
{ {
stackItemIndex -= type->sizeOnStack();
memberSetValues.emplace_back(); memberSetValues.emplace_back();
memberSetValues.back()["setMember"] = Whiskers(R"( memberSetValues.back()["setMember"] = Whiskers(R"(
let <memberValues> := <conversionFunction>(<value>) let <memberValues> := <conversionFunction>(<value>)
@ -3899,8 +3909,6 @@ string YulUtilFunctions::inlineArrayConversionFunction(InlineArrayType const& _f
("conversionFunction", conversionFunction(*type, *_to.baseType())) ("conversionFunction", conversionFunction(*type, *_to.baseType()))
("writeToMemory", writeToMemoryFunction(*_to.baseType())) ("writeToMemory", writeToMemoryFunction(*_to.baseType()))
.render(); .render();
stackItemIndex += type->sizeOnStack();
} }
return m_functionCollector.createFunction(functionName, [&]() { return m_functionCollector.createFunction(functionName, [&]() {