From c38a6f8e8d18b85113d1a585235e997779583c80 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Thu, 29 Sep 2016 17:07:20 +0100 Subject: dex_cache: rewrite StringDexCachePair as DexCachePair .. with [T = mirror::String]. This is in preparation for introducing a dex cache array for MethodTypes, which will be treated the same way. Test: make test-art-host bug: 30550796 Change-Id: Ief4455b4c6e4c9dd897f2c40b14b843a57b1dc8e --- runtime/class_linker.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'runtime/class_linker.cc') diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 5106aec31e..a874c24276 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -1308,8 +1308,8 @@ bool ClassLinker::UpdateAppImageClassLoadersAndDexCaches( mirror::StringDexCacheType* const strings = reinterpret_cast(raw_arrays + layout.StringsOffset()); for (size_t j = 0; j < num_strings; ++j) { - DCHECK_EQ(strings[j].load(std::memory_order_relaxed).string_index, 0u); - DCHECK(strings[j].load(std::memory_order_relaxed).string_pointer.IsNull()); + DCHECK_EQ(strings[j].load(std::memory_order_relaxed).index, 0u); + DCHECK(strings[j].load(std::memory_order_relaxed).object.IsNull()); strings[j].store(image_resolved_strings[j].load(std::memory_order_relaxed), std::memory_order_relaxed); } @@ -2127,8 +2127,8 @@ mirror::DexCache* ClassLinker::AllocDexCache(Thread* self, if (kIsDebugBuild) { // Sanity check to make sure all the dex cache arrays are empty. b/28992179 for (size_t i = 0; i < num_strings; ++i) { - CHECK_EQ(strings[i].load(std::memory_order_relaxed).string_index, 0u); - CHECK(strings[i].load(std::memory_order_relaxed).string_pointer.IsNull()); + CHECK_EQ(strings[i].load(std::memory_order_relaxed).index, 0u); + CHECK(strings[i].load(std::memory_order_relaxed).object.IsNull()); } for (size_t i = 0; i < dex_file.NumTypeIds(); ++i) { CHECK(types[i].Read() == nullptr); -- cgit v1.2.3-59-g8ed1b