system/core
| Revision | ec1eeb21a8dc1325485aa0e5348f70168582131f (tree) |
|---|---|
| Time | 2019-11-10 09:13:50 |
| Author | android-build-team Robot <android-build-team-robot@goog...> |
| Commiter | android-build-team Robot |
Snap for 5998981 from 81303e4c8f3889857925d4253a8a134d088a13a0 to qt-qpr2-release
Change-Id: I0cba8c4e1d1a0d2f1ac419f174e63c6a7a7dfd5a
libutils/include/utils/Flattenable.h (diff)| @@ -47,7 +47,12 @@ public: | ||
| 47 | 47 | |
| 48 | 48 | template<size_t N> |
| 49 | 49 | static size_t align(void*& buffer) { |
| 50 | - return align<N>( const_cast<void const*&>(buffer) ); | |
| 50 | + static_assert(!(N & (N - 1)), "Can only align to a power of 2."); | |
| 51 | + void* b = buffer; | |
| 52 | + buffer = reinterpret_cast<void*>((uintptr_t(buffer) + (N-1)) & ~(N-1)); | |
| 53 | + size_t delta = size_t(uintptr_t(buffer) - uintptr_t(b)); | |
| 54 | + memset(b, 0, delta); | |
| 55 | + return delta; | |
| 51 | 56 | } |
| 52 | 57 | |
| 53 | 58 | static void advance(void*& buffer, size_t& size, size_t offset) { |
Fork