Fix h6e and m0.

Author: schweitzpgi

flang/lib/Lower/ConvertExpr.cpp

@@ -5607,7 +5607,7 @@ class ArrayExprLowering {
                                  arrModify.getResult(1));
       };
     }
-    return [=](IterSpace iters) mutable {
+    return [=, semant = this->semant](IterSpace iters) mutable {
       auto [path, eleTy, substringBounds] =
           lowerPath(loc, revPath, load, iters);
       if (semant == ConstituentSemantics::RefOpaque ||

flang/lib/Lower/IterationSpace.h

@@ -150,13 +150,6 @@ class StackableConstructExpr {
     stack.push_back(A{});
   }
 
-  void shrinkStack() {
-    assert(!empty());
-    stack.pop_back();
-    if (empty())
-      stmtCtx.finalize();
-  }
-
   /// Bind a front-end expression to a closure.
   void bind(FrontEndExpr e, GenerateElementalArrayFunc &&fun) {
     vmap.insert({e, std::move(fun)});
@@ -182,6 +175,15 @@ class StackableConstructExpr {
   StatementContext &stmtContext() { return stmtCtx; }
 
 protected:
+  void shrinkStack() {
+    assert(!empty());
+    stack.pop_back();
+    if (empty()) {
+      stmtCtx.finalize();
+      vmap.clear();
+    }
+  }
+
   // The stack for the construct information.
   llvm::SmallVector<A> stack;
 
@@ -211,6 +213,7 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &, const ImplicitIterSpace &);
 class ImplicitIterSpace
     : public StackableConstructExpr<llvm::SmallVector<FrontEndExpr>> {
 public:
+  using Base = StackableConstructExpr<llvm::SmallVector<FrontEndExpr>>;
   using FrontEndMaskExpr = FrontEndExpr;
 
   friend llvm::raw_ostream &operator<<(llvm::raw_ostream &,
@@ -262,6 +265,12 @@ class ImplicitIterSpace
     return stack;
   }
 
+  void shrinkStack() {
+    Base::shrinkStack();
+    if (stack.empty())
+      maskVarMap.clear();
+  }
+
 private:
   llvm::DenseMap<FrontEndExpr,
                  std::tuple<mlir::Value, mlir::Value, mlir::Value>>