summaryrefslogtreecommitdiff
path: root/runtime/mirror/object_array-inl.h
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2015-05-19 18:08:00 +0100
committer Vladimir Marko <vmarko@google.com> 2015-05-26 15:59:02 +0100
commit80afd02024d20e60b197d3adfbb43cc303cf29e0 (patch)
treeef054c7b4f2a739f7cf063e0bc4c501c2c7e41b5 /runtime/mirror/object_array-inl.h
parent559b178e34c5d92e7932f92e5d8a981ac334606f (diff)
ART: Clean up arm64 kNumberOfXRegisters usage.
Avoid undefined behavior for arm64 stemming from 1u << 32 in loops with upper bound kNumberOfXRegisters. Create iterators for enumerating bits in an integer either from high to low or from low to high and use them for <arch>Context::FillCalleeSaves() on all architectures. Refactor runtime/utils.{h,cc} by moving all bit-fiddling functions to runtime/base/bit_utils.{h,cc} (together with the new bit iterators) and all time-related functions to runtime/base/time_utils.{h,cc}. Improve test coverage and fix some corner cases for the bit-fiddling functions. Bug: 13925192 Change-Id: I704884dab15b41ecf7a1c47d397ab1c3fc7ee0f7
Diffstat (limited to 'runtime/mirror/object_array-inl.h')
-rw-r--r--runtime/mirror/object_array-inl.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/mirror/object_array-inl.h b/runtime/mirror/object_array-inl.h
index d473816448..bef4af617a 100644
--- a/runtime/mirror/object_array-inl.h
+++ b/runtime/mirror/object_array-inl.h
@@ -17,6 +17,8 @@
#ifndef ART_RUNTIME_MIRROR_OBJECT_ARRAY_INL_H_
#define ART_RUNTIME_MIRROR_OBJECT_ARRAY_INL_H_
+#include <string>
+
#include "object_array.h"
#include "array-inl.h"
@@ -26,7 +28,7 @@
#include "runtime.h"
#include "handle_scope-inl.h"
#include "thread.h"
-#include <string>
+#include "utils.h"
namespace art {
namespace mirror {