diff options
| author | 2018-10-11 10:44:58 +0100 | |
|---|---|---|
| committer | 2018-10-12 17:53:50 +0100 | |
| commit | 78baed5ec51a6e2d113e8b29aafa5c6203b46845 (patch) | |
| tree | 57ca544020f309e3529e33300ad4867ca4579c1e /runtime/class_linker.cc | |
| parent | a48eb7e0690187618d2824a7d9b5601e7f5cdf80 (diff) | |
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
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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<intptr_t>(dex_file)); + h_long_array->Set(kDexFileIndexStart, reinterpret_cast64<int64_t>(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. |