[flang] use 1-based dim in transformational runtime error msg

[jeanPerier]

Summary

Flang transformational runtime was previously reporting conformity
issues in a zero based fashion to describe which dimension is non
conformant. This may confuse Fortran user, especially when the message
is about a dimension other than the first one.

flang/runtime/tools.cpp

terminator.Crash(
         funcName, toName, rank, xName, x.rank());
   } else {
     for (int j{0}; j < rank; ++j) {
       auto toExtent{static_cast<std::int64_t>(to.GetDimension(j).Extent())};
       auto xExtent{static_cast<std::int64_t>(x.GetDimension(j).Extent())};
       if (xExtent != toExtent) {
         terminator.Crash("Incompatible array arguments to %s: dimension %d of "
                          "%s has extent %" PRId64 " but %s has extent %" PRId64,
-            funcName, j, toName, toExtent, xName, xExtent);
+            funcName, j + 1, toName, toExtent, xName, xExtent);
       }
     }
   }
 }
 
 void CheckIntegerKind(Terminator &terminator, int kind, const char *intrinsic) {
   if (kind < 1 || kind > 16 || (kind & (kind - 1)) != 0) {
     terminator.Crash("%s: bad KIND=%d argument", intrinsic, kind);
   }
 }
 } // namespace Fortran::runtime

flang/unittests/Runtime/RuntimeCrashTest.cpp

 //===-- flang/unittests/Runtime/CrashHandlerFixture.cpp ---------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 /// Selected APIs are tested here to support development of unit tests for other
 /// runtime components and ensure the test fixture handles crashes as we expect.
 //
 //===----------------------------------------------------------------------===//
 #include "CrashHandlerFixture.h"
+#include "tools.h"
 #include "../../runtime/terminator.h"
 #include "flang/Runtime/io-api.h"
+#include "flang/Runtime/transformational.h"
 #include <gtest/gtest.h>
 
 using namespace Fortran::runtime;
 using namespace Fortran::runtime::io;
+using Fortran::common::TypeCategory;
 
 //------------------------------------------------------------------------------
 /// Test crashes through direct calls to terminator methods
 //------------------------------------------------------------------------------
 struct TestTerminator : CrashHandlerFixture {};
 
 #define TEST_CRASH_HANDLER_MESSAGE \
   "Intentionally crashing runtime for unit test"
TEST(TestIOCrash, OverwriteBufferIntegerTest) {
   static char buffer[bufferSize];
   static const char *format{"(I1)"};
   auto *cookie{IONAME(BeginInternalFormattedOutput)(
       buffer, bufferSize, format, std::strlen(format))};
   IONAME(OutputInteger64)(cookie, 0xdeadbeef);
   ASSERT_DEATH(IONAME(OutputInteger64)(cookie, 0xdeadbeef),
       "Internal write overran available records");
 }
+
+//------------------------------------------------------------------------------
+/// Test conformity issue reports in transformational intrinsics
+//------------------------------------------------------------------------------
+struct TestIntrinsicCrash : CrashHandlerFixture {};
+
+TEST(TestIntrinsicCrash, ConformityErrors) {
+  // ARRAY(2,3) and MASK(2,4) should trigger a runtime error.
+  auto array{MakeArray<TypeCategory::Integer, 4>(
+      std::vector<int>{2, 3}, std::vector<std::int32_t>{1, 2, 3, 4, 5, 6})};
+  auto mask{MakeArray<TypeCategory::Logical, 1>(std::vector<int>{2, 4},
+      std::vector<std::uint8_t>{
+          false, true, true, false, false, true, true, true})};
+  StaticDescriptor<1, true> statDesc;
+  Descriptor &result{statDesc.descriptor()};
+
+  ASSERT_DEATH(RTNAME(Pack)(result, *array, *mask, nullptr, __FILE__, __LINE__),
+      "Incompatible array arguments to PACK: dimension 2 of ARRAY= has extent "
+      "3 but MASK= has extent 4");
+}