Merge pull request #5713 from ScottTodd:main-to-google
PiperOrigin-RevId: 371787755
diff --git a/experimental/bindings/java/com/google/iree/native/instance_wrapper.cc b/experimental/bindings/java/com/google/iree/native/instance_wrapper.cc
index bcc64ca..db82584 100644
--- a/experimental/bindings/java/com/google/iree/native/instance_wrapper.cc
+++ b/experimental/bindings/java/com/google/iree/native/instance_wrapper.cc
@@ -34,7 +34,7 @@
char* argv[] = {binname};
char** aargv = argv;
int argc = 1;
- iree_flags_parse_checked(&argc, &aargv);
+ iree_flags_parse_checked(IREE_FLAGS_PARSE_MODE_DEFAULT, &argc, &aargv);
// TODO(jennik): register all available drivers
IREE_CHECK_OK(iree_hal_vmla_driver_module_register(
diff --git a/iree/base/internal/math.h b/iree/base/internal/math.h
index c0a0297..3ce13e6 100644
--- a/iree/base/internal/math.h
+++ b/iree/base/internal/math.h
@@ -54,9 +54,9 @@
// NOTE: this exact form is confirmed to be recognized by the compilers we care
// about; do not modify: https://godbolt.org/z/xzof9d
static inline uint64_t iree_math_rotl_u64(const uint64_t n, uint32_t c) {
- if (!c) return n;
const uint32_t mask = 8 * sizeof(n) - 1;
c &= mask;
+ if (!c) return n;
return (n << c) | (n >> (64 - c));
}
@@ -66,9 +66,9 @@
// NOTE: this exact form is confirmed to be recognized by the compilers we care
// about **except MSVC**; do not modify: https://godbolt.org/z/xzof9d
static inline uint64_t iree_math_rotr_u64(const uint64_t n, uint32_t c) {
- if (!c) return n;
const uint32_t mask = 8 * sizeof(n) - 1;
c &= mask;
+ if (!c) return n;
return (n >> c) | (n << ((-c) & mask));
}
