From 98ed7d037b67d7b511d5a024634b7d7982406fb7 Mon Sep 17 00:00:00 2001
From: Eric Schweitz <eschweitz@nvidia.com>
Date: Fri, 5 Oct 2018 11:10:47 -0700
Subject: [PATCH] [flang] Use move semantics directly to move the LoopControl
 object.

Original-commit: flang-compiler/f18@7d646b42bb99e0f1534fd84fcc1b639256207e75
Reviewed-on: https://github.com/flang-compiler/f18/pull/203
Tree-same-pre-rewrite: false
---
 flang/lib/semantics/canonicalize-do.cc | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/flang/lib/semantics/canonicalize-do.cc b/flang/lib/semantics/canonicalize-do.cc
index 80cd6f0..46bc2a5 100644
--- a/flang/lib/semantics/canonicalize-do.cc
+++ b/flang/lib/semantics/canonicalize-do.cc
@@ -28,7 +28,6 @@ public:
     : labelInfos_{labelInfos} {}
   template<typename T> bool Pre(T &) { return true; }
   template<typename T> void Post(T &) {}
-  bool Pre(ExecutionPart &executionPart) { return VisitBlock(executionPart.v); }
   bool Pre(Block &block) { return VisitBlock(block); }
   template<typename T> bool Pre(Statement<T> &statement) {
     if (!labelInfos_.empty() && statement.label.has_value() &&
@@ -80,24 +79,16 @@ private:
     block.splice(block.begin(), currentBlock, ++beginLoop, ++endLoop);
     return block;
   }
-  static std::optional<LoopControl> ExtractLoopControl(
-      const Block::iterator &startLoop) {
-    return [](std::optional<LoopControl> &loopControlOpt) {
-      return loopControlOpt.has_value()
-          ? std::optional<LoopControl>{LoopControl{loopControlOpt->u}}
-          : std::optional<LoopControl>{};
-    }(std::get<std::optional<LoopControl>>(
-               std::get<Statement<common::Indirection<LabelDoStmt>>>(
-                   std::get<ExecutableConstruct>(startLoop->u).u)
-                   .statement->t));
-  }
   static Block::iterator MakeCanonicalForm(Block &currentBlock,
       const Block::iterator &startLoop, const Block::iterator &endLoop) {
     std::get<ExecutableConstruct>(startLoop->u).u =
         common::Indirection<DoConstruct>{std::make_tuple(
             Statement<NonLabelDoStmt>{std::optional<Label>{},
-                NonLabelDoStmt{std::make_tuple(
-                    std::optional<Name>{}, ExtractLoopControl(startLoop))}},
+                NonLabelDoStmt{std::make_tuple(std::optional<Name>{},
+                    std::move(std::get<std::optional<LoopControl>>(
+                        std::get<Statement<common::Indirection<LabelDoStmt>>>(
+                            std::get<ExecutableConstruct>(startLoop->u).u)
+                            .statement->t)))}},
             ExtractBlock(currentBlock, startLoop, endLoop),
             Statement<EndDoStmt>{
                 std::optional<Label>{}, EndDoStmt{std::optional<Name>{}}})};
-- 
2.7.4