summaryrefslogtreecommitdiff
path: root/runtime/class_linker.h
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2019-11-27 14:35:24 -0800
committer Mathieu Chartier <mathieuc@google.com> 2019-12-02 18:56:46 +0000
commit0a19e212e56fc6fe2809b58072ddcf4acfdc568d (patch)
tree6e5ef4a1bd1d08917ada2a49d5f807cfbc9a4e1a /runtime/class_linker.h
parent42c52f53b3c85b5e3c984bca8eaec2e03893dd2e (diff)
Add null check in AppendToBootClassPath
Aim to diagnose test 1002 that crashed once due to having a null element in ClassLinker::boot_class_path_. Bug: 144895912 Test: test/testrunner/test.py --host -j32 Change-Id: Ibc072dbc1bd48cfde0ad5d3b56ebdc348d441085
Diffstat (limited to 'runtime/class_linker.h')
-rw-r--r--runtime/class_linker.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index 2687b9a2cf..fc954da1be 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -738,7 +738,7 @@ class ClassLinker {
REQUIRES_SHARED(Locks::mutator_lock_)
NO_THREAD_SAFETY_ANALYSIS;
- void AppendToBootClassPath(Thread* self, const DexFile& dex_file)
+ void AppendToBootClassPath(Thread* self, const DexFile* dex_file)
REQUIRES_SHARED(Locks::mutator_lock_)
REQUIRES(!Locks::dex_lock_);
@@ -912,7 +912,7 @@ class ClassLinker {
REQUIRES_SHARED(Locks::mutator_lock_)
REQUIRES(!Locks::dex_lock_, !Roles::uninterruptible_);
- void AppendToBootClassPath(const DexFile& dex_file, ObjPtr<mirror::DexCache> dex_cache)
+ void AppendToBootClassPath(const DexFile* dex_file, ObjPtr<mirror::DexCache> dex_cache)
REQUIRES_SHARED(Locks::mutator_lock_)
REQUIRES(!Locks::dex_lock_);