summaryrefslogtreecommitdiff
path: root/runtime/mirror/array-inl.h
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2018-05-24 13:30:24 +0100
committer Vladimir Marko <vmarko@google.com> 2018-05-25 11:33:37 +0100
commit0278be74269fcfe4f2517d449f2bd53472f9b2f9 (patch)
tree1a59adbd7b5632cba4766b55195fdaf627cdfec0 /runtime/mirror/array-inl.h
parentb4eb1b19e1dd35d12a408358656c1421f507d231 (diff)
Remove PrimitiveArray<T>::array_class_.
And ObjPtr<>-ify jni_internal.cc while we're touching it. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Bug: 31113334 Change-Id: I15a8ade772e3e4337371c6f3c472f9efea9f4636
Diffstat (limited to 'runtime/mirror/array-inl.h')
-rw-r--r--runtime/mirror/array-inl.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/runtime/mirror/array-inl.h b/runtime/mirror/array-inl.h
index 636c84c759..d2adcb4766 100644
--- a/runtime/mirror/array-inl.h
+++ b/runtime/mirror/array-inl.h
@@ -201,11 +201,6 @@ inline Array* Array::Alloc(Thread* self,
return result;
}
-template<class T>
-inline void PrimitiveArray<T>::VisitRoots(RootVisitor* visitor) {
- array_class_.VisitRootIfNonNull(visitor, RootInfo(kRootStickyClass));
-}
-
template<typename T>
inline PrimitiveArray<T>* PrimitiveArray<T>::AllocateAndFill(Thread* self,
const T* data,
@@ -220,16 +215,6 @@ inline PrimitiveArray<T>* PrimitiveArray<T>::AllocateAndFill(Thread* self,
}
template<typename T>
-inline PrimitiveArray<T>* PrimitiveArray<T>::Alloc(Thread* self, size_t length) {
- Array* raw_array = Array::Alloc<true>(self,
- GetArrayClass(),
- length,
- ComponentSizeShiftWidth(sizeof(T)),
- Runtime::Current()->GetHeap()->GetCurrentAllocator());
- return down_cast<PrimitiveArray<T>*>(raw_array);
-}
-
-template<typename T>
inline T PrimitiveArray<T>::Get(int32_t i) {
if (!CheckIsValidIndex(i)) {
DCHECK(Thread::Current()->IsExceptionPending());
@@ -461,13 +446,6 @@ void PointerArray::Memcpy(int32_t dst_pos,
}
}
-template<typename T>
-inline void PrimitiveArray<T>::SetArrayClass(ObjPtr<Class> array_class) {
- CHECK(array_class_.IsNull());
- CHECK(array_class != nullptr);
- array_class_ = GcRoot<Class>(array_class);
-}
-
} // namespace mirror
} // namespace art