From 55df4a7ad8c40c9d042e2bd317b1d5079ea17c55 Mon Sep 17 00:00:00 2001
From: peter klausler <pklausler@nvidia.com>
Date: Fri, 12 Oct 2018 16:25:39 -0700
Subject: [PATCH] [flang] more unit testing, fix a bug

Original-commit: flang-compiler/f18@70189119df6ae84f995d6dd1fbdb6d03c784c723
Reviewed-on: https://github.com/flang-compiler/f18/pull/212
Tree-same-pre-rewrite: false
---
 flang/lib/evaluate/intrinsics.cc  |  9 ++++--
 flang/test/evaluate/intrinsics.cc | 46 ++++++++++++++++++++++++-------
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/flang/lib/evaluate/intrinsics.cc b/flang/lib/evaluate/intrinsics.cc
index 0f6995f571e8..8385c4e49cd9 100644
--- a/flang/lib/evaluate/intrinsics.cc
+++ b/flang/lib/evaluate/intrinsics.cc
@@ -973,8 +973,13 @@ std::optional<SpecificIntrinsic> IntrinsicInterface::Match(
     break;
   case KindCode::same:
     CHECK(sameArg != nullptr);
-    resultType = *sameArg->GetType();
-    CHECK(result.categorySet.test(resultType.category));
+    if (std::optional<DynamicType> aType{sameArg->GetType()}) {
+      if (result.categorySet.test(aType->category)) {
+        resultType = *aType;
+      } else {
+        resultType.kind = aType->kind;
+      }
+    }
     break;
   case KindCode::effectiveKind:
     CHECK(kindDummyArg != nullptr);
diff --git a/flang/test/evaluate/intrinsics.cc b/flang/test/evaluate/intrinsics.cc
index 615b27cbbef1..b9810b95827b 100644
--- a/flang/test/evaluate/intrinsics.cc
+++ b/flang/test/evaluate/intrinsics.cc
@@ -154,31 +154,57 @@ void TestIntrinsics() {
   IntrinsicProcTable table{IntrinsicProcTable::Configure(defaults)};
   table.Dump(std::cout);
 
+  using Int1 = Type<TypeCategory::Integer, 1>;
   using Int4 = Type<TypeCategory::Integer, 4>;
+  using Int8 = Type<TypeCategory::Integer, 8>;
+  using Real4 = Type<TypeCategory::Real, 4>;
+  using Real8 = Type<TypeCategory::Real, 8>;
+  using Complex4 = Type<TypeCategory::Complex, 4>;
+  using Complex8 = Type<TypeCategory::Complex, 8>;
+  using Char = Type<TypeCategory::Character, 1>;
+  using Log4 = Type<TypeCategory::Logical, 4>;
 
   TestCall{table, "bad"}
-      .Push(Const(Scalar<Int4>{1}))
+      .Push(Const(Scalar<Int4>{}))
       .DoCall();  // bad intrinsic name
   TestCall{table, "abs"}
-      .Push(Named("a", Const(Scalar<Int4>{1})))
+      .Push(Named("a", Const(Scalar<Int4>{})))
       .DoCall(Int4::dynamicType);
-  TestCall{table, "abs"}.Push(Const(Scalar<Int4>{1})).DoCall(Int4::dynamicType);
+  TestCall{table, "abs"}.Push(Const(Scalar<Int4>{})).DoCall(Int4::dynamicType);
   TestCall{table, "abs"}
-      .Push(Named("bad", Const(Scalar<Int4>{1})))
+      .Push(Named("bad", Const(Scalar<Int4>{})))
       .DoCall();  // bad keyword
   TestCall{table, "abs"}.DoCall();  // insufficient args
   TestCall{table, "abs"}
-      .Push(Const(Scalar<Int4>{1}))
-      .Push(Const(Scalar<Int4>{2}))
+      .Push(Const(Scalar<Int4>{}))
+      .Push(Const(Scalar<Int4>{}))
       .DoCall();  // too many args
   TestCall{table, "abs"}
-      .Push(Const(Scalar<Int4>{1}))
-      .Push(Named("a", Const(Scalar<Int4>{2})))
+      .Push(Const(Scalar<Int4>{}))
+      .Push(Named("a", Const(Scalar<Int4>{})))
       .DoCall();
   TestCall{table, "abs"}
-      .Push(Named("a", Const(Scalar<Int4>{1})))
-      .Push(Const(Scalar<Int4>{2}))
+      .Push(Named("a", Const(Scalar<Int4>{})))
+      .Push(Const(Scalar<Int4>{}))
       .DoCall();
+  TestCall{table, "abs"}.Push(Const(Scalar<Int1>{})).DoCall(Int1::dynamicType);
+  TestCall{table, "abs"}.Push(Const(Scalar<Int4>{})).DoCall(Int4::dynamicType);
+  TestCall{table, "abs"}.Push(Const(Scalar<Int8>{})).DoCall(Int8::dynamicType);
+  TestCall{table, "abs"}
+      .Push(Const(Scalar<Real4>{}))
+      .DoCall(Real4::dynamicType);
+  TestCall{table, "abs"}
+      .Push(Const(Scalar<Real8>{}))
+      .DoCall(Real8::dynamicType);
+  TestCall{table, "abs"}
+      .Push(Const(Scalar<Complex4>{}))
+      .DoCall(Real4::dynamicType);
+  TestCall{table, "abs"}
+      .Push(Const(Scalar<Complex8>{}))
+      .DoCall(Real8::dynamicType);
+  TestCall{table, "abs"}.Push(Const(Scalar<Char>{})).DoCall();
+  TestCall{table, "abs"}.Push(Const(Scalar<Log4>{})).DoCall();
+  // TODO: test other intrinsics
 }
 }  // namespace Fortran::evaluate