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

Update OperationAnnotation to use SetOnce for userDefinedFunction

Browse Source
This commit is contained in:
wechman 2022-08-01 13:46:53 +02:00
parent 6fcd717ab4
commit d124f83b88
9 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.md
View File

@ -5,7 +5,7 @@ Language Features:
Compiler Features: Compiler Features:
* Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string. * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
* Allow user-defined operators via ``using {f as +} for Typename;``. * Allow defining custom operators for user-defined value types and structs via ``using {f as +} for Typename;`` syntax.
Bugfixes: Bugfixes:

10
libsolidity/analysis/ControlFlowBuilder.cpp
View File

@ -65,7 +65,7 @@ bool ControlFlowBuilder::visit(BinaryOperation const& _operation)
case Token::And: case Token::And:
{ {
visitNode(_operation); visitNode(_operation);
solAssert(!_operation.annotation().userDefinedFunction); solAssert(!_operation.annotation().userDefinedFunction.set());
appendControlFlow(_operation.leftExpression()); appendControlFlow(_operation.leftExpression());
auto nodes = splitFlow<2>(); auto nodes = splitFlow<2>();
@ -75,14 +75,14 @@ bool ControlFlowBuilder::visit(BinaryOperation const& _operation)
} }
default: default:
{ {
if (_operation.annotation().userDefinedFunction) if (_operation.annotation().userDefinedFunction.set())
{ {
visitNode(_operation); visitNode(_operation);
_operation.leftExpression().accept(*this); _operation.leftExpression().accept(*this);
_operation.rightExpression().accept(*this); _operation.rightExpression().accept(*this);
solAssert(!m_currentNode->resolveFunctionCall(nullptr)); solAssert(!m_currentNode->resolveFunctionCall(nullptr));
m_currentNode->functionCall = _operation.annotation().userDefinedFunction; m_currentNode->functionCall = *_operation.annotation().userDefinedFunction;
auto nextNode = newLabel(); auto nextNode = newLabel();
connect(m_currentNode, nextNode); connect(m_currentNode, nextNode);
@ -99,11 +99,11 @@ bool ControlFlowBuilder::visit(UnaryOperation const& _operation)
{ {
solAssert(!!m_currentNode, ""); solAssert(!!m_currentNode, "");
if (_operation.annotation().userDefinedFunction) if (_operation.annotation().userDefinedFunction.set())
{ {
visitNode(_operation); visitNode(_operation);
solAssert(!m_currentNode->resolveFunctionCall(nullptr)); solAssert(!m_currentNode->resolveFunctionCall(nullptr));
m_currentNode->functionCall = _operation.annotation().userDefinedFunction; m_currentNode->functionCall = *_operation.annotation().userDefinedFunction;
auto nextNode = newLabel(); auto nextNode = newLabel();

4
libsolidity/analysis/FunctionCallGraph.cpp
View File

@ -206,14 +206,14 @@ bool FunctionCallGraphBuilder::visit(MemberAccess const& _memberAccess)
bool FunctionCallGraphBuilder::visit(BinaryOperation const& _binaryOperation) bool FunctionCallGraphBuilder::visit(BinaryOperation const& _binaryOperation)
{ {
if (FunctionDefinition const* function = _binaryOperation.annotation().userDefinedFunction) if (FunctionDefinition const* function = *_binaryOperation.annotation().userDefinedFunction)
functionReferenced(*function, true /* called directly */); functionReferenced(*function, true /* called directly */);
return true; return true;
} }
bool FunctionCallGraphBuilder::visit(UnaryOperation const& _unaryOperation) bool FunctionCallGraphBuilder::visit(UnaryOperation const& _unaryOperation)
{ {
if (FunctionDefinition const* function = _unaryOperation.annotation().userDefinedFunction) if (FunctionDefinition const* function = *_unaryOperation.annotation().userDefinedFunction)
functionReferenced(*function, true /* called directly */); functionReferenced(*function, true /* called directly */);
return true; return true;
} }

8
libsolidity/analysis/ViewPureChecker.cpp
View File

@ -333,14 +333,14 @@ void ViewPureChecker::reportFunctionCallMutability(StateMutability _mutability,
void ViewPureChecker::endVisit(BinaryOperation const& _binaryOperation) void ViewPureChecker::endVisit(BinaryOperation const& _binaryOperation)
{ {
if (_binaryOperation.annotation().userDefinedFunction) if (_binaryOperation.annotation().userDefinedFunction.set())
reportFunctionCallMutability(_binaryOperation.annotation().userDefinedFunction->stateMutability(), _binaryOperation.location()); reportFunctionCallMutability((*_binaryOperation.annotation().userDefinedFunction)->stateMutability(), _binaryOperation.location());
} }
void ViewPureChecker::endVisit(UnaryOperation const& _unaryOperation) void ViewPureChecker::endVisit(UnaryOperation const& _unaryOperation)
{ {
if (_unaryOperation.annotation().userDefinedFunction) if (_unaryOperation.annotation().userDefinedFunction.set())
reportFunctionCallMutability(_unaryOperation.annotation().userDefinedFunction->stateMutability(), _unaryOperation.location()); reportFunctionCallMutability((*_unaryOperation.annotation().userDefinedFunction)->stateMutability(), _unaryOperation.location());
} }
void ViewPureChecker::endVisit(FunctionCall const& _functionCall) void ViewPureChecker::endVisit(FunctionCall const& _functionCall)

9
libsolidity/ast/AST.h
View File

@ -688,14 +688,19 @@ public:
/// @returns a list of functions or the single library. /// @returns a list of functions or the single library.
std::vector<ASTPointer<IdentifierPath>> const& functionsOrLibrary() const { return m_functions; } std::vector<ASTPointer<IdentifierPath>> const& functionsOrLibrary() const { return m_functions; }
auto functionsAndOperators() const { return ranges::zip_view(m_functions, m_operators); } //auto functionsAndOperators() const { return ranges::zip_view(m_functions, m_operators); }
ranges::zip_view<
ranges::ref_view<const std::vector<std::shared_ptr<solidity::frontend::IdentifierPath>>>,
ranges::ref_view<const std::vector<std::optional<solidity::langutil::Token>>>
>
functionsAndOperators() const { return ranges::zip_view(m_functions, m_operators); }
bool usesBraces() const { return m_usesBraces; } bool usesBraces() const { return m_usesBraces; }
bool global() const { return m_global; } bool global() const { return m_global; }
private: private:
/// Either the single library or a list of functions. /// Either the single library or a list of functions.
std::vector<ASTPointer<IdentifierPath>> m_functions; std::vector<ASTPointer<IdentifierPath>> m_functions;
/// Operators, the functions are applied to. /// Operators, the functions from @a m_functions implement.
std::vector<std::optional<Token>> m_operators; std::vector<std::optional<Token>> m_operators;
bool m_usesBraces; bool m_usesBraces;
ASTPointer<TypeName> m_typeName; ASTPointer<TypeName> m_typeName;

2
libsolidity/ast/ASTAnnotations.h
View File

@ -314,7 +314,7 @@ struct MemberAccessAnnotation: ExpressionAnnotation
struct OperationAnnotation: ExpressionAnnotation struct OperationAnnotation: ExpressionAnnotation
{ {
FunctionDefinition const* userDefinedFunction = nullptr; util::SetOnce<FunctionDefinition const*> userDefinedFunction;
}; };
struct BinaryOperationAnnotation: OperationAnnotation struct BinaryOperationAnnotation: OperationAnnotation

4
libsolidity/ast/ASTJsonExporter.cpp
View File

@ -828,7 +828,7 @@ bool ASTJsonExporter::visit(UnaryOperation const& _node)
make_pair("operator", TokenTraits::toString(_node.getOperator())), make_pair("operator", TokenTraits::toString(_node.getOperator())),
make_pair("subExpression", toJson(_node.subExpression())) make_pair("subExpression", toJson(_node.subExpression()))
}; };
if (FunctionDefinition const* function = _node.annotation().userDefinedFunction) if (FunctionDefinition const* function = *_node.annotation().userDefinedFunction)
attributes.emplace_back("function", nodeId(*function)); attributes.emplace_back("function", nodeId(*function));
appendExpressionAttributes(attributes, _node.annotation()); appendExpressionAttributes(attributes, _node.annotation());
setJsonNode(_node, "UnaryOperation", std::move(attributes)); setJsonNode(_node, "UnaryOperation", std::move(attributes));
@ -843,7 +843,7 @@ bool ASTJsonExporter::visit(BinaryOperation const& _node)
make_pair("rightExpression", toJson(_node.rightExpression())), make_pair("rightExpression", toJson(_node.rightExpression())),
make_pair("commonType", typePointerToJson(_node.annotation().commonType)), make_pair("commonType", typePointerToJson(_node.annotation().commonType)),
}; };
if (FunctionDefinition const* function = _node.annotation().userDefinedFunction) if (FunctionDefinition const* function = *_node.annotation().userDefinedFunction)
attributes.emplace_back("function", nodeId(*function)); attributes.emplace_back("function", nodeId(*function));
appendExpressionAttributes(attributes, _node.annotation()); appendExpressionAttributes(attributes, _node.annotation());
setJsonNode(_node, "BinaryOperation", std::move(attributes)); setJsonNode(_node, "BinaryOperation", std::move(attributes));

4
libsolidity/codegen/ExpressionCompiler.cpp
View File

@ -411,7 +411,7 @@ bool ExpressionCompiler::visit(UnaryOperation const& _unaryOperation)
{ {
CompilerContext::LocationSetter locationSetter(m_context, _unaryOperation); CompilerContext::LocationSetter locationSetter(m_context, _unaryOperation);
if (FunctionDefinition const* function = _unaryOperation.annotation().userDefinedFunction) if (FunctionDefinition const* function = *_unaryOperation.annotation().userDefinedFunction)
{ {
solAssert( solAssert(
function->isFree() || function->libraryFunction(), function->isFree() || function->libraryFunction(),
@ -538,7 +538,7 @@ bool ExpressionCompiler::visit(BinaryOperation const& _binaryOperation)
CompilerContext::LocationSetter locationSetter(m_context, _binaryOperation); CompilerContext::LocationSetter locationSetter(m_context, _binaryOperation);
Expression const& leftExpression = _binaryOperation.leftExpression(); Expression const& leftExpression = _binaryOperation.leftExpression();
Expression const& rightExpression = _binaryOperation.rightExpression(); Expression const& rightExpression = _binaryOperation.rightExpression();
if (FunctionDefinition const* function =_binaryOperation.annotation().userDefinedFunction) if (FunctionDefinition const* function = *_binaryOperation.annotation().userDefinedFunction)
{ {
solAssert( solAssert(
function->isFree() || function->libraryFunction(), function->isFree() || function->libraryFunction(),

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

@ -673,7 +673,7 @@ bool IRGeneratorForStatements::visit(UnaryOperation const& _unaryOperation)
{ {
setLocation(_unaryOperation); setLocation(_unaryOperation);
if (FunctionDefinition const* function = _unaryOperation.annotation().userDefinedFunction) if (FunctionDefinition const* function = *_unaryOperation.annotation().userDefinedFunction)
{ {
_unaryOperation.subExpression().accept(*this); _unaryOperation.subExpression().accept(*this);
setLocation(_unaryOperation); setLocation(_unaryOperation);
@ -817,7 +817,7 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
{ {
setLocation(_binOp); setLocation(_binOp);
if (FunctionDefinition const* function = _binOp.annotation().userDefinedFunction) if (FunctionDefinition const* function = *_binOp.annotation().userDefinedFunction)
{ {
_binOp.leftExpression().accept(*this); _binOp.leftExpression().accept(*this);
_binOp.rightExpression().accept(*this); _binOp.rightExpression().accept(*this);