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

Refix MSVC Debug crash

Browse Source
This commit is contained in:
a3d4 2022-04-21 01:44:25 +02:00
parent 559174054f
commit 048b253a93
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsolutil/Visitor.h
View File

@ -56,6 +56,17 @@ struct VisitorFallback<R> { template<typename T> R operator()(T&&) const { retur
template<> template<>
struct VisitorFallback<> { template<typename T> void operator()(T&&) const {} }; struct VisitorFallback<> { template<typename T> void operator()(T&&) const {} };
template <typename... Visitors> struct GenericVisitor: Visitors... { using Visitors::operator()...; }; // MSVC. Empty base class optimization does not happen in some scenarios.
// Enforcing it with __declspec(empty_bases) avoids MSVC Debug test crash
// (Run-Time Check Failure #2 - Stack around the variable '....' was corrupted).
// See https://docs.microsoft.com/en-us/cpp/cpp/empty-bases,
// https://developercommunity.visualstudio.com/t/10005513.
#if defined(_MSC_VER)
#define SOLC_EMPTY_BASES __declspec(empty_bases)
#else
#define SOLC_EMPTY_BASES
#endif
template <typename... Visitors> struct SOLC_EMPTY_BASES GenericVisitor: Visitors... { using Visitors::operator()...; };
template <typename... Visitors> GenericVisitor(Visitors...) -> GenericVisitor<Visitors...>; template <typename... Visitors> GenericVisitor(Visitors...) -> GenericVisitor<Visitors...>;
} }

21
libyul/optimiser/StructuralSimplifier.cpp
View File

@ -93,32 +93,27 @@ void StructuralSimplifier::operator()(Block& _block)
void StructuralSimplifier::simplify(std::vector<yul::Statement>& _statements) void StructuralSimplifier::simplify(std::vector<yul::Statement>& _statements)
{ {
// Explicit local variables ifLambda, switchLambda, forLoopLambda are created to avoid MSVC C++17 Debug test crash util::GenericVisitor visitor{
// (Run-Time Check Failure #2 - Stack around the variable '....' was corrupted). util::VisitorFallback<OptionalStatements>{},
// As soon as the issue is fixed, this workaround can be removed. [&](If& _ifStmt) -> OptionalStatements {
auto ifLambda = [&](If& _ifStmt) -> OptionalStatements
{
if (expressionAlwaysTrue(*_ifStmt.condition)) if (expressionAlwaysTrue(*_ifStmt.condition))
return {std::move(_ifStmt.body.statements)}; return {std::move(_ifStmt.body.statements)};
else if (expressionAlwaysFalse(*_ifStmt.condition)) else if (expressionAlwaysFalse(*_ifStmt.condition))
return {vector<Statement>{}}; return {vector<Statement>{}};
return {}; return {};
}; },
auto switchLambda = [&](Switch& _switchStmt) -> OptionalStatements [&](Switch& _switchStmt) -> OptionalStatements {
{
if (std::optional<u256> const constExprVal = hasLiteralValue(*_switchStmt.expression)) if (std::optional<u256> const constExprVal = hasLiteralValue(*_switchStmt.expression))
return replaceConstArgSwitch(_switchStmt, constExprVal.value()); return replaceConstArgSwitch(_switchStmt, constExprVal.value());
return {}; return {};
}; },
auto forLoopLambda = [&](ForLoop& _forLoop) -> OptionalStatements [&](ForLoop& _forLoop) -> OptionalStatements {
{
if (expressionAlwaysFalse(*_forLoop.condition)) if (expressionAlwaysFalse(*_forLoop.condition))
return {std::move(_forLoop.pre.statements)}; return {std::move(_forLoop.pre.statements)};
return {}; return {};
}
}; };
util::GenericVisitor visitor{util::VisitorFallback<OptionalStatements>{}, ifLambda, switchLambda, forLoopLambda};
util::iterateReplacing( util::iterateReplacing(
_statements, _statements,
[&](Statement& _stmt) -> OptionalStatements [&](Statement& _stmt) -> OptionalStatements