diff options
| author | Vladimir Marko <vmarko@google.com> | 2017-03-14 14:18:46 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2017-03-14 19:03:20 +0000 |
| commit | f44d36c8423f81cbb5e9f55d8813e26ffa1a7f3b (patch) | |
| tree | 324b41485ce6c414c1a006c72cbcc5ed9f466138 /compiler/driver/compiler_driver_test.cc | |
| parent | 8d6768d47b66a688d35399d524ad5a5450e9d9d4 (diff) | |
Revert^2 "Hash-based DexCache field array."
Test: testrunner.py --host --interpreter
Bug: 30627598
This reverts commit 6374c58f2ea403b3a05fb27376110fe4d0fc8e3f.
Change-Id: I275508e288a85d3aa08f7405a1a4f362af43b775
Diffstat (limited to 'compiler/driver/compiler_driver_test.cc')
| -rw-r--r-- | compiler/driver/compiler_driver_test.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index 562f97b3ae..35aa1eef2d 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -133,9 +133,10 @@ TEST_F(CompilerDriverTest, DISABLED_LARGE_CompileDexLibCore) { << " " << dex.GetMethodDeclaringClassDescriptor(dex.GetMethodId(i)) << " " << dex.GetMethodName(dex.GetMethodId(i)); } - EXPECT_EQ(dex.NumFieldIds(), dex_cache->NumResolvedFields()); + EXPECT_TRUE(dex_cache->StaticArtFieldSize() == dex_cache->NumResolvedFields() + || dex.NumFieldIds() == dex_cache->NumResolvedFields()); for (size_t i = 0; i < dex_cache->NumResolvedFields(); i++) { - ArtField* field = cl->GetResolvedField(i, dex_cache); + ArtField* field = dex_cache->GetResolvedField(i, cl->GetImagePointerSize()); EXPECT_TRUE(field != nullptr) << "field_idx=" << i << " " << dex.GetFieldDeclaringClassDescriptor(dex.GetFieldId(i)) << " " << dex.GetFieldName(dex.GetFieldId(i)); |