[flang] address review comments

Original-commit: flang-compiler/f18@b1c731b0266576d103f2dc44dfdb3410795cd81d
Reviewed-on: https://github.com/flang-compiler/f18/pull/294

diff --git a/flang/lib/IntermediateRepresentation/statement.def b/flang/lib/FIR/statement.def
similarity index 100%
rename from flang/lib/IntermediateRepresentation/statement.def
rename to flang/lib/FIR/statement.def

diff --git a/flang/lib/IntermediateRepresentation/statements.cc b/flang/lib/FIR/statements.cc
similarity index 85%
rename from flang/lib/IntermediateRepresentation/statements.cc
rename to flang/lib/FIR/statements.cc
index 052d6a1..4868493 100644 (file)
--- a/flang/lib/IntermediateRepresentation/statements.cc
+++ b/flang/lib/FIR/statements.cc
@@ -14,7 +14,7 @@
 
 #include "stmt.h"
 
-namespace Fortran::IntermediateRepresentation {
+namespace Fortran::FIR {
 
 static std::string dump(const Expression *expression) {
   if (expression) {
@@ -81,20 +81,15 @@ static std::string dump(PathVariable *pathVariable) {
 }
 
 std::string Evaluation::dump() const {
-  return std::visit(common::visitors{
-                        [](Expression *expression) {
-                          return IntermediateRepresentation::dump(expression);
-                        },
-                        [](Variable *variable) {
-                          return IntermediateRepresentation::dump(variable);
-                        },
-                        [](PathVariable *pathVariable) {
-                          return IntermediateRepresentation::dump(pathVariable);
-                        },
-                        [](const semantics::Symbol *symbol) {
-                          return symbol->name().ToString();
-                        },
-                    },
+  return std::visit(
+      common::visitors{
+          [](Expression *expression) { return FIR::dump(expression); },
+          [](Variable *variable) { return FIR::dump(variable); },
+          [](PathVariable *pathVariable) { return FIR::dump(pathVariable); },
+          [](const semantics::Symbol *symbol) {
+            return symbol->name().ToString();
+          },
+      },
       u);
 }
 
@@ -162,8 +157,7 @@ std::string Statement::dump() const {
           [](const ReturnStmt &) { return "return"s; },
           [](const BranchStmt &branchStatement) {
             if (branchStatement.hasCondition()) {
-              return "branch ("s +
-                  IntermediateRepresentation::dump(branchStatement.getCond()) +
+              return "branch ("s + FIR::dump(branchStatement.getCond()) +
                   ") "s +
                   std::to_string(reinterpret_cast<std::intptr_t>(
                       branchStatement.getTrueSucc())) +
@@ -183,17 +177,16 @@ std::string Statement::dump() const {
           [](const AllocateStmt &) { return "alloc"s; },
           [](const DeallocateStmt &) { return "dealloc"s; },
           [](const AssignmentStmt &assignmentStatement) {
-            auto computedValue{IntermediateRepresentation::dump(
-                assignmentStatement.GetRightHandSide())};
-            auto address{IntermediateRepresentation::dump(
-                assignmentStatement.GetLeftHandSide())};
+            auto computedValue{
+                FIR::dump(assignmentStatement.GetRightHandSide())};
+            auto address{FIR::dump(assignmentStatement.GetLeftHandSide())};
             return "assign ("s + computedValue + ") to "s + address;
           },
           [](const PointerAssignStmt &pointerAssignmentStatement) {
-            auto computedAddress{IntermediateRepresentation::dump(
-                pointerAssignmentStatement.GetRightHandSide())};
-            auto address{IntermediateRepresentation::dump(
-                pointerAssignmentStatement.GetLeftHandSide())};
+            auto computedAddress{
+                FIR::dump(pointerAssignmentStatement.GetRightHandSide())};
+            auto address{
+                FIR::dump(pointerAssignmentStatement.GetLeftHandSide())};
             return "assign &("s + computedAddress + ") to "s + address;
           },
           [](const LabelAssignStmt &) { return "lblassn"s; },
@@ -219,8 +212,7 @@ std::string Statement::dump() const {
                     },
                     [](const evaluate::GenericExprWrapper
                             *genericExpressionWrapper) {
-                      return IntermediateRepresentation::dump(
-                          genericExpressionWrapper);
+                      return FIR::dump(genericExpressionWrapper);
                     },
                 },
                 expressionStatement.u);

diff --git a/flang/lib/IntermediateRepresentation/statements.h b/flang/lib/FIR/statements.h
similarity index 98%
rename from flang/lib/IntermediateRepresentation/statements.h
rename to flang/lib/FIR/statements.h
index 3f39233..157b737 100644 (file)
--- a/flang/lib/IntermediateRepresentation/statements.h
+++ b/flang/lib/FIR/statements.h
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FORTRAN_INTERMEDIATEREPRESENTATION_STATEMENTS_H_
-#define FORTRAN_INTERMEDIATEREPRESENTATION_STATEMENTS_H_
+#ifndef FORTRAN_FIR_STATEMENTS_H_
+#define FORTRAN_FIR_STATEMENTS_H_
 
 #include "common.h"
 #include "mixin.h"
 #include <initializer_list>
 #include <ostream>
 
-namespace Fortran::IntermediateRepresentation {
+namespace Fortran::FIR {
 
 #define HANDLE_STMT(num, opcode, name) struct name;
 #include "statement.def"

diff --git a/flang/lib/IntermediateRepresentation/stmt.h b/flang/lib/FIR/stmt.h
similarity index 90%
rename from flang/lib/IntermediateRepresentation/stmt.h
rename to flang/lib/FIR/stmt.h
index 1fd8a0a..8f29180 100644 (file)
--- a/flang/lib/IntermediateRepresentation/stmt.h
+++ b/flang/lib/FIR/stmt.h
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FORTRAN_INTERMEDIATEREPRESENTATION_STMT_H_
-#define FORTRAN_INTERMEDIATEREPRESENTATION_STMT_H_
+#ifndef FORTRAN_FIR_STMT_H_
+#define FORTRAN_FIR_STMT_H_
 
 #include "basicblock.h"
 #include "mixin.h"
 #include "statements.h"
 
-namespace Fortran::IntermediateRepresentation {
+namespace Fortran::FIR {
 
 /// Sum type over all statement classes
 struct Statement : public SumTypeMixin<std::variant<