Merge pull request #684 from flang-compiler/fix-683

Fix character array compare

Author: jeanPerier

flang/lib/Lower/ConvertExpr.cpp

@@ -1900,9 +1900,11 @@ class ArrayExprLowering {
           auto [iterSpace, insPt] = genIterSpace();
           auto exv = f(iterSpace);
           auto innerArg = iterSpace.innerArgument();
+          // Convert to array elemental type is needed for logical.
+          auto eleTy = innerArg.getType().cast<fir::SequenceType>().getEleTy();
+          auto element = builder.createConvert(loc, eleTy, fir::getBase(exv));
           auto upd = builder.create<fir::ArrayUpdateOp>(
-              loc, innerArg.getType(), innerArg, fir::getBase(exv),
-              iterSpace.iterVec());
+              loc, innerArg.getType(), innerArg, element, iterSpace.iterVec());
           builder.create<fir::ResultOp>(loc, upd.getResult());
           builder.restoreInsertionPoint(insPt);
           return fir::substBase(exv, iterSpace.outerResult());
@@ -2693,8 +2695,8 @@ class ArrayExprLowering {
     auto lf = genarr(x.left());
     auto rf = genarr(x.right());
     return [=](IterSpace iters) -> ExtValue {
-      auto lhs = fir::getBase(lf(iters));
-      auto rhs = fir::getBase(rf(iters));
+      auto lhs = lf(iters);
+      auto rhs = rf(iters);
       return Fortran::lower::genCharCompare(builder, loc, pred, lhs, rhs);
     };
   }