Handle review comments.

Author: ergawy

flang/include/flang/Optimizer/Builder/BoxValue.h

@@ -535,17 +535,6 @@ class ExtendedValue : public details::matcher<ExtendedValue> {
 
   const VT &matchee() const { return box; }
 
-  /// Clone an ExtendedValue to a new instance changing the base address.
-  ///
-  /// TODO So far, this is only a shallow clone; only the base address is
-  /// replaced. This will probably be extended to implement deep cloning to
-  /// support scenarios such as delayed privatization for ArrayBoxValue's.
-  ExtendedValue clone(mlir::Value newBase) const {
-    return match(
-        [&](const UnboxedValue &box) -> ExtendedValue { return newBase; },
-        [&](const auto &box) -> ExtendedValue { return box.clone(newBase); });
-  }
-
 private:
   VT box;
 };

flang/lib/Lower/OpenMP/DataSharingProcessor.cpp

@@ -50,7 +50,7 @@ void DataSharingProcessor::processStep2(mlir::Operation *op, bool isLoop) {
 }
 
 void DataSharingProcessor::insertDeallocs() {
-  // TODO Extend delayed privatization to include a `dealloc` region?
+  // TODO Extend delayed privatization to include a `dealloc` region.
   for (const Fortran::semantics::Symbol *sym : privatizedSymbols)
     if (Fortran::semantics::IsAllocatable(sym->GetUltimate())) {
       converter.createHostAssociateVarCloneDealloc(*sym);
@@ -388,7 +388,8 @@ void DataSharingProcessor::doPrivatize(const Fortran::semantics::Symbol *sym) {
           &allocRegion, /*insertPt=*/{}, symType, symLoc);
 
       firOpBuilder.setInsertionPointToEnd(allocEntryBlock);
-      symTable->addSymbol(*sym, symExV.clone(allocRegion.getArgument(0)));
+      symTable->addSymbol(*sym,
+                          fir::substBase(symExV, allocRegion.getArgument(0)));
       symTable->pushScope();
       cloneSymbol(sym);
       firOpBuilder.create<mlir::omp::YieldOp>(
@@ -405,10 +406,12 @@ void DataSharingProcessor::doPrivatize(const Fortran::semantics::Symbol *sym) {
       mlir::Block *copyEntryBlock = firOpBuilder.createBlock(
           &copyRegion, /*insertPt=*/{}, {symType, symType}, {symLoc, symLoc});
       firOpBuilder.setInsertionPointToEnd(copyEntryBlock);
-      symTable->addSymbol(*sym, symExV.clone(copyRegion.getArgument(0)),
+      symTable->addSymbol(*sym,
+                          fir::substBase(symExV, copyRegion.getArgument(0)),
                           /*force=*/true);
       symTable->pushScope();
-      symTable->addSymbol(*sym, symExV.clone(copyRegion.getArgument(1)));
+      symTable->addSymbol(*sym,
+                          fir::substBase(symExV, copyRegion.getArgument(1)));
       auto ip = firOpBuilder.saveInsertionPoint();
       copyFirstPrivateSymbol(sym, &ip);
 

flang/test/Lower/OpenMP/delayed-privatization-allocatable-firstprivate.f90

@@ -1,6 +1,9 @@
 ! Test delayed privatization for allocatables: `firstprivate`.
 
-! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
+! RUN:   -o - %s 2>&1 | FileCheck %s
+! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 |\
+! RUN:   FileCheck %s
 
 subroutine delayed_privatization_allocatable
   implicit none

flang/test/Lower/OpenMP/delayed-privatization-allocatable-private.f90

@@ -1,6 +1,9 @@
 ! Test delayed privatization for allocatables: `private`.
 
-! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
+! RUN:   -o - %s 2>&1 | FileCheck %s
+! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 |\
+! RUN:   FileCheck %s
 
 subroutine delayed_privatization_allocatable
   implicit none