diff options
| author | 2015-08-10 11:45:24 -0700 | |
|---|---|---|
| committer | 2015-08-10 11:45:24 -0700 | |
| commit | 2f90b3415aadc2587d26c767c6bfb235797119a8 (patch) | |
| tree | e2a3ae4cb2c1c1168d6c24e3bc7e192e15830626 | |
| parent | 77bccdc5e4f7bb150867c7aecd350efee84367bc (diff) | |
ART: Fix reg_type_test
Follow-up to 750f7c2827318f6d07620f2ef0321218ea4d8670.
Bug: 22881413
Change-Id: Iaea4cc29ed680710d01532124bc472547ee18bdb
| -rw-r--r-- | runtime/verifier/reg_type_test.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/runtime/verifier/reg_type_test.cc b/runtime/verifier/reg_type_test.cc index 2fecc8b25f..971b1f5d0f 100644 --- a/runtime/verifier/reg_type_test.cc +++ b/runtime/verifier/reg_type_test.cc @@ -18,6 +18,7 @@ #include <set> +#include "base/bit_vector.h" #include "base/casts.h" #include "common_runtime_test.h" #include "reg_type_cache-inl.h" @@ -421,7 +422,7 @@ TEST_F(RegTypeReferenceTest, Dump) { EXPECT_EQ(expected, resolved_unintialiesd.Dump()); expected = "Unresolved And Uninitialized Reference: java.lang.DoesNotExist Allocation PC: 12"; EXPECT_EQ(expected, unresolved_unintialized.Dump()); - expected = "UnresolvedMergedReferences(Unresolved Reference: java.lang.DoesNotExist, Unresolved Reference: java.lang.DoesNotExistEither)"; + expected = "UnresolvedMergedReferences(Zero/null | Unresolved Reference: java.lang.DoesNotExist, Unresolved Reference: java.lang.DoesNotExistEither)"; EXPECT_EQ(expected, unresolved_merged.Dump()); } @@ -477,9 +478,10 @@ TEST_F(RegTypeReferenceTest, Merging) { EXPECT_TRUE(merged.IsUnresolvedMergedReference()); RegType& merged_nonconst = const_cast<RegType&>(merged); - std::set<uint16_t> merged_ids = (down_cast<UnresolvedMergedType*>(&merged_nonconst))->GetMergedTypes(); - EXPECT_EQ(ref_type_0.GetId(), *(merged_ids.begin())); - EXPECT_EQ(ref_type_1.GetId(), *((++merged_ids.begin()))); + const BitVector& unresolved_parts = + down_cast<UnresolvedMergedType*>(&merged_nonconst)->GetUnresolvedTypes(); + EXPECT_TRUE(unresolved_parts.IsBitSet(ref_type_0.GetId())); + EXPECT_TRUE(unresolved_parts.IsBitSet(ref_type_1.GetId())); } TEST_F(RegTypeTest, MergingFloat) { |