Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/mlir/cxx/mlir/codegen.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,14 @@ class Codegen {

void statement(StatementAST* ast);

[[nodiscard]] auto expression(ExpressionAST* ast) -> ExpressionResult;
enum struct ExpressionFormat {
kValue,
kSideEffect,
};

[[nodiscard]] auto expression(
ExpressionAST* ast, ExpressionFormat format = ExpressionFormat::kValue)
-> ExpressionResult;

[[nodiscard]] auto templateParameter(TemplateParameterAST* ast)
-> TemplateParameterResult;
Expand Down
27 changes: 24 additions & 3 deletions src/mlir/cxx/mlir/codegen_expressions.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ namespace cxx {

struct Codegen::ExpressionVisitor {
Codegen& gen;
ExpressionFormat format = ExpressionFormat::kValue;

auto operator()(GeneratedLiteralExpressionAST* ast) -> ExpressionResult;
auto operator()(CharLiteralExpressionAST* ast) -> ExpressionResult;
Expand Down Expand Up @@ -104,8 +105,9 @@ struct Codegen::NewInitializerVisitor {
auto operator()(NewBracedInitializerAST* ast) -> NewInitializerResult;
};

auto Codegen::expression(ExpressionAST* ast) -> ExpressionResult {
if (ast) return visit(ExpressionVisitor{*this}, ast);
auto Codegen::expression(ExpressionAST* ast, ExpressionFormat format)
-> ExpressionResult {
if (ast) return visit(ExpressionVisitor{*this, format}, ast);
return {};
}

Expand Down Expand Up @@ -252,7 +254,7 @@ auto Codegen::ExpressionVisitor::operator()(NestedStatementExpressionAST* ast)

auto Codegen::ExpressionVisitor::operator()(NestedExpressionAST* ast)
-> ExpressionResult {
return gen.expression(ast->expression);
return gen.expression(ast->expression, format);
}

auto Codegen::ExpressionVisitor::operator()(IdExpressionAST* ast)
Expand Down Expand Up @@ -865,6 +867,25 @@ auto Codegen::ExpressionVisitor::operator()(ThrowExpressionAST* ast)

auto Codegen::ExpressionVisitor::operator()(AssignmentExpressionAST* ast)
-> ExpressionResult {
if (ast->op == TokenKind::T_EQUAL) {
auto leftExpressionResult = gen.expression(ast->leftExpression);
auto rightExpressionResult = gen.expression(ast->rightExpression);

// Generate a store operation
auto loc = gen.getLocation(ast->opLoc);

auto resultType = gen.convertType(ast->leftExpression->type);

gen.builder_.create<mlir::cxx::StoreOp>(loc, rightExpressionResult.value,
leftExpressionResult.value);

if (format == ExpressionFormat::kSideEffect) {
return {};
}

return leftExpressionResult;
}

auto op =
gen.emitTodoExpr(ast->firstSourceLocation(), to_string(ast->kind()));

Expand Down
2 changes: 1 addition & 1 deletion src/mlir/cxx/mlir/codegen_statements.cc
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void Codegen::StatementVisitor::operator()(DefaultStatementAST* ast) {
}

void Codegen::StatementVisitor::operator()(ExpressionStatementAST* ast) {
auto expressionResult = gen.expression(ast->expression);
(void)gen.expression(ast->expression, ExpressionFormat::kSideEffect);
}

void Codegen::StatementVisitor::operator()(CompoundStatementAST* ast) {
Expand Down