[Lldb-commits] [PATCH] D68171: Remove unused "append" parameter from FindTypes API
aprantl added a comment. I made a blind attempt in r373342. Hopefully that should fix it. Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D68171/new/ https://reviews.llvm.org/D68171 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D68171: Remove unused "append" parameter from FindTypes API
stella.stamenova added a comment. This broke the windows bot. A couple of other issues have shown up and been fixed since, but this change is still causing a break: http://lab.llvm.org:8011/builders/lldb-x64-windows-ninja/builds/9373 Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D68171/new/ https://reviews.llvm.org/D68171 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D68171: Remove unused "append" parameter from FindTypes API
This revision was automatically updated to reflect the committed changes.
Closed by commit rL373224: Remove unused append parameter from
FindTypes API (authored by adrian, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D68171?vs=69=222453#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D68171/new/
https://reviews.llvm.org/D68171
Files:
lldb/trunk/include/lldb/Core/Module.h
lldb/trunk/include/lldb/Symbol/SymbolFile.h
lldb/trunk/source/Core/Module.cpp
lldb/trunk/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.cpp
lldb/trunk/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h
lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
lldb/trunk/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
lldb/trunk/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h
lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h
lldb/trunk/source/Symbol/SymbolFile.cpp
lldb/trunk/tools/lldb-test/lldb-test.cpp
Index: lldb/trunk/source/Core/Module.cpp
===
--- lldb/trunk/source/Core/Module.cpp
+++ lldb/trunk/source/Core/Module.cpp
@@ -941,13 +941,13 @@
size_t Module::FindTypes_Impl(
ConstString name, const CompilerDeclContext *parent_decl_ctx,
-bool append, size_t max_matches,
+size_t max_matches,
llvm::DenseSet _symbol_files,
TypeMap ) {
static Timer::Category func_cat(LLVM_PRETTY_FUNCTION);
Timer scoped_timer(func_cat, LLVM_PRETTY_FUNCTION);
if (SymbolFile *symbols = GetSymbolFile())
-return symbols->FindTypes(name, parent_decl_ctx, append, max_matches,
+return symbols->FindTypes(name, parent_decl_ctx, max_matches,
searched_symbol_files, types);
return 0;
}
@@ -955,12 +955,10 @@
size_t Module::FindTypesInNamespace(ConstString type_name,
const CompilerDeclContext *parent_decl_ctx,
size_t max_matches, TypeList _list) {
- const bool append = true;
TypeMap types_map;
llvm::DenseSet searched_symbol_files;
- size_t num_types =
- FindTypes_Impl(type_name, parent_decl_ctx, append, max_matches,
- searched_symbol_files, types_map);
+ size_t num_types = FindTypes_Impl(type_name, parent_decl_ctx, max_matches,
+searched_symbol_files, types_map);
if (num_types > 0) {
SymbolContext sc;
sc.module_sp = shared_from_this();
@@ -988,7 +986,6 @@
const char *type_name_cstr = name.GetCString();
llvm::StringRef type_scope;
llvm::StringRef type_basename;
- const bool append = true;
TypeClass type_class = eTypeClassAny;
TypeMap typesmap;
@@ -1001,7 +998,7 @@
exact_match = type_scope.consume_front("::");
ConstString type_basename_const_str(type_basename);
-if (FindTypes_Impl(type_basename_const_str, nullptr, append, max_matches,
+if (FindTypes_Impl(type_basename_const_str, nullptr, max_matches,
searched_symbol_files, typesmap)) {
typesmap.RemoveMismatchedTypes(type_scope, type_basename, type_class,
exact_match);
@@ -1013,13 +1010,13 @@
if (type_class != eTypeClassAny && !type_basename.empty()) {
// The "type_name_cstr" will have been modified if we have a valid type
// class prefix (like "struct", "class", "union", "typedef" etc).
- FindTypes_Impl(ConstString(type_basename), nullptr, append, UINT_MAX,
+ FindTypes_Impl(ConstString(type_basename), nullptr, UINT_MAX,
searched_symbol_files, typesmap);
typesmap.RemoveMismatchedTypes(type_scope, type_basename, type_class,
exact_match);
num_matches = typesmap.GetSize();
} else {
- num_matches = FindTypes_Impl(name, nullptr, append, UINT_MAX,
+ num_matches = FindTypes_Impl(name, nullptr, UINT_MAX,
searched_symbol_files, typesmap);
if (exact_match) {
std::string name_str(name.AsCString(""));
@@ -1038,11 +1035,11 @@
}
size_t Module::FindTypes(llvm::ArrayRef pattern,
- LanguageSet languages, bool append, TypeMap ) {
+ LanguageSet languages, TypeMap ) {
static Timer::Category func_cat(LLVM_PRETTY_FUNCTION);
Timer scoped_timer(func_cat, LLVM_PRETTY_FUNCTION);
if (SymbolFile *symbols = GetSymbolFile())
-return symbols->FindTypes(pattern, languages, append, types);
+return
[Lldb-commits] [PATCH] D68171: Remove unused "append" parameter from FindTypes API
JDevlieghere accepted this revision. JDevlieghere added a comment. 拾 CHANGES SINCE LAST ACTION https://reviews.llvm.org/D68171/new/ https://reviews.llvm.org/D68171 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D68171: Remove unused "append" parameter from FindTypes API
labath accepted this revision. labath added a comment. This revision is now accepted and ready to land. Nuke it from orbit. It's the only way to be sure. I'd also consider removing the size_t return value. If some user really needs that, he can always implement the counting himself. CHANGES SINCE LAST ACTION https://reviews.llvm.org/D68171/new/ https://reviews.llvm.org/D68171 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D68171: Remove unused "append" parameter from FindTypes API
aprantl created this revision.
aprantl added reviewers: labath, friss, JDevlieghere, jasonmolenda.
I noticed that SymbolFileDWARFDebugMap::FindTypes was implementing it
incorrectly (passing append=false in a for-loop to recursive calls to FindTypes
would yield only the very last set of results), but instead of fixing it,
removing it seemed like an even better option.
rdar://problem/54412692
https://reviews.llvm.org/D68171
Files:
lldb/include/lldb/Core/Module.h
lldb/include/lldb/Symbol/SymbolFile.h
lldb/source/Core/Module.cpp
lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.cpp
lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h
lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h
lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h
lldb/source/Symbol/SymbolFile.cpp
lldb/tools/lldb-test/lldb-test.cpp
Index: lldb/tools/lldb-test/lldb-test.cpp
===
--- lldb/tools/lldb-test/lldb-test.cpp
+++ lldb/tools/lldb-test/lldb-test.cpp
@@ -519,10 +519,9 @@
DenseSet SearchedFiles;
TypeMap Map;
unsigned num_matches =
- !Name.empty()
- ? Symfile.FindTypes(ConstString(Name), ContextPtr, true, UINT32_MAX,
- SearchedFiles, Map)
- : Module.FindTypes(parseCompilerContext(), languages, true, Map);
+ !Name.empty() ? Symfile.FindTypes(ConstString(Name), ContextPtr,
+UINT32_MAX, SearchedFiles, Map)
+: Module.FindTypes(parseCompilerContext(), languages, Map);
assert(num_matches == Map.GetSize());
outs() << formatv("Found {0} types:\n", Map.GetSize());
Index: lldb/source/Symbol/SymbolFile.cpp
===
--- lldb/source/Symbol/SymbolFile.cpp
+++ lldb/source/Symbol/SymbolFile.cpp
@@ -141,19 +141,14 @@
uint32_t SymbolFile::FindTypes(
ConstString name, const CompilerDeclContext *parent_decl_ctx,
-bool append, uint32_t max_matches,
+uint32_t max_matches,
llvm::DenseSet _symbol_files,
TypeMap ) {
- if (!append)
-types.Clear();
return 0;
}
size_t SymbolFile::FindTypes(llvm::ArrayRef pattern,
- LanguageSet languages, bool append,
- TypeMap ) {
- if (!append)
-types.Clear();
+ LanguageSet languages, TypeMap ) {
return 0;
}
Index: lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h
===
--- lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h
+++ lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h
@@ -128,12 +128,12 @@
uint32_t
FindTypes(lldb_private::ConstString name,
const lldb_private::CompilerDeclContext *parent_decl_ctx,
-bool append, uint32_t max_matches,
+uint32_t max_matches,
llvm::DenseSet _symbol_files,
lldb_private::TypeMap ) override;
size_t FindTypes(llvm::ArrayRef pattern,
- lldb_private::LanguageSet languages, bool append,
+ lldb_private::LanguageSet languages,
lldb_private::TypeMap ) override;
void FindTypesByRegex(const lldb_private::RegularExpression ,
Index: lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
===
--- lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
+++ lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
@@ -1443,13 +1443,11 @@
uint32_t SymbolFilePDB::FindTypes(
lldb_private::ConstString name,
-const lldb_private::CompilerDeclContext *parent_decl_ctx, bool append,
+const lldb_private::CompilerDeclContext *parent_decl_ctx,
uint32_t max_matches,
llvm::DenseSet _symbol_files,
lldb_private::TypeMap ) {
std::lock_guard guard(GetModuleMutex());
- if (!append)
-types.Clear();
if (!name)
return 0;
if (!DeclContextMatchesThisSymbolFile(parent_decl_ctx))
@@ -1585,10 +1583,8 @@
}
size_t SymbolFilePDB::FindTypes(llvm::ArrayRef pattern,
-LanguageSet languages, bool append,
+LanguageSet languages,
lldb_private::TypeMap ) {
- if (!append)
-types.Clear();
return 0;
}
Index: lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h
===
---
