Merge pull request #1035 from schweitzpgi/ch-n4e.n1

Fix bug with adjusted array element value types.

Author: schweitzpgi

flang/lib/Lower/ConvertExpr.cpp

@@ -2451,12 +2451,13 @@ class ScalarArrayExprLowering {
     ExtValue result;
     if (semant == ConstituentSemantics::ProjectedCopyInCopyOut) {
       auto innerArg = expSpace.findArgumentOfLoad(load);
-      auto resTy = adjustedArrayElementType(innerArg.getType());
       auto path = lowerPath(load.getType());
-      auto eleTy = fir::applyPathToType(resTy, path);
-      auto castedElement = builder.createConvert(loc, eleTy, elementalValue);
-      auto update = builder.create<fir::ArrayUpdateOp>(
-          loc, resTy, innerArg, castedElement, path, load.typeparams());
+      auto eleTy = fir::applyPathToType(innerArg.getType(), path);
+      auto toTy = adjustedArrayElementType(eleTy);
+      auto castedElement = builder.createConvert(loc, toTy, elementalValue);
+      auto update = builder.create<fir::ArrayUpdateOp>(loc, innerArg.getType(),
+                                                       innerArg, castedElement,
+                                                       path, load.typeparams());
       // Flag the offsets as "Fortran" as they are not zero-origin.
       update->setAttr(fir::factory::attrFortranArrayOffsets(),
                       builder.getUnitAttr());

flang/lib/Optimizer/Builder/FIRBuilder.cpp

@@ -12,9 +12,9 @@
 #include "flang/Optimizer/Builder/Character.h"
 #include "flang/Optimizer/Builder/Complex.h"
 #include "flang/Optimizer/Builder/MutableBox.h"
+#include "flang/Optimizer/Builder/Runtime/Assign.h"
 #include "flang/Optimizer/Dialect/FIRAttr.h"
 #include "flang/Optimizer/Dialect/FIROpsSupport.h"
-#include "flang/Optimizer/Builder/Runtime/Assign.h"
 #include "flang/Optimizer/Support/FatalError.h"
 #include "flang/Optimizer/Support/InternalNames.h"
 #include "mlir/Dialect/OpenMP/OpenMPDialect.h"