diff options
| author | 2017-06-14 18:07:03 +0100 | |
|---|---|---|
| committer | 2017-06-15 10:11:26 +0100 | |
| commit | 9ac7749591c4341f5bf7d17af59d3aa6366487f1 (patch) | |
| tree | 509126cecfa61b338c6c13d554f9583b1e99cf36 /runtime/entrypoints/entrypoint_utils.cc | |
| parent | e1993c7d74fc60c468f55da78da490a5ce9c2f91 (diff) | |
Clean up ArraySlice<>.
Remove constructors that take ranges (one of them created
ambiguity with the constructor taking just the length) and
add SubArray() to serve as a replacement API.
Remove the AsRange() function as the translation to the
IterationRange<> seems totally unnecessary, we can simply
return ArraySlice<> from the functions that used it.
Remove the At() function as the comparison with the
std::vector<>::at() is confusing given that we do not
use C++ exceptions.
Add some standard container API, i.e. nested types and
more functions.
Test: m test-art-host-gtest
Test: testrunner.py --host
Change-Id: Ifcd39222cf8f36b7ebf8029398ed7fc67aafcaf0
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.cc')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index 88a5a13246..01fc9ce668 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -136,7 +136,7 @@ JValue InvokeProxyInvocationHandler(ScopedObjectAccessAlreadyRunnable& soa, cons // Rely on the fact that the methods are contiguous to determine the index of the method in // the slice. int throws_index = (reinterpret_cast<uintptr_t>(proxy_method) - - reinterpret_cast<uintptr_t>(&virtual_methods.At(0))) / method_size; + reinterpret_cast<uintptr_t>(&virtual_methods[0])) / method_size; CHECK_LT(throws_index, static_cast<int>(num_virtuals)); mirror::ObjectArray<mirror::Class>* declared_exceptions = proxy_class->GetProxyThrows()->Get(throws_index); |