Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d11e2e66 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove sole "user" of DCHECK_CONSTEXPR." am: 25be6e91 am: 22558534... 

Merge "Remove sole "user" of DCHECK_CONSTEXPR." am: 25be6e91 am: 22558534 am: 68f469d8 am: f7476791 am: 8be3ef78

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1377807

Change-Id: Ie23dc7bc4b6efe9a51a98d6659200d5f7bef63e2
parents 186d6602 8be3ef78

cmds/installd/otapreopt.cpp

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static constexpr bool IsPowerOfTwo(T x) { 


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 @@ private: 
    // 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);