Merge pull request #1159 from schweitzpgi/ch-bug3

Fix bugs arising from using functional values as objects in memory.

Author: schweitzpgi

flang/include/flang/Optimizer/Builder/FIRBuilder.h

@@ -353,6 +353,9 @@ class FirOpBuilder : public mlir::OpBuilder {
                                    mlir::Value ub, mlir::Value step,
                                    mlir::Type type);
 
+  /// Dump the current function. (debug)
+  LLVM_DUMP_METHOD void dumpFunc();
+
 private:
   const KindMapping &kindMap;
 };

flang/lib/Lower/ConvertExpr.cpp

@@ -2693,7 +2693,6 @@ class ScalarArrayExprLowering {
               [&](const Fortran::evaluate::Subscript *x) { addSub(*x); },
               [&](const Fortran::evaluate::ArrayRef *x) {
                 assert(!x->base().IsSymbol());
-                ty = addField(x->base().GetComponent());
                 for (const auto &sub : x->subscript())
                   addSub(sub);
                 ty = fir::unwrapSequenceType(ty);
@@ -5657,7 +5656,7 @@ class ArrayExprLowering {
                                   "array constructor element has unknown size");
             });
         auto newEleTy = fir::CharacterType::getSingleton(eleTy.getContext(),
-                                                 charTy.getFKind());
+                                                         charTy.getFKind());
         if (auto seqTy = resTy.dyn_cast<fir::SequenceType>()) {
           assert(eleTy == seqTy.getEleTy());
           resTy = fir::SequenceType::get(seqTy.getShape(), newEleTy);