[flang] Correctly lower optional assumed type dummy

[clementval]

Summary

Assumed type are represented differently in the ActualArgument
class. Correctly handle them in intrinsic arg lowering.

[PeteSteinfeld]

Aside from the typo, all builds and tests correctly and looks good.

flang/lib/Lower/ConvertExpr.cpp

1843

Typo

flang/lib/Lower/ConvertExpr.cpp

if (intrinsic && Fortran::lower::intrinsicRequiresCustomOptionalHandling(
           operands.size(), stmtCtx);
     }
 
     const fir::IntrinsicArgumentLoweringRules *argLowering =
         fir::getIntrinsicArgumentLowering(name);
     for (const auto &arg : llvm::enumerate(procRef.arguments())) {
       auto *expr =
           Fortran::evaluate::UnwrapExpr<Fortran::lower::SomeExpr>(arg.value());
+
+      if (!expr && arg.value() && arg.value()->GetAssumedTypeDummy()) {
+        // Assumed type optional.
+        const Fortran::evaluate::Symbol *assumedTypeSym =
+            arg.value()->GetAssumedTypeDummy();
+        auto symBox = symMap.lookupSymbol(*assumedTypeSym);
+        operands.emplace_back(symBox.getAddr());
+        continue;
+      }
       if (!expr) {
         // Absent optional.
         operands.emplace_back(fir::getAbsentIntrinsicArgument());
         continue;
       }
       if (!argLowering) {
         // No argument lowering instruction, lower by value.
         operands.emplace_back(genval(*expr));

flang/test/Lower/assumed-type.f90

 ! CHECK-LABEL: func.func @_QMassumed_type_testPcall_assumed_r() {
 ! CHECK: %[[C10:.*]] = arith.constant 10 : index
 ! CHECK: %[[I:.*]] = fir.alloca !fir.array<10xi32> {bindc_name = "i", fir.target, uniq_name = "_QMassumed_type_testFcall_assumed_rEi"}
 ! CHECK: %[[SHAPE:.*]] = fir.shape %[[C10]] : (index) -> !fir.shape<1>
 ! CHECK: %[[BOX_NONE:.*]] = fir.embox %[[I]](%[[SHAPE]]) : (!fir.ref<!fir.array<10xi32>>, !fir.shape<1>) -> !fir.box<!fir.array<10xnone>>
 ! CHECK: %[[CONV:.*]] = fir.convert %[[BOX_NONE]] : (!fir.box<!fir.array<10xnone>>) -> !fir.box<!fir.array<?xnone>>
 ! CHECK: fir.call @_QPassumed_r(%[[CONV]]) {{.*}} : (!fir.box<!fir.array<?xnone>>) -> ()
 
+  subroutine assumed_type_optional_to_intrinsic(a)
+    type(*), optional :: a(:)
+    if (present(a)) print*, 'present'
+  end subroutine
+
+! CHECK-LABEL: func.func @_QMassumed_type_testPassumed_type_optional_to_intrinsic(
+! CHECK-SAME: %[[ARG0:.*]]: !fir.box<!fir.array<?xnone>> {fir.bindc_name = "a", fir.optional}) {
+! CHECK: %{{.*}} = fir.is_present %[[ARG0]] : (!fir.box<!fir.array<?xnone>>) -> i1
+
 end module