cerc-io/solidity
15
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

Use source id in yul to evm code transform.

Browse Source
This commit is contained in:
chriseth 2021-09-09 16:35:15 +02:00
parent d9ad047c21
commit e6f0fe8ae3
3 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libyul/backends/evm/EVMCodeTransform.cpp
View File

@ -252,7 +252,7 @@ void CodeTransform::operator()(FunctionCall const& _call)
visitExpression(arg); visitExpression(arg);
m_assembly.setSourceLocation(locationOf(_call)); m_assembly.setSourceLocation(locationOf(_call));
m_assembly.appendJumpTo( m_assembly.appendJumpTo(
functionEntryID(_call.functionName.name, *function), functionEntryID(*function),
static_cast<int>(function->returns.size() - function->arguments.size()) - 1, static_cast<int>(function->returns.size() - function->arguments.size()) - 1,
AbstractAssembly::JumpType::IntoFunction AbstractAssembly::JumpType::IntoFunction
); );
@ -374,7 +374,7 @@ void CodeTransform::operator()(FunctionDefinition const& _function)
m_assembly.setSourceLocation(locationOf(_function)); m_assembly.setSourceLocation(locationOf(_function));
int const stackHeightBefore = m_assembly.stackHeight(); int const stackHeightBefore = m_assembly.stackHeight();
m_assembly.appendLabel(functionEntryID(_function.name, function)); m_assembly.appendLabel(functionEntryID(function));
m_assembly.setStackHeight(static_cast<int>(height)); m_assembly.setStackHeight(static_cast<int>(height));
@ -563,6 +563,10 @@ void CodeTransform::operator()(Block const& _block)
Scope* originalScope = m_scope; Scope* originalScope = m_scope;
m_scope = m_info.scopes.at(&_block).get(); m_scope = m_info.scopes.at(&_block).get();
for (auto const& statement: _block.statements)
if (auto function = get_if<FunctionDefinition>(&statement))
createFunctionEntryID(*function);
int blockStartStackHeight = m_assembly.stackHeight(); int blockStartStackHeight = m_assembly.stackHeight();
visitStatements(_block.statements); visitStatements(_block.statements);
@ -572,17 +576,30 @@ void CodeTransform::operator()(Block const& _block)
m_scope = originalScope; m_scope = originalScope;
} }
AbstractAssembly::LabelID CodeTransform::functionEntryID(YulString _name, Scope::Function const& _function) void CodeTransform::createFunctionEntryID(FunctionDefinition const& _function)
{ {
if (!m_context->functionEntryIDs.count(&_function)) Scope::Function& scopeFunction = std::get<Scope::Function>(m_scope->identifiers.at(_function.name));
{ yulAssert(!m_context->functionEntryIDs.count(&scopeFunction), "");
AbstractAssembly::LabelID id =
m_useNamedLabelsForFunctions ? optional<size_t> astID;
m_assembly.namedLabel(_name.str(), _function.arguments.size(), _function.returns.size(), {}) : if (_function.debugData)
m_assembly.newLabelId(); astID = _function.debugData->astID;
m_context->functionEntryIDs[&_function] = id;
} m_context->functionEntryIDs[&scopeFunction] =
return m_context->functionEntryIDs[&_function]; m_useNamedLabelsForFunctions ?
m_assembly.namedLabel(
_function.name.str(),
_function.parameters.size(),
_function.returnVariables.size(),
astID
) :
m_assembly.newLabelId();
}
AbstractAssembly::LabelID CodeTransform::functionEntryID(Scope::Function const& _scopeFunction) const
{
yulAssert(m_context->functionEntryIDs.count(&_scopeFunction), "");
return m_context->functionEntryIDs.at(&_scopeFunction);
} }
void CodeTransform::visitExpression(Expression const& _expression) void CodeTransform::visitExpression(Expression const& _expression)

3
libyul/backends/evm/EVMCodeTransform.h
View File

@ -142,7 +142,8 @@ public:
private: private:
AbstractAssembly::LabelID labelFromIdentifier(Identifier const& _identifier); AbstractAssembly::LabelID labelFromIdentifier(Identifier const& _identifier);
AbstractAssembly::LabelID functionEntryID(YulString _name, Scope::Function const& _function); void createFunctionEntryID(FunctionDefinition const& _function);
AbstractAssembly::LabelID functionEntryID(Scope::Function const& _scopeFunction) const;
/// Generates code for an expression that is supposed to return a single value. /// Generates code for an expression that is supposed to return a single value.
void visitExpression(Expression const& _expression); void visitExpression(Expression const& _expression);

11
libyul/backends/evm/EVMObjectCompiler.cpp
View File

@ -64,7 +64,16 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
yulAssert(_object.code, "No code."); yulAssert(_object.code, "No code.");
// We do not catch and re-throw the stack too deep exception here because it is a YulException, // We do not catch and re-throw the stack too deep exception here because it is a YulException,
// which should be native to this part of the code. // which should be native to this part of the code.
CodeTransform transform{m_assembly, *_object.analysisInfo, *_object.code, m_dialect, context, _optimize}; CodeTransform transform{
m_assembly,
*_object.analysisInfo,
*_object.code,
m_dialect,
context,
_optimize,
{},
true /* _useNamedLabelsForFunctions */
};
transform(*_object.code); transform(*_object.code);
if (!transform.stackErrors().empty()) if (!transform.stackErrors().empty())
BOOST_THROW_EXCEPTION(transform.stackErrors().front()); BOOST_THROW_EXCEPTION(transform.stackErrors().front());