[flang] Match argument types for std::min (llvm#71102)

PR llvm#68342 causes build breakage on MacOS due to uint64_t being defined as unsigned long long instead of unsigned long. It leads to type mismatch in the arguments for std::min.
jsjodin · Nov 6, 2023 · 5fc6913 · 5fc6913
1 parent 8f76522
commit 5fc6913
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/flang/lib/Evaluate/fold-implementation.h b/flang/lib/Evaluate/fold-implementation.h
@@ -910,7 +910,8 @@ template <typename T> Expr<T> Folder<T>::RESHAPE(FunctionRef<T> &&funcRef) {
  : pad->Reshape(std::move(shape.value()))};
  ConstantSubscripts subscripts{result.lbounds()};
  auto copied{result.CopyFrom(*source,
- std::min(source->size(), resultElements), subscripts, dimOrderPtr)};
+ std::min(static_cast<uint64_t>(source->size()), resultElements),
+ subscripts, dimOrderPtr)};
  if (copied < resultElements) {
  CHECK(pad);
  copied += result.CopyFrom(