add runtime kind code check for ExecuteCommandLine

Author: yiwu0b11

flang/runtime/execute.cpp

@@ -122,10 +122,22 @@ void RTNAME(ExecuteCommandLine)(const Descriptor &command, bool wait,
 
   if (exitstat) {
     RUNTIME_CHECK(terminator, IsValidIntDescriptor(exitstat));
+    auto exitstatKind{exitstat->type().GetCategoryAndKind()->second};
+    if (exitstatKind < 4) {
+      terminator.Crash("exitstat must have an integer kind greater or equal to "
+                       "4 but have: %d",
+          exitstatKind);
+    }
   }
 
   if (cmdstat) {
-    RUNTIME_CHECK(terminator, IsValidIntDescriptor(cmdstat));
+    RUNTIME_CHECK(terminator, IsValidIntDescriptor(cmdstat, 0));
+    auto cmdstatKind{cmdstat->type().GetCategoryAndKind()->second};
+    if (cmdstatKind < 2) {
+      terminator.Crash("cmdstat must have an integer kind greater or equal to "
+                       "2 but have: %d",
+          cmdstatKind);
+    }
     // Assigned 0 as specifed in standard, if error then overwrite
     StoreIntToDescriptor(cmdstat, CMD_EXECUTED, terminator);
   }

flang/runtime/tools.cpp

@@ -12,6 +12,7 @@
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
+#include <stdio.h>
 
 namespace Fortran::runtime {
 
@@ -191,12 +192,13 @@ RT_API_ATTRS bool IsValidCharDescriptor(const Descriptor *value) {
       value->rank() == 0;
 }
 
-RT_API_ATTRS bool IsValidIntDescriptor(const Descriptor *intVal) {
+RT_API_ATTRS bool IsValidIntDescriptor(
+    const Descriptor *intVal, const int minIntKind) {
   // Check that our descriptor is allocated and is a scalar integer with
   // kind != 1 (i.e. with a large enough decimal exponent range).
   return intVal && intVal->IsAllocated() && intVal->rank() == 0 &&
       intVal->type().IsInteger() && intVal->type().GetCategoryAndKind() &&
-      intVal->type().GetCategoryAndKind()->second != 1;
+      intVal->type().GetCategoryAndKind()->second > minIntKind;
 }
 
 RT_API_ATTRS std::int32_t CopyCharsToDescriptor(const Descriptor &value,

flang/runtime/tools.h

@@ -446,7 +446,8 @@ RT_API_ATTRS char *EnsureNullTerminated(
 
 RT_API_ATTRS bool IsValidCharDescriptor(const Descriptor *value);
 
-RT_API_ATTRS bool IsValidIntDescriptor(const Descriptor *intVal);
+RT_API_ATTRS bool IsValidIntDescriptor(
+    const Descriptor *intVal, const int minIntKind = 1);
 
 // Copy a null-terminated character array \p rawValue to descriptor \p value.
 // The copy starts at the given \p offset, if not present then start at 0.

flang/unittests/Runtime/CommandTest.cpp

@@ -422,6 +422,44 @@ TEST_F(ZeroArguments, ECLInvalidCommandAsyncDontAffectAsync) {
       *command.get(), false, nullptr, nullptr, nullptr));
 }
 
+TEST_F(ZeroArguments, ECLBadKindError) {
+  OwningPtr<Descriptor> command{CharDescriptor("echo hi")};
+  bool wait{true};
+  OwningPtr<Descriptor> exitStat{EmptyIntDescriptor<sizeof(std::int16_t)>()};
+  OwningPtr<Descriptor> cmdStat{EmptyIntDescriptor<sizeof(std::int8_t)>()};
+
+  EXPECT_DEATH(RTNAME(ExecuteCommandLine)(
+                   *command.get(), wait, exitStat.get(), nullptr, nullptr),
+      "exitstat must have an integer kind greater or equal to 4 but have: 2");
+  EXPECT_DEATH(RTNAME(ExecuteCommandLine)(
+                   *command.get(), wait, nullptr, cmdStat.get(), nullptr),
+      "cmdstat must have an integer kind greater or equal to 2 but have: 1");
+}
+
+TEST_F(ZeroArguments, ECLGoodKindEqual) {
+  OwningPtr<Descriptor> command{CharDescriptor("echo hi")};
+  bool wait{true};
+  OwningPtr<Descriptor> exitStat{EmptyIntDescriptor<sizeof(std::int32_t)>()};
+  OwningPtr<Descriptor> cmdStat{EmptyIntDescriptor<sizeof(std::int16_t)>()};
+
+  EXPECT_NO_FATAL_FAILURE(RTNAME(ExecuteCommandLine)(
+      *command.get(), wait, exitStat.get(), nullptr, nullptr));
+  EXPECT_NO_FATAL_FAILURE(RTNAME(ExecuteCommandLine)(
+      *command.get(), wait, nullptr, cmdStat.get(), nullptr));
+}
+
+TEST_F(ZeroArguments, ECLGoodKindGreater) {
+  OwningPtr<Descriptor> command{CharDescriptor("echo hi")};
+  bool wait{true};
+  OwningPtr<Descriptor> exitStat{EmptyIntDescriptor<sizeof(std::int64_t)>()};
+  OwningPtr<Descriptor> cmdStat{EmptyIntDescriptor<sizeof(std::int32_t)>()};
+
+  EXPECT_NO_FATAL_FAILURE(RTNAME(ExecuteCommandLine)(
+      *command.get(), wait, exitStat.get(), nullptr, nullptr));
+  EXPECT_NO_FATAL_FAILURE(RTNAME(ExecuteCommandLine)(
+      *command.get(), wait, nullptr, cmdStat.get(), nullptr));
+}
+
 static const char *oneArgArgv[]{"aProgram", "anArgumentOfLength20"};
 class OneArgument : public CommandFixture {
 protected: