commit 25be6e9109e9e5c121495c3c6e3fe776c32e5eef
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 29 22:41:38 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 29 22:41:38 2020 +0000
tree 6ef2eedf8279c6606868cec860cf52209241d371
parent 7f90426fc842b6adfea9a688699b58c1ac889c54
parent 0beed27e063dda9b8e65d55d63d3a53b617690e9

Merge "Remove sole "user" of DCHECK_CONSTEXPR."

cmds/installd/otapreopt.cpp

diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index 18f8268..9c75781 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -96,7 +96,7 @@
 
 template<typename T>
 static constexpr T RoundDown(T x, typename std::decay<T>::type n) {
-    return DCHECK_CONSTEXPR(IsPowerOfTwo(n), , T(0))(x & -n);
+    return (x & -n);
 }
 
 template<typename T>
@@ -523,6 +523,7 @@
     // Choose a random relocation offset. Taken from art/runtime/gc/image_space.cc.
     static int32_t ChooseRelocationOffsetDelta(int32_t min_delta, int32_t max_delta) {
         constexpr size_t kPageSize = PAGE_SIZE;
+        static_assert(IsPowerOfTwo(kPageSize), "page size must be power of two");
         CHECK_EQ(min_delta % kPageSize, 0u);
         CHECK_EQ(max_delta % kPageSize, 0u);
         CHECK_LT(min_delta, max_delta);