[rebase] reapply lost fir-dev changes from 68fe9e4

Strangely, it seems codegen change from 68fe9e4 were
just lost... reapply them.

Author: jeanPerier

flang/lib/Optimizer/CodeGen/CodeGen.cpp

@@ -1002,16 +1002,15 @@ struct EmboxCommonConversion : public FIROpConversion<OP> {
     // The ancestor OpenMP Op which is outlineable.
     // The ancestor LLVM Function Op.
     if (auto iface =
-             thisBlock->getParent()
-                 ->getParentOfType<
-                     mlir::omp::OutlineableOpenMPOpInterface>()) {
-       rewriter.setInsertionPointToStart(iface.getAllocaBlock());
-     } else {
-       auto func = mlir::isa<mlir::LLVM::LLVMFuncOp>(op) ? 
-           mlir::cast<mlir::LLVM::LLVMFuncOp>(op) : 
-           op->getParentOfType<mlir::LLVM::LLVMFuncOp>();
-       rewriter.setInsertionPointToStart(&func.front());
-     }
+            thisBlock->getParent()
+                ->getParentOfType<mlir::omp::OutlineableOpenMPOpInterface>()) {
+      rewriter.setInsertionPointToStart(iface.getAllocaBlock());
+    } else {
+      auto func = mlir::isa<mlir::LLVM::LLVMFuncOp>(op)
+                      ? mlir::cast<mlir::LLVM::LLVMFuncOp>(op)
+                      : op->getParentOfType<mlir::LLVM::LLVMFuncOp>();
+      rewriter.setInsertionPointToStart(&func.front());
+    }
     auto sz = this->genConstantOffset(loc, rewriter, 1);
     auto al = rewriter.create<mlir::LLVM::AllocaOp>(loc, toTy, sz, alignment);
     rewriter.restoreInsertionPoint(thisPt);
@@ -1111,13 +1110,12 @@ struct EmboxCommonConversion : public FIROpConversion<OP> {
         return doCharacter(charWidth, len);
       }
       assert(!lenParams.empty());
-      return doCharacter(charWidth, lenParams[0]);
+      return doCharacter(charWidth, lenParams.back());
     }
     if (auto ty = boxEleTy.dyn_cast<fir::LogicalType>())
       return doLogical(getKindMap().getLogicalBitsize(ty.getFKind()));
-    if (auto seqTy = boxEleTy.dyn_cast<fir::SequenceType>()) {
+    if (auto seqTy = boxEleTy.dyn_cast<fir::SequenceType>())
       return getSizeAndTypeCode(loc, rewriter, seqTy.getEleTy(), lenParams);
-    }
     if (boxEleTy.isa<fir::RecordType>()) {
       auto ptrTy = mlir::LLVM::LLVMPointerType::get(
           this->lowerTy().convertType(boxEleTy));
@@ -1228,9 +1226,15 @@ struct EmboxCommonConversion : public FIROpConversion<OP> {
     auto llvmBoxTy = llvmBoxPtrTy.getElementType();
     mlir::Value dest = rewriter.create<mlir::LLVM::UndefOp>(loc, llvmBoxTy);
 
+    llvm::SmallVector<mlir::Value> typeparams = lenParams;
+    if constexpr (!std::is_same_v<BOX, fir::EmboxOp>) {
+      if (!box.substr().empty() && fir::hasDynamicSize(boxTy.getEleTy()))
+        typeparams.push_back(box.substr()[1]);
+    }
+
     // Write each of the fields with the appropriate values
     auto [eleSize, cfiTy] =
-        getSizeAndTypeCode(loc, rewriter, boxTy.getEleTy(), lenParams);
+        getSizeAndTypeCode(loc, rewriter, boxTy.getEleTy(), typeparams);
     dest = insertField(rewriter, loc, dest, {1}, eleSize);
     dest = insertField(rewriter, loc, dest, {2},
                        this->genConstantOffset(loc, rewriter, CFI_VERSION));
@@ -1447,7 +1451,7 @@ struct XEmboxOpConversion : public EmboxCommonConversion<fir::cg::XEmboxOp> {
       if (hasSlice)
         sliceOff += 3;
     }
-    if (hasSlice || hasSubcomp) {
+    if (hasSlice || hasSubcomp || !xbox.substr().empty()) {
       llvm::SmallVector<mlir::Value> args = {base, ptrOffset};
       args.append(gepArgs.rbegin(), gepArgs.rend());
       if (hasSubcomp) {
@@ -1461,6 +1465,10 @@ struct XEmboxOpConversion : public EmboxCommonConversion<fir::cg::XEmboxOp> {
         const auto *lastOffset = beginOffset + xbox.subcomponent().size();
         args.append(beginOffset, lastOffset);
       }
+      if (!xbox.substr().empty()) {
+        // Append the substring starting offset.
+        args.push_back(xbox.substr()[0]);
+      }
       base = rewriter.create<mlir::LLVM::GEPOp>(loc, base.getType(), args);
     }
     dest = insertBaseAddress(rewriter, loc, dest, base);
@@ -2458,7 +2466,7 @@ struct GlobalOpConversion : public FIROpConversion<fir::GlobalOp> {
     auto &gr = g.getInitializerRegion();
     rewriter.inlineRegionBefore(global.region(), gr, gr.end());
     if (!gr.empty()) {
-      // Replace insert_on_range with a constant dense attribute if the 
+      // Replace insert_on_range with a constant dense attribute if the
       // initialization is on the full range.
       auto insertOnRangeOps = gr.front().getOps<fir::InsertOnRangeOp>();
       for (auto insertOp : insertOnRangeOps) {
@@ -2467,11 +2475,11 @@ struct GlobalOpConversion : public FIROpConversion<fir::GlobalOp> {
           auto *op = insertOp.val().getDefiningOp();
           auto constant = mlir::dyn_cast<mlir::arith::ConstantOp>(op);
           if (!constant) {
-              auto convertOp = mlir::dyn_cast<fir::ConvertOp>(op);
-              if (!convertOp)
-                continue;
-              constant = 
-                  cast<mlir::arith::ConstantOp>(convertOp.value().getDefiningOp());
+            auto convertOp = mlir::dyn_cast<fir::ConvertOp>(op);
+            if (!convertOp)
+              continue;
+            constant =
+                cast<mlir::arith::ConstantOp>(convertOp.value().getDefiningOp());
           }
           mlir::Type vecType = mlir::VectorType::get(
               insertOp.getType().getShape(), constant.getType());
@@ -2491,10 +2499,10 @@ struct GlobalOpConversion : public FIROpConversion<fir::GlobalOp> {
     auto extents = seqTy.getShape();
     if (indexes.size() / 2 != extents.size())
       return false;
-    for (unsigned i = 0; i < indexes.size(); i+= 2) {
+    for (unsigned i = 0; i < indexes.size(); i += 2) {
       if (indexes[i].cast<IntegerAttr>().getInt() != 0)
         return false;
-      if (indexes[i+1].cast<IntegerAttr>().getInt() != extents[i/2] - 1)
+      if (indexes[i + 1].cast<IntegerAttr>().getInt() != extents[i / 2] - 1)
         return false;
     }
     return true;