rename arg

Author: labath

lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp

@@ -379,7 +379,7 @@ lldb_private::Type *DWARFDIE::ResolveTypeUID(const DWARFDIE &die) const {
 }
 
 static CompilerContext GetContextEntry(DWARFDIE die,
-                                       bool complete_template_names) {
+                                       bool derive_template_names) {
   auto ctx = [die](CompilerContextKind kind) {
     return CompilerContext(kind, ConstString(die.GetName()));
   };
@@ -406,7 +406,7 @@ static CompilerContext GetContextEntry(DWARFDIE die,
                                    ? CompilerContextKind::Union
                                    : CompilerContextKind::ClassOrStruct;
     llvm::StringRef name = die.GetName();
-    if (!complete_template_names || name.contains('<'))
+    if (!derive_template_names || name.contains('<'))
       return CompilerContext(kind, ConstString(name));
 
     std::string name_storage = name.str();
@@ -420,7 +420,7 @@ static CompilerContext GetContextEntry(DWARFDIE die,
   }
 }
 
-static void GetDeclContextImpl(DWARFDIE die, bool complete_template_names,
+static void GetDeclContextImpl(DWARFDIE die, bool derive_template_names,
                                llvm::SmallSet<lldb::user_id_t, 4> &seen,
                                std::vector<CompilerContext> &context) {
   // Stop if we hit a cycle.
@@ -442,7 +442,7 @@ static void GetDeclContextImpl(DWARFDIE die, bool complete_template_names,
     case DW_TAG_subprogram:
     case DW_TAG_variable:
     case DW_TAG_typedef:
-      context.push_back(GetContextEntry(die, complete_template_names));
+      context.push_back(GetContextEntry(die, derive_template_names));
       break;
     default:
       break;
@@ -453,15 +453,15 @@ static void GetDeclContextImpl(DWARFDIE die, bool complete_template_names,
 }
 
 std::vector<CompilerContext>
-DWARFDIE::GetDeclContext(bool complete_template_names) const {
+DWARFDIE::GetDeclContext(bool derive_template_names) const {
   llvm::SmallSet<lldb::user_id_t, 4> seen;
   std::vector<CompilerContext> context;
-  GetDeclContextImpl(*this, complete_template_names, seen, context);
+  GetDeclContextImpl(*this, derive_template_names, seen, context);
   std::reverse(context.begin(), context.end());
   return context;
 }
 
-static void GetTypeLookupContextImpl(DWARFDIE die, bool complete_template_names,
+static void GetTypeLookupContextImpl(DWARFDIE die, bool derive_template_names,
                                      llvm::SmallSet<lldb::user_id_t, 4> &seen,
                                      std::vector<CompilerContext> &context) {
   // Stop if we hit a cycle.
@@ -476,7 +476,7 @@ static void GetTypeLookupContextImpl(DWARFDIE die, bool complete_template_names,
     case DW_TAG_variable:
     case DW_TAG_typedef:
     case DW_TAG_base_type:
-      context.push_back(GetContextEntry(die, complete_template_names));
+      context.push_back(GetContextEntry(die, derive_template_names));
       break;
 
     // If any of the tags below appear in the parent chain, stop the decl
@@ -500,10 +500,10 @@ static void GetTypeLookupContextImpl(DWARFDIE die, bool complete_template_names,
 }
 
 std::vector<CompilerContext>
-DWARFDIE::GetTypeLookupContext(bool complete_template_names) const {
+DWARFDIE::GetTypeLookupContext(bool derive_template_names) const {
   llvm::SmallSet<lldb::user_id_t, 4> seen;
   std::vector<CompilerContext> context;
-  GetTypeLookupContextImpl(*this, complete_template_names, seen, context);
+  GetTypeLookupContextImpl(*this, derive_template_names, seen, context);
   std::reverse(context.begin(), context.end());
   return context;
 }

lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.h

@@ -74,14 +74,14 @@ class DWARFDIE : public DWARFBaseDIE {
   /// in Clang modules. This context will include any modules or functions that
   /// the type is declared in so an exact module match can be efficiently made.
   ///
-  /// \param[in] complete_template_names
+  /// \param[in] derive_template_names
   ///   If true, augments the returned names with template arguments derived
   ///   from the child DIEs, if the names don't contained template arguments
   ///   already. If false, the returned context will contain the names exactly
   ///   as they are spelled in the debug info, regardless of whether that
   ///   includes template arguments or not.
   std::vector<CompilerContext>
-  GetDeclContext(bool complete_template_names = false) const;
+  GetDeclContext(bool derive_template_names = false) const;
 
   /// Get a context to a type so it can be looked up.
   ///
@@ -94,14 +94,14 @@ class DWARFDIE : public DWARFBaseDIE {
   /// context. This is designed to allow users to efficiently look for types
   /// using a full or partial CompilerContext array.
   ///
-  /// \param[in] complete_template_names
+  /// \param[in] derive_template_names
   ///   If true, augments the returned names with template arguments derived
   ///   from the child DIEs, if the names don't contained template arguments
   ///   already. If false, the returned context will contain the names exactly
   ///   as they are spelled in the debug info, regardless of whether that
   ///   includes template arguments or not.
   std::vector<CompilerContext>
-  GetTypeLookupContext(bool complete_template_names = false) const;
+  GetTypeLookupContext(bool derive_template_names = false) const;
 
   DWARFDeclContext GetDWARFDeclContext() const;
 

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

@@ -2740,8 +2740,8 @@ void SymbolFileDWARF::FindTypes(const TypeQuery &query, TypeResults &results) {
       m_index->GetTypesWithQuery(query_simple, [&](DWARFDIE die) {
         std::vector<CompilerContext> qualified_context =
             query.GetModuleSearch()
-                ? die.GetDeclContext(/*complete_template_names=*/true)
-                : die.GetTypeLookupContext(/*complete_template_names=*/true);
+                ? die.GetDeclContext(/*derive_template_names=*/true)
+                : die.GetTypeLookupContext(/*derive_template_names=*/true);
         if (query.ContextMatches(qualified_context))
           if (Type *matching_type = ResolveType(die, true, true))
             results.InsertUnique(matching_type->shared_from_this());