diff --git a/flang/lib/Evaluate/fold-integer.cpp b/flang/lib/Evaluate/fold-integer.cpp --- a/flang/lib/Evaluate/fold-integer.cpp +++ b/flang/lib/Evaluate/fold-integer.cpp @@ -742,6 +742,26 @@ } return i.ISHFT(posVal); })); + } else if (name == "ishftc") { + if (args.at(2)) { // SIZE= is present + return FoldElementalIntrinsic(context, + std::move(funcRef), + ScalarFunc( + [&](const Scalar &i, const Scalar &shift, + const Scalar &size) -> Scalar { + // Errors are caught in intrinsics.cpp + auto shiftVal{static_cast(shift.ToInt64())}; + auto sizeVal{static_cast(size.ToInt64())}; + return i.ISHFTC(shiftVal, sizeVal); + })); + } else { // no SIZE= + return FoldElementalIntrinsic(context, std::move(funcRef), + ScalarFunc( + [&](const Scalar &i, const Scalar &count) -> Scalar { + auto countVal{static_cast(count.ToInt64())}; + return i.ISHFTC(countVal); + })); + } } else if (name == "lbound") { return LBOUND(context, std::move(funcRef)); } else if (name == "leadz" || name == "trailz" || name == "poppar" || @@ -1053,7 +1073,7 @@ } else if (name == "ubound") { return UBOUND(context, std::move(funcRef)); } - // TODO: dot_product, ishftc, matmul, sign + // TODO: dot_product, matmul, sign return Expr{std::move(funcRef)}; } diff --git a/flang/test/Evaluate/fold-ishftc.f90 b/flang/test/Evaluate/fold-ishftc.f90 new file mode 100644 --- /dev/null +++ b/flang/test/Evaluate/fold-ishftc.f90 @@ -0,0 +1,14 @@ +! RUN: %python %S/test_folding.py %s %flang_fc1 +! Tests folding of ISHFTC +module m + integer, parameter :: shift8s(*) = ishftc(257, shift = [(ict, ict = -9, 9)], 8) + integer, parameter :: expect1(*) = 256 + [128, 1, 2, 4, 8, 16, 32, 64, 128, & + 1, 2, 4, 8, 16, 32, 64, 128, 1, 2] + logical, parameter :: test_1 = all(shift8s == expect1) + integer, parameter :: sizes(*) = [(ishftc(257, ict, [(isz, isz = 1, 8)]), ict = -1, 1)] + integer, parameter :: expect2(*) = 256 + [[1, 2, 4, 8, 16, 32, 64, 128], & + [(1, j = 1, 8)], & + [1, (2, j = 2, 8)]] + logical, parameter :: test_2 = all(sizes == expect2) +end module +