Merge pull request #1012 from flang-compiler/jpr-date-and-time-lowering-update

DATE_AND_TIME update after runtime upstreaming

Author: jeanPerier

flang/include/flang/Lower/Runtime.h

@@ -77,7 +77,7 @@ mlir::Value genCpuTime(fir::FirOpBuilder &, mlir::Location);
 void genDateAndTime(fir::FirOpBuilder &, mlir::Location,
                     llvm::Optional<fir::CharBoxValue> date,
                     llvm::Optional<fir::CharBoxValue> time,
-                    llvm::Optional<fir::CharBoxValue> zone);
+                    llvm::Optional<fir::CharBoxValue> zone, mlir::Value values);
 
 void genRandomInit(fir::FirOpBuilder &, mlir::Location, mlir::Value repeatable,
                    mlir::Value imageDistinct);

flang/lib/Lower/IntrinsicCall.cpp

@@ -672,7 +672,7 @@ static constexpr IntrinsicHandler handlers[]{
      {{{"date", asAddr},
        {"time", asAddr},
        {"zone", asAddr},
-       {"values", asAddr}}},
+       {"values", asBox}}},
      /*isElemental=*/false},
     {"dble", &I::genConversion},
     {"dim", &I::genDim},
@@ -2075,13 +2075,14 @@ void IntrinsicLibrary::genDateAndTime(llvm::ArrayRef<fir::ExtendedValue> args) {
   for (auto i = 0; i < 3; ++i)
     if (auto *charBox = args[i].getCharBox())
       charArgs[i] = *charBox;
-  // TODO: build descriptor for VALUES (also update runtime)
-  if (fir::getBase(args[3]))
-    mlir::emitError(loc, "TODO: lowering of DATE_AND_TIME VALUES argument not "
-                         "yet implemented\n");
+
+  auto values = fir::getBase(args[3]);
+  if (!values)
+    values = builder.create<fir::AbsentOp>(
+        loc, fir::BoxType::get(builder.getNoneType()));
 
   Fortran::lower::genDateAndTime(builder, loc, charArgs[0], charArgs[1],
-                                 charArgs[2]);
+                                 charArgs[2], values);
 }
 
 // DIM

flang/lib/Lower/Runtime.cpp

@@ -8,7 +8,6 @@
 
 #include "flang/Lower/Runtime.h"
 #include "../../runtime/misc-intrinsic.h"
-#include "../runtime/clock.h"
 #include "../runtime/pointer.h"
 #include "../runtime/random.h"
 #include "../runtime/stop.h"
@@ -211,9 +210,11 @@ void Fortran::lower::genDateAndTime(fir::FirOpBuilder &builder,
                                     mlir::Location loc,
                                     llvm::Optional<fir::CharBoxValue> date,
                                     llvm::Optional<fir::CharBoxValue> time,
-                                    llvm::Optional<fir::CharBoxValue> zone) {
+                                    llvm::Optional<fir::CharBoxValue> zone,
+                                    mlir::Value values) {
   auto callee =
       fir::runtime::getRuntimeFunc<mkRTKey(DateAndTime)>(loc, builder);
+  auto funcTy = callee.getType();
   mlir::Type idxTy = builder.getIndexType();
   mlir::Value zero;
   auto splitArg = [&](llvm::Optional<fir::CharBoxValue> arg,
@@ -238,12 +239,14 @@ void Fortran::lower::genDateAndTime(fir::FirOpBuilder &builder,
   mlir::Value zoneLen;
   splitArg(zone, zoneBuffer, zoneLen);
 
-  llvm::SmallVector<mlir::Value> args{dateBuffer, timeBuffer, zoneBuffer,
-                                      dateLen,    timeLen,    zoneLen};
-  llvm::SmallVector<mlir::Value> operands;
-  for (auto [fst, snd] : llvm::zip(args, callee.getType().getInputs()))
-    operands.emplace_back(builder.createConvert(loc, snd, fst));
-  builder.create<fir::CallOp>(loc, callee, operands);
+  auto sourceFile = fir::factory::locationToFilename(builder, loc);
+  auto sourceLine =
+      fir::factory::locationToLineNo(builder, loc, funcTy.getInput(7));
+
+  auto args = fir::runtime::createArguments(
+      builder, loc, funcTy, dateBuffer, dateLen, timeBuffer, timeLen,
+      zoneBuffer, zoneLen, sourceFile, sourceLine, values);
+  builder.create<fir::CallOp>(loc, callee, args);
 }
 
 void Fortran::lower::genRandomInit(fir::FirOpBuilder &builder,

flang/runtime/CMakeLists.txt

@@ -29,7 +29,6 @@ add_flang_library(FortranRuntime PARTIAL_SOURCES_INTENDED
   allocatable.cpp
   assign.cpp
   buffer.cpp
-  clock.cpp
   complex-reduction.c
   copy.cpp
   character.cpp