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

Sol -> Yul Generation: Implicit conversions

Browse Source
This commit is contained in:
Mathias Baumann 2019-04-15 18:10:36 +02:00 committed by chriseth
parent 6292adbde6
commit 944ac6fb6d
5 changed files with 76 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,15 +90,12 @@ bool IRGeneratorForStatements::visit(VariableDeclarationStatement const& _varDec
expression->accept(*this); expression->accept(*this);
solUnimplementedAssert( VariableDeclaration const& varDecl = *_varDeclStatement.declarations().front();
*expression->annotation().type == *_varDeclStatement.declarations().front()->type(),
"Type conversion not yet implemented"
);
m_code << m_code <<
"let " << "let " <<
m_context.variableName(*_varDeclStatement.declarations().front()) << m_context.variableName(varDecl) <<
" := " << " := " <<
m_context.variable(*expression) << expressionAsType(*expression, *varDecl.type()) <<
"\n"; "\n";
} }
else else
@ -115,15 +112,17 @@ bool IRGeneratorForStatements::visit(Assignment const& _assignment)
_assignment.rightHandSide().accept(*this); _assignment.rightHandSide().accept(*this);
// solUnimplementedAssert(
// *_assignment.rightHandSide().annotation().type == *_assignment.leftHandSide().annotation().type,
// "Type conversion not yet implemented"
// );
// TODO proper lvalue handling // TODO proper lvalue handling
auto const& identifier = dynamic_cast<Identifier const&>(_assignment.leftHandSide()); auto const& lvalue = dynamic_cast<Identifier const&>(_assignment.leftHandSide());
string varName = m_context.variableName(dynamic_cast<VariableDeclaration const&>(*identifier.annotation().referencedDeclaration)); string varName = m_context.variableName(dynamic_cast<VariableDeclaration const&>(*lvalue.annotation().referencedDeclaration));
m_code << varName << " := " << m_context.variable(_assignment.rightHandSide()) << "\n";
m_code <<
varName <<
" := " <<
expressionAsType(_assignment.rightHandSide(), *lvalue.annotation().type) <<
"\n";
m_code << "let " << m_context.variable(_assignment) << " := " << varName << "\n"; m_code << "let " << m_context.variable(_assignment) << " := " << varName << "\n";
return false; return false;
} }
@ -185,9 +184,11 @@ bool IRGeneratorForStatements::visit(FunctionCall const& _functionCall)
for (unsigned i = 0; i < arguments.size(); ++i) for (unsigned i = 0; i < arguments.size(); ++i)
{ {
arguments[i]->accept(*this); arguments[i]->accept(*this);
// TODO convert
//utils().convertType(*arguments[i]->annotation().type, *function.parameterTypes()[i]); if (functionType->takesArbitraryParameters())
args.emplace_back(m_context.variable(*arguments[i])); args.emplace_back(m_context.variable(*arguments[i]));
else
args.emplace_back(expressionAsType(*arguments[i], *parameterTypes[i]));
} }
if (auto identifier = dynamic_cast<Identifier const*>(&_functionCall.expression())) if (auto identifier = dynamic_cast<Identifier const*>(&_functionCall.expression()))
@ -273,3 +274,14 @@ bool IRGeneratorForStatements::visit(Literal const& _literal)
} }
return false; return false;
} }
string IRGeneratorForStatements::expressionAsType(Expression const& _expression, Type const& _to)
{
Type const& from = *_expression.annotation().type;
string varName = m_context.variable(_expression);
if (from == _to)
return varName;
else
return m_utils.conversionFunction(from, _to) + "(" + std::move(varName) + ")";
}

4
libsolidity/codegen/ir/IRGeneratorForStatements.h
View File

@ -53,6 +53,10 @@ public:
bool visit(Literal const& _literal) override; bool visit(Literal const& _literal) override;
private: private:
/// @returns a Yul expression representing the current value of @a _expression,
/// converted to type @a _to if it does not yet have that type.
std::string expressionAsType(Expression const& _expression, Type const& _to);
std::ostringstream m_code; std::ostringstream m_code;
IRGenerationContext& m_context; IRGenerationContext& m_context;
YulUtilFunctions& m_utils; YulUtilFunctions& m_utils;

14
test/libsolidity/semanticTests/viaYul/implicit_cast_assignment.sol Normal file
View File

@ -0,0 +1,14 @@
// Tests IRGeneratorForStatements::visit(Assignment const& _assignment)
contract C {
function f() public pure returns (uint16 x) {
uint8 y;
assembly {
y := 0x12345678
}
x = y;
}
}
// ====
// compileViaYul: true
// ----
// f() -> 0x78

17
test/libsolidity/semanticTests/viaYul/implicit_cast_function_call.sol Normal file
View File

@ -0,0 +1,17 @@
// IRGeneratorForStatements::visit(FunctionCall const& _functionCall)
contract C {
function f(uint b) public pure returns (uint x) {
x = b;
}
function g() public pure returns (uint x) {
uint8 a;
assembly {
a := 0x12345678
}
x = f(a);
}
}
// ====
// compileViaYul: true
// ----
// g() -> 0x78

13
test/libsolidity/semanticTests/viaYul/implicit_cast_local_assignment.sol Normal file
View File

@ -0,0 +1,13 @@
// IRGeneratorForStatements::visit(VariableDeclarationStatement const& _varDeclStatement)
contract C {
function f() public pure returns (uint y) {
uint8 a;
assembly { a := 0x12345678 }
uint z = a;
y = z;
}
}
// ====
// compileViaYul: true
// ----
// f() -> 0x78