[flang][runtime] fix buildbot failure after llvm#69199

Fix https://lab.llvm.org/buildbot/#/builders/268/builds/360
jeanPerier · Oct 17, 2023 · 77ab08e · 77ab08e
1 parent bef3e8e
commit 77ab08e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/flang/include/flang/Runtime/descriptor.h b/flang/include/flang/Runtime/descriptor.h
@@ -393,7 +393,8 @@ class Descriptor {
     bool stridesAreContiguous{true};
     for (int j{0}; j < leadingDimensions; ++j) {
       const Dimension &dim{GetDimension(j)};
-      stridesAreContiguous &= (bytes == dim.ByteStride()) | (dim.Extent() == 1);
+      stridesAreContiguous &=
+          (bytes == dim.ByteStride()) || (dim.Extent() == 1);
       bytes *= dim.Extent();
     }
     // One and zero element arrays are contiguous even if the descriptor

diff --git a/flang/runtime/ISO_Fortran_binding.cpp b/flang/runtime/ISO_Fortran_binding.cpp
@@ -130,7 +130,7 @@ RT_API_ATTRS int CFI_is_contiguous(const CFI_cdesc_t *descriptor) {
   CFI_index_t bytes = descriptor->elem_len;
   for (int j{0}; j < descriptor->rank; ++j) {
     stridesAreContiguous &=
-        (bytes == descriptor->dim[j].sm) | (descriptor->dim[j].extent == 1);
+        (bytes == descriptor->dim[j].sm) || (descriptor->dim[j].extent == 1);
     bytes *= descriptor->dim[j].extent;
   }
   if (stridesAreContiguous || bytes == 0) {