[flang] Responses to review comments

I changed the interface of ```PushConstruct()``` to take an rvalue reference as its only parameter and made the construction of the ```ConstructNode```s explicit in all of the ```Pre()``` functions for the various construct types.

Original-commit: flang-compiler/f18@f8be813874ac7a8021bd5e8138c7b421e166ea22
Reviewed-on: https://github.com/flang-compiler/f18/pull/686
Tree-same-pre-rewrite: false

diff --git a/flang/lib/semantics/semantics.cc b/flang/lib/semantics/semantics.cc
index f7a5747..9639149 100644 (file)
--- a/flang/lib/semantics/semantics.cc
+++ b/flang/lib/semantics/semantics.cc
@@ -82,67 +82,67 @@ public:
   }
 
   bool Pre(const parser::AssociateConstruct &associateConstruct) {
-    context_.PushConstruct(&associateConstruct);
+    context_.PushConstruct(ConstructNode{&associateConstruct});
     Enter(associateConstruct);
     return true;
   }
 
   bool Pre(const parser::BlockConstruct &blockConstruct) {
-    context_.PushConstruct(&blockConstruct);
+    context_.PushConstruct(ConstructNode{&blockConstruct});
     Enter(blockConstruct);
     return true;
   }
 
   bool Pre(const parser::CaseConstruct &caseConstruct) {
-    context_.PushConstruct(&caseConstruct);
+    context_.PushConstruct(ConstructNode{&caseConstruct});
     Enter(caseConstruct);
     return true;
   }
 
-  bool Pre(const parser::DoConstruct &doConstruct) {
-    context_.PushConstruct(&doConstruct);
-    Enter(doConstruct);
-    return true;
-  }
-
   bool Pre(const parser::CriticalConstruct &criticalConstruct) {
-    context_.PushConstruct(&criticalConstruct);
+    context_.PushConstruct(ConstructNode{&criticalConstruct});
     Enter(criticalConstruct);
     return true;
   }
 
   bool Pre(const parser::ChangeTeamConstruct &changeTeamConstruct) {
-    context_.PushConstruct(&changeTeamConstruct);
+    context_.PushConstruct(ConstructNode{&changeTeamConstruct});
     Enter(changeTeamConstruct);
     return true;
   }
 
+  bool Pre(const parser::DoConstruct &doConstruct) {
+    context_.PushConstruct(ConstructNode{&doConstruct});
+    Enter(doConstruct);
+    return true;
+  }
+
   bool Pre(const parser::ForAllConstruct &forAllConstruct) {
-    context_.PushConstruct(&forAllConstruct);
+    context_.PushConstruct(ConstructNode{&forAllConstruct});
     Enter(forAllConstruct);
     return true;
   }
 
   bool Pre(const parser::IfConstruct &ifConstruct) {
-    context_.PushConstruct(&ifConstruct);
+    context_.PushConstruct(ConstructNode{&ifConstruct});
     Enter(ifConstruct);
     return true;
   }
 
   bool Pre(const parser::SelectRankConstruct &selectRankConstruct) {
-    context_.PushConstruct(&selectRankConstruct);
+    context_.PushConstruct(ConstructNode{&selectRankConstruct});
     Enter(selectRankConstruct);
     return true;
   }
 
   bool Pre(const parser::SelectTypeConstruct &selectTypeConstruct) {
-    context_.PushConstruct(&selectTypeConstruct);
+    context_.PushConstruct(ConstructNode{&selectTypeConstruct});
     Enter(selectTypeConstruct);
     return true;
   }
 
   bool Pre(const parser::WhereConstruct &whereConstruct) {
-    context_.PushConstruct(&whereConstruct);
+    context_.PushConstruct(ConstructNode{&whereConstruct});
     Enter(whereConstruct);
     return true;
   }
@@ -298,7 +298,7 @@ Scope &SemanticsContext::FindScope(parser::CharBlock source) {
   }
 }
 
-void SemanticsContext::PushConstruct(const ConstructNode &construct) {
+void SemanticsContext::PushConstruct(ConstructNode &&construct) {
   constructStack_.emplace_back(construct);
 }
 

diff --git a/flang/lib/semantics/semantics.h b/flang/lib/semantics/semantics.h
index e5dba17..3d6a94f 100644 (file)
--- a/flang/lib/semantics/semantics.h
+++ b/flang/lib/semantics/semantics.h
@@ -140,7 +140,7 @@ public:
   Scope &FindScope(parser::CharBlock);
 
   const ConstructStack &constructStack() const { return constructStack_; }
-  void PushConstruct(const ConstructNode &construct);
+  void PushConstruct(ConstructNode &&construct);
   void PopConstruct();
   bool InsideDoConstruct() const;