Fix bugs introduced when merging.

Author: jsjodin

flang/lib/Lower/OpenMP/OpenMP.cpp

@@ -420,8 +420,8 @@ static void processHostEvalClauses(lower::AbstractConverter &converter,
               beginClauseList =
                   &std::get<parser::OmpClauseList>(beginDirective.t);
 
-              // FIXME(JAN): For now we check if there is an inner
-              // OpenMPLoopConstruct, and extract the size clause from there
+              // For now we check if there is an inner OpenMPLoopConstruct, and
+              // extract the size clause from there
               const auto &nestedOptional =
                   std::get<std::optional<parser::NestedConstruct>>(
                       ompConstruct.t);

flang/lib/Semantics/canonicalize-omp.cpp

@@ -143,7 +143,6 @@ class CanonicalizationOfOmp {
           "If a loop construct has been fully unrolled, it cannot then be tiled"_err_en_US,
           parser::ToUpperCaseLetters(dir.source.ToString()));
     };
-
     nextIt = it;
     while (++nextIt != block.end()) {
       // Ignore compiler directives.
@@ -159,14 +158,16 @@ class CanonicalizationOfOmp {
         if (innerDir.v == llvm::omp::Directive::OMPD_tile) {
           auto &innerLoopVariant =
               std::get<std::optional<parser::NestedConstruct>>(loops.back()->t);
-          auto &innerLoop =
-              std::get<common::Indirection<parser::OpenMPLoopConstruct>>(
-                  innerLoopVariant.value());
-          innerLoop = std::move(*innerOmpLoop);
-          // Retrieveing the address so that DoConstruct or inner loop can be
-          // set later.
-          loops.push_back(&(innerLoop.value()));
-          nextIt = block.erase(nextIt);
+          if (innerLoopVariant.has_value()) {
+            auto *innerLoop =
+                std::get_if<common::Indirection<parser::OpenMPLoopConstruct>>(
+                    &(innerLoopVariant.value()));
+            *innerLoop = std::move(*innerOmpLoop);
+            // Retrieveing the address so that DoConstruct or inner loop can be
+            // set later.
+            loops.push_back(&(innerLoop->value()));
+            nextIt = block.erase(nextIt);
+          }
         }
       }
 

flang/lib/Semantics/resolve-directives.cpp

@@ -2144,7 +2144,8 @@ void OmpAttributeVisitor::PrivatizeAssociatedLoopIndexAndCheckLoopLevel(
             std::get_if<common::Indirection<parser::OpenMPLoopConstruct>>(
                 innerMostNest)}) {
       innerMostLoop = &(innerLoop->value());
-    }
+    } else
+      break;
   }
 
   if (innerMostNest) {

flang/test/Lower/OpenMP/nested-loop-transformation-construct01.f90

@@ -2,7 +2,7 @@
 
 ! RUN: bbc -fopenmp -fopenmp-version=51 -emit-hlfir %s -o - | FileCheck %s
 
-!CHECK-LABEL:   func.func @_QQmain() attributes {fir.bindc_name = "wsloop_tile"} {
+!CHECK-LABEL: func.func @_QQmain() attributes {fir.bindc_name = "WSLOOP_TILE"} {
 program wsloop_tile
   integer :: i, j, k
   integer :: a, b, c