From 78baed5ec51a6e2d113e8b29aafa5c6203b46845 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Thu, 11 Oct 2018 10:44:58 +0100 Subject: ART: Use reinterpret_cast{32,64}<> when appropriate. And fix UnstartedRuntime checking for null arguments in all functions where we now use reinterpret_cast32<>. This is a follow-up to https://android-review.googlesource.com/783607 . Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Test: Pixel 2 XL boots. Test: m test-art-target-gtest Test: testrunner.py --target --optimizing Bug: 117427174 Change-Id: I58f8ad59f70e3fbb1d06aef419cd26555706fa65 --- runtime/class_linker.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/class_linker.cc') diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index b7472250ad..f778bc5b1c 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -8892,7 +8892,7 @@ jobject ClassLinker::CreateWellKnownClassLoader(Thread* self, self, kDexFileIndexStart + 1)); DCHECK(h_long_array != nullptr); - h_long_array->Set(kDexFileIndexStart, reinterpret_cast(dex_file)); + h_long_array->Set(kDexFileIndexStart, reinterpret_cast64(dex_file)); // Note that this creates a finalizable dalvik.system.DexFile object and a corresponding // FinalizerReference which will never get cleaned up without a started runtime. -- cgit v1.2.3-59-g8ed1b