This revision was automatically updated to reflect the committed changes.
Closed by commit rL367957: [CompilerType] Simplify the interface a bit more.. 
(authored by davide, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D65782?vs=213492&id=213496#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D65782/new/

https://reviews.llvm.org/D65782

Files:
  lldb/trunk/include/lldb/Symbol/CompilerType.h
  lldb/trunk/include/lldb/Symbol/TypeSystem.h
  lldb/trunk/source/DataFormatters/FormatManager.cpp
  lldb/trunk/source/Symbol/CompilerType.cpp
  lldb/trunk/source/Symbol/TypeSystem.cpp

Index: lldb/trunk/include/lldb/Symbol/CompilerType.h
===================================================================
--- lldb/trunk/include/lldb/Symbol/CompilerType.h
+++ lldb/trunk/include/lldb/Symbol/CompilerType.h
@@ -334,8 +334,6 @@
 
   LazyBool ShouldPrintAsOneLiner(ValueObject *valobj) const;
 
-  bool IsMeaninglessWithoutDynamicResolution() const;
-
   // Dumping types
 
 #ifndef NDEBUG
Index: lldb/trunk/include/lldb/Symbol/TypeSystem.h
===================================================================
--- lldb/trunk/include/lldb/Symbol/TypeSystem.h
+++ lldb/trunk/include/lldb/Symbol/TypeSystem.h
@@ -454,20 +454,6 @@
 
   virtual LazyBool ShouldPrintAsOneLiner(void *type, ValueObject *valobj);
 
-  // Type systems can have types that are placeholder types, which are meant to
-  // indicate the presence of a type, but offer no actual information about
-  // said types, and leave the burden of actually figuring type information out
-  // to dynamic type resolution. For instance a language with a generics
-  // system, can use placeholder types to indicate "type argument goes here",
-  // without promising uniqueness of the placeholder, nor attaching any
-  // actually idenfiable information to said placeholder. This API allows type
-  // systems to tell LLDB when such a type has been encountered In response,
-  // the debugger can react by not using this type as a cache entry in any
-  // type-specific way For instance, LLDB will currently not cache any
-  // formatters that are discovered on such a type as attributable to the
-  // meaningless type itself, instead preferring to use the dynamic type
-  virtual bool IsMeaninglessWithoutDynamicResolution(void *type);
-
 protected:
   const LLVMCastKind m_kind; // Support for llvm casting
   SymbolFile *m_sym_file;
Index: lldb/trunk/source/Symbol/CompilerType.cpp
===================================================================
--- lldb/trunk/source/Symbol/CompilerType.cpp
+++ lldb/trunk/source/Symbol/CompilerType.cpp
@@ -709,12 +709,6 @@
   return eLazyBoolCalculate;
 }
 
-bool CompilerType::IsMeaninglessWithoutDynamicResolution() const {
-  if (IsValid())
-    return m_type_system->IsMeaninglessWithoutDynamicResolution(m_type);
-  return false;
-}
-
 // Get the index of the child of "clang_type" whose name matches. This function
 // doesn't descend into the children, but only looks one level deep and name
 // matches can include base class names.
Index: lldb/trunk/source/Symbol/TypeSystem.cpp
===================================================================
--- lldb/trunk/source/Symbol/TypeSystem.cpp
+++ lldb/trunk/source/Symbol/TypeSystem.cpp
@@ -125,10 +125,6 @@
   return eLazyBoolCalculate;
 }
 
-bool TypeSystem::IsMeaninglessWithoutDynamicResolution(void *type) {
-  return false;
-}
-
 ConstString TypeSystem::DeclGetMangledName(void *opaque_decl) {
   return ConstString();
 }
Index: lldb/trunk/source/DataFormatters/FormatManager.cpp
===================================================================
--- lldb/trunk/source/DataFormatters/FormatManager.cpp
+++ lldb/trunk/source/DataFormatters/FormatManager.cpp
@@ -183,15 +183,13 @@
     reason |= lldb_private::eFormatterChoiceCriterionStrippedBitField;
   }
 
-  if (!compiler_type.IsMeaninglessWithoutDynamicResolution()) {
-    entries.push_back(
-        {type_name, reason, did_strip_ptr, did_strip_ref, did_strip_typedef});
+  entries.push_back(
+      {type_name, reason, did_strip_ptr, did_strip_ref, did_strip_typedef});
 
-    ConstString display_type_name(compiler_type.GetDisplayTypeName());
-    if (display_type_name != type_name)
-      entries.push_back({display_type_name, reason, did_strip_ptr,
-                         did_strip_ref, did_strip_typedef});
-  }
+  ConstString display_type_name(compiler_type.GetDisplayTypeName());
+  if (display_type_name != type_name)
+    entries.push_back({display_type_name, reason, did_strip_ptr, did_strip_ref,
+                       did_strip_typedef});
 
   for (bool is_rvalue_ref = true, j = true;
        j && compiler_type.IsReferenceType(nullptr, &is_rvalue_ref); j = false) {
@@ -565,10 +563,8 @@
                                            lldb::DynamicValueType use_dynamic) {
   ValueObjectSP valobj_sp = valobj.GetQualifiedRepresentationIfAvailable(
       use_dynamic, valobj.IsSynthetic());
-  if (valobj_sp && valobj_sp->GetCompilerType().IsValid()) {
-    if (!valobj_sp->GetCompilerType().IsMeaninglessWithoutDynamicResolution())
-      return valobj_sp->GetQualifiedTypeName();
-  }
+  if (valobj_sp && valobj_sp->GetCompilerType().IsValid())
+    return valobj_sp->GetQualifiedTypeName();
   return ConstString();
 }
 
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to