Use the object class as top in reference type propagation
This properly types all instructions, making it safe to query the type
at any time.
This also moves a few functions from class.h to class-inl.h to please
gcc linker when compiling for target.
Change-Id: I6b7ce965c10834c994b95529ab65a548515b4406
diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc
index aaf7a6d..bc9631b 100644
--- a/compiler/optimizing/graph_visualizer.cc
+++ b/compiler/optimizing/graph_visualizer.cc
@@ -470,19 +470,14 @@
if (instruction->IsLoadClass()) {
ReferenceTypeInfo info = instruction->AsLoadClass()->GetLoadedClassRTI();
ScopedObjectAccess soa(Thread::Current());
- if (info.GetTypeHandle().GetReference() != nullptr) {
- StartAttributeStream("klass") << PrettyDescriptor(info.GetTypeHandle().Get());
- } else {
- StartAttributeStream("klass") << "unresolved";
- }
+ DCHECK(info.IsValid()) << "Invalid RTI for " << instruction->DebugName();
+ StartAttributeStream("klass") << PrettyDescriptor(info.GetTypeHandle().Get());
+ StartAttributeStream("exact") << std::boolalpha << info.IsExact() << std::noboolalpha;
} else {
ReferenceTypeInfo info = instruction->GetReferenceTypeInfo();
- if (info.IsTop()) {
- StartAttributeStream("klass") << "java.lang.Object";
- } else {
- ScopedObjectAccess soa(Thread::Current());
- StartAttributeStream("klass") << PrettyDescriptor(info.GetTypeHandle().Get());
- }
+ ScopedObjectAccess soa(Thread::Current());
+ DCHECK(info.IsValid()) << "Invalid RTI for " << instruction->DebugName();
+ StartAttributeStream("klass") << PrettyDescriptor(info.GetTypeHandle().Get());
StartAttributeStream("exact") << std::boolalpha << info.IsExact() << std::noboolalpha;
}
}