diff options
| author | Vladimir Marko <vmarko@google.com> | 2017-03-13 14:51:19 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2017-03-13 14:52:17 +0000 |
| commit | 6374c58f2ea403b3a05fb27376110fe4d0fc8e3f (patch) | |
| tree | 0aacaaf1f193e96b55e0b203b678ae724c0fb6f5 /compiler/driver/compiler_driver_test.cc | |
| parent | 8f323e09e692ff4f95f40300391fe41fb96a6c49 (diff) | |
Revert "Hash-based DexCache field array."
Reverting to allow rebasing the revert
https://android-review.googlesource.com/351689
without too many conflicts.
Bug: 30627598
This reverts commit 1aea3510b8dd0c512cec61c91c5ef1f1e5d53d64.
Change-Id: I4af65e9f41c8bad8106c028947eca7c5a9534c53
Diffstat (limited to 'compiler/driver/compiler_driver_test.cc')
| -rw-r--r-- | compiler/driver/compiler_driver_test.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index 35aa1eef2d..562f97b3ae 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -133,10 +133,9 @@ TEST_F(CompilerDriverTest, DISABLED_LARGE_CompileDexLibCore) { << " " << dex.GetMethodDeclaringClassDescriptor(dex.GetMethodId(i)) << " " << dex.GetMethodName(dex.GetMethodId(i)); } - EXPECT_TRUE(dex_cache->StaticArtFieldSize() == dex_cache->NumResolvedFields() - || dex.NumFieldIds() == dex_cache->NumResolvedFields()); + EXPECT_EQ(dex.NumFieldIds(), dex_cache->NumResolvedFields()); for (size_t i = 0; i < dex_cache->NumResolvedFields(); i++) { - ArtField* field = dex_cache->GetResolvedField(i, cl->GetImagePointerSize()); + ArtField* field = cl->GetResolvedField(i, dex_cache); EXPECT_TRUE(field != nullptr) << "field_idx=" << i << " " << dex.GetFieldDeclaringClassDescriptor(dex.GetFieldId(i)) << " " << dex.GetFieldName(dex.GetFieldId(i)); |