From 168387df8dcbae1b51f124eed84daf8e8de6a974 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Mon, 10 Aug 2015 17:15:32 -0700 Subject: ART: Change UnresolvedMergedType merge Change to use IsUnresolvedTypes. Bug: 22881413 Change-Id: Ic27b97b475b28a5bdf994ea5178767e0efb0e752 --- runtime/verifier/reg_type_cache.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime') diff --git a/runtime/verifier/reg_type_cache.cc b/runtime/verifier/reg_type_cache.cc index a597c8fdf..0f36572b3 100644 --- a/runtime/verifier/reg_type_cache.cc +++ b/runtime/verifier/reg_type_cache.cc @@ -325,7 +325,7 @@ const RegType& RegTypeCache::FromUnresolvedMerge(const RegType& left, const RegT const UnresolvedMergedType* left_merge = down_cast(&left); types.Copy(&left_merge->GetUnresolvedTypes()); left_resolved = &left_merge->GetResolvedPart(); - } else if (left.IsUnresolvedReference()) { + } else if (left.IsUnresolvedTypes()) { types.SetBit(left.GetId()); left_resolved = &Zero(); } else { @@ -337,7 +337,7 @@ const RegType& RegTypeCache::FromUnresolvedMerge(const RegType& left, const RegT const UnresolvedMergedType* right_merge = down_cast(&right); types.Union(&right_merge->GetUnresolvedTypes()); right_resolved = &right_merge->GetResolvedPart(); - } else if (right.IsUnresolvedReference()) { + } else if (right.IsUnresolvedTypes()) { types.SetBit(right.GetId()); right_resolved = &Zero(); } else { -- cgit v1.2.3