From 208f67072283be64da231b51f9c195aff403dceb Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Fri, 8 Dec 2017 12:00:50 +0000 Subject: Change ArtField::ProxyFindSystemClass() to lookup the class. As the function is called from ArtField::LookupType(), we should avoid calls that appear to allow type resolution rather than plain lookup. The lookup should always succeed. Also rename ArtField::LookupType() to LookupResolvedType() to align with naming used in ClassLinker and ArtMethod. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Change-Id: I0a87347b5341575e47e0fdba6d58ade2543387c8 --- compiler/optimizing/reference_type_propagation.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler') diff --git a/compiler/optimizing/reference_type_propagation.cc b/compiler/optimizing/reference_type_propagation.cc index 7246129e25..d84f14acc0 100644 --- a/compiler/optimizing/reference_type_propagation.cc +++ b/compiler/optimizing/reference_type_propagation.cc @@ -612,7 +612,7 @@ void ReferenceTypePropagation::RTPVisitor::UpdateFieldAccessTypeInfo(HInstructio // The field is unknown only during tests. if (info.GetField() != nullptr) { - klass = info.GetField()->LookupType(); + klass = info.GetField()->LookupResolvedType(); } SetClassAsTypeInfo(instr, klass, /* is_exact */ false); -- cgit v1.2.3-59-g8ed1b