Author: davide Date: Mon Aug 5 17:01:52 2019 New Revision: 367957 URL: http://llvm.org/viewvc/llvm-project?rev=367957&view=rev Log: [CompilerType] Simplify the interface a bit more..
Summary: .. removing IsMeaninglessWithoutTypeResolution(). I'm fairly confident this was introduced to support swift, where static types [without dynamic counterpart] don't carry a lot of value. Since then, the formatters and dynamic type resolution has been rewritten, and we employ different solutions. This function is unused here too, so let's get read of it. <rdar://problem/36377967> Reviewers: shafik, JDevlieghere, alex, compnerd, teemperor Subscribers: lldb-commits Tags: #lldb Differential Revision: https://reviews.llvm.org/D65782 Modified: 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 Modified: lldb/trunk/include/lldb/Symbol/CompilerType.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/CompilerType.h?rev=367957&r1=367956&r2=367957&view=diff ============================================================================== --- lldb/trunk/include/lldb/Symbol/CompilerType.h (original) +++ lldb/trunk/include/lldb/Symbol/CompilerType.h Mon Aug 5 17:01:52 2019 @@ -334,8 +334,6 @@ public: LazyBool ShouldPrintAsOneLiner(ValueObject *valobj) const; - bool IsMeaninglessWithoutDynamicResolution() const; - // Dumping types #ifndef NDEBUG Modified: lldb/trunk/include/lldb/Symbol/TypeSystem.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/TypeSystem.h?rev=367957&r1=367956&r2=367957&view=diff ============================================================================== --- lldb/trunk/include/lldb/Symbol/TypeSystem.h (original) +++ lldb/trunk/include/lldb/Symbol/TypeSystem.h Mon Aug 5 17:01:52 2019 @@ -454,20 +454,6 @@ public: 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; Modified: lldb/trunk/source/DataFormatters/FormatManager.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/FormatManager.cpp?rev=367957&r1=367956&r2=367957&view=diff ============================================================================== --- lldb/trunk/source/DataFormatters/FormatManager.cpp (original) +++ lldb/trunk/source/DataFormatters/FormatManager.cpp Mon Aug 5 17:01:52 2019 @@ -183,15 +183,13 @@ void FormatManager::GetPossibleMatches( reason |= lldb_private::eFormatterChoiceCriterionStrippedBitField; } - if (!compiler_type.IsMeaninglessWithoutDynamicResolution()) { - 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}); - } + 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}); for (bool is_rvalue_ref = true, j = true; j && compiler_type.IsReferenceType(nullptr, &is_rvalue_ref); j = false) { @@ -565,10 +563,8 @@ ConstString FormatManager::GetTypeForCac 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(); } Modified: lldb/trunk/source/Symbol/CompilerType.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/CompilerType.cpp?rev=367957&r1=367956&r2=367957&view=diff ============================================================================== --- lldb/trunk/source/Symbol/CompilerType.cpp (original) +++ lldb/trunk/source/Symbol/CompilerType.cpp Mon Aug 5 17:01:52 2019 @@ -709,12 +709,6 @@ LazyBool CompilerType::ShouldPrintAsOneL 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. Modified: lldb/trunk/source/Symbol/TypeSystem.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/TypeSystem.cpp?rev=367957&r1=367956&r2=367957&view=diff ============================================================================== --- lldb/trunk/source/Symbol/TypeSystem.cpp (original) +++ lldb/trunk/source/Symbol/TypeSystem.cpp Mon Aug 5 17:01:52 2019 @@ -125,10 +125,6 @@ LazyBool TypeSystem::ShouldPrintAsOneLin return eLazyBoolCalculate; } -bool TypeSystem::IsMeaninglessWithoutDynamicResolution(void *type) { - return false; -} - ConstString TypeSystem::DeclGetMangledName(void *opaque_decl) { return ConstString(); } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
