Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update field access name #1022

Merged
merged 1 commit into from
Sep 10, 2020
Merged

Update field access name #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions dawn/src/dawn/IIR/DoMethod.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,12 @@ class ReplaceNamesVisitor : public iir::ASTVisitorForwarding, public NonCopyable
expr->accept(*this);
}
void visit(const std::shared_ptr<VarAccessExpr>& expr) override {
auto data = expr->getData<iir::IIRAccessExprData>();
int accessID = *data.AccessID;
int accessID = iir::getAccessID(expr);
std::string realName = metadata_.getNameFromAccessID(accessID);
expr->setName(realName);
}
void visit(const std::shared_ptr<FieldAccessExpr>& expr) override {
int accessID = iir::getAccessID(expr);
std::string realName = metadata_.getNameFromAccessID(accessID);
expr->setName(realName);
}
Expand Down
13 changes: 13 additions & 0 deletions dawn/src/dawn/Validator/IntegrityChecker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
//
//===------------------------------------------------------------------------------------------===//
#include "dawn/Validator/IntegrityChecker.h"
#include "dawn/IIR/ASTExpr.h"

namespace dawn {
IntegrityChecker::IntegrityChecker(iir::StencilInstantiation* instantiation)
Expand Down Expand Up @@ -88,6 +89,18 @@ void IntegrityChecker::visit(const std::shared_ptr<iir::AssignmentExpr>& expr) {
throw SemanticError("Attempt to assign constant expression " + value, metadata_.getFileName(),
expr->getSourceLocation().Line);
}
ast::ASTVisitorForwarding::visit(expr);
}

void IntegrityChecker::visit(const std::shared_ptr<iir::FieldAccessExpr>& expr) {
int accessID = iir::getAccessID(expr);
DAWN_ASSERT_MSG(metadata_.getFieldNameFromAccessID(accessID) == expr->getName(),
(std::string("Field name (") + std::string(expr->getName()) +
std::string(") doesn't match name registered in metadata(") +
std::string(metadata_.getFieldNameFromAccessID(accessID)) + std::string(")."))
.c_str());

ast::ASTVisitorForwarding::visit(expr);
}

void IntegrityChecker::visit(const std::shared_ptr<iir::UnaryOperator>& expr) {
Expand Down
1 change: 1 addition & 0 deletions dawn/src/dawn/Validator/IntegrityChecker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class IntegrityChecker : public ast::ASTVisitorForwarding {
void visit(const std::shared_ptr<iir::IfStmt>& stmt) override;
void visit(const std::shared_ptr<iir::VarDeclStmt>& stmt) override;
void visit(const std::shared_ptr<iir::AssignmentExpr>& expr) override;
void visit(const std::shared_ptr<iir::FieldAccessExpr>& expr) override;
void visit(const std::shared_ptr<iir::UnaryOperator>& expr) override;
void visit(const std::shared_ptr<iir::ReductionOverNeighborExpr>& expr) override;
void visit(const std::shared_ptr<iir::BinaryOperator>& expr) override;
Expand Down