Merge commit '23bf98e4b5b7' from llvm.org/main into next

Author: git apple-llvm automerger

lldb/include/lldb/Core/Mangled.h

@@ -277,11 +277,11 @@ class Mangled {
   void Encode(DataEncoder &encoder, ConstStringTable &strtab) const;
 
 private:
-  ///< The mangled version of the name.
+  /// The mangled version of the name.
   ConstString m_mangled;
 
-  ///< Mutable so we can get it on demand with
-  ///< a const version of this object.
+  /// Mutable so we can get it on demand with
+  /// a const version of this object.
   mutable ConstString m_demangled;
 };
 

lldb/include/lldb/Core/Module.h

@@ -986,8 +986,8 @@ class Module : public std::enable_shared_from_this<Module>,
     /// names we are looking for
     lldb::FunctionNameType m_name_type_mask = lldb::eFunctionNameTypeNone;
 
-    ///< If \b true, then demangled names that match will need to contain
-    ///< "m_name" in order to be considered a match
+    /// If \b true, then demangled names that match will need to contain
+    /// "m_name" in order to be considered a match
     bool m_match_name_after_lookup = false;
   };
 

lldb/include/lldb/Interpreter/CommandInterpreter.h

@@ -246,12 +246,12 @@ class CommandInterpreter : public Broadcaster,
   };
 
   enum CommandTypes {
-    eCommandTypesBuiltin = 0x0001, //< native commands such as "frame"
-    eCommandTypesUserDef = 0x0002, //< scripted commands
-    eCommandTypesUserMW = 0x0004,  //< multiword commands (command containers)
-    eCommandTypesAliases = 0x0008, //< aliases such as "po"
-    eCommandTypesHidden = 0x0010,  //< commands prefixed with an underscore
-    eCommandTypesAllThem = 0xFFFF  //< all commands
+    eCommandTypesBuiltin = 0x0001, ///< native commands such as "frame"
+    eCommandTypesUserDef = 0x0002, ///< scripted commands
+    eCommandTypesUserMW = 0x0004,  ///< multiword commands (command containers)
+    eCommandTypesAliases = 0x0008, ///< aliases such as "po"
+    eCommandTypesHidden = 0x0010,  ///< commands prefixed with an underscore
+    eCommandTypesAllThem = 0xFFFF  ///< all commands
   };
 
   using CommandReturnObjectCallback =

lldb/include/lldb/Symbol/SymbolFile.h

@@ -218,13 +218,13 @@ class SymbolFile : public PluginInterface {
   struct ArrayInfo {
     int64_t first_index = 0;
 
-    ///< Each entry belongs to a distinct DW_TAG_subrange_type.
-    ///< For multi-dimensional DW_TAG_array_types we would have
-    ///< an entry for each dimension. An entry represents the
-    ///< optional element count of the subrange.
+    /// Each entry belongs to a distinct DW_TAG_subrange_type.
+    /// For multi-dimensional DW_TAG_array_types we would have
+    /// an entry for each dimension. An entry represents the
+    /// optional element count of the subrange.
     ///
-    ///< The order of entries follows the order of the DW_TAG_subrange_type
-    ///< children of this DW_TAG_array_type.
+    /// The order of entries follows the order of the DW_TAG_subrange_type
+    /// children of this DW_TAG_array_type.
     llvm::SmallVector<std::optional<uint64_t>, 1> element_orders;
     uint32_t byte_stride = 0;
     uint32_t bit_stride = 0;

lldb/include/lldb/Target/Target.h

@@ -602,9 +602,9 @@ class EvaluateExpressionOptions {
   mutable uint32_t m_pound_line_line = 0;
   bool m_prepare_playground_stub_functions = true;
 
-  ///< During expression evaluation, any SymbolContext in this list will be
-  ///< used for symbol/function lookup before any other context (except for
-  ///< the module corresponding to the current frame).
+  /// During expression evaluation, any SymbolContext in this list will be
+  /// used for symbol/function lookup before any other context (except for
+  /// the module corresponding to the current frame).
   SymbolContextList m_preferred_lookup_contexts;
 };
 

lldb/include/lldb/ValueObject/ValueObjectVariable.h

@@ -75,8 +75,9 @@ class ValueObjectVariable : public ValueObject {
 
   /// The variable that this value object is based upon.
   lldb::VariableSP m_variable_sp;
-  ///< The value that DWARFExpression resolves this variable to before we patch
-  ///< it up.
+
+  /// The value that DWARFExpression resolves this variable to before we patch
+  /// it up.
   Value m_resolved_value;
 
 private:

lldb/source/Plugins/InstrumentationRuntime/Utility/Utility.cpp

@@ -13,10 +13,6 @@
 
 namespace lldb_private {
 
-///< On Darwin, if LLDB loaded libclang_rt, it's coming from a locally built
-///< compiler-rt, and we should prefer it in favour of the system sanitizers.
-///< This helper searches the target for such a dylib. Returns nullptr if no
-///< such dylib was found.
 lldb::ModuleSP GetPreferredAsanModule(const Target &target) {
   lldb::ModuleSP module;
   llvm::Regex pattern(R"(libclang_rt\.asan_.*_dynamic\.dylib)");

lldb/source/Plugins/InstrumentationRuntime/Utility/Utility.h

@@ -15,11 +15,11 @@ namespace lldb_private {
 
 class Target;
 
-///< On Darwin, if LLDB loaded libclang_rt, it's coming from a locally built
-///< compiler-rt, and we should prefer it in favour of the system sanitizers
-///< when running InstrumentationRuntime utility expressions that use symbols
-///< from the sanitizer libraries. This helper searches the target for such a
-///< dylib. Returns nullptr if no such dylib was found.
+/// On Darwin, if LLDB loaded libclang_rt, it's coming from a locally built
+/// compiler-rt, and we should prefer it in favour of the system sanitizers
+/// when running InstrumentationRuntime utility expressions that use symbols
+/// from the sanitizer libraries. This helper searches the target for such a
+/// dylib. Returns nullptr if no such dylib was found.
 lldb::ModuleSP GetPreferredAsanModule(const Target &target);
 
 } // namespace lldb_private