Some minor changes to get an vec multiply via func example working un…

…fortunately in areas that will be defunct soon

flang/lib/Lower/OpenMP.cpp

@@ -2515,7 +2515,9 @@ void Fortran::lower::genImplicitMapsForTarget(
       mlir::getUsedValuesDefinedAbove(tarOp.getRegion(), operandSet);
 
       // filter out uses already being mapped (explicit maps)
-      for (auto value : operandSet) {
+      bool removed = false;
+      for (llvm::SetVector<mlir::Value>::iterator iter = operandSet.begin();
+           iter != operandSet.end();) {
         for (auto mapValue : tarOp.getMapOperands()) {
           if (auto mapOp = mlir::dyn_cast_if_present<mlir::omp::MapInfoOp>(
                   mapValue.getDefiningOp())) {
@@ -2532,11 +2534,17 @@ void Fortran::lower::genImplicitMapsForTarget(
               }
             }
 
-            if (underlyingValue == value) {
-              operandSet.remove(value);
+            if (underlyingValue == *iter) {
+              iter = operandSet.erase(iter);
+              removed = true;
+              break;
             }
           }
         }
+        if (!removed)
+          iter++;
+        else
+          removed = false;
       }
 
       // TODO: All captures are target_param, but not all are literal

flang/lib/Optimizer/Transforms/OMPEarlyOutlining.cpp

@@ -127,7 +127,17 @@ class OMPEarlyOutliningPass
     llvm::SetVector<mlir::Value> inputs;
     mlir::Region &targetRegion = targetOp.getRegion();
     mlir::getUsedValuesDefinedAbove(targetRegion, inputs);
-
+
+    // Collect all map info, even non-used maps must be collected to avoid
+    // ICEs.
+    for (mlir::Value oper : targetOp->getOperands()) {
+      if (auto mapEntry =
+              mlir::dyn_cast<mlir::omp::MapInfoOp>(oper.getDefiningOp())) {
+        if (!inputs.contains(mapEntry.getVarPtr()))
+          inputs.insert(mapEntry.getVarPtr());
+      }
+    }
+
     // filter out declareTarget and map entries which are specially handled
     // at the moment, so we do not wish these to end up as function arguments
     // which would just be more noise in the IR.