diff --git a/lldb/include/lldb/Symbol/Type.h b/lldb/include/lldb/Symbol/Type.h
--- a/lldb/include/lldb/Symbol/Type.h
+++ b/lldb/include/lldb/Symbol/Type.h
@@ -67,23 +67,27 @@
 public:
   enum EncodingDataType {
     eEncodingInvalid,
-    eEncodingIsUID,      ///< This type is the type whose UID is m_encoding_uid
-    eEncodingIsConstUID, ///< This type is the type whose UID is m_encoding_uid
-                         /// with the const qualifier added
-    eEncodingIsRestrictUID, ///< This type is the type whose UID is
-                            /// m_encoding_uid with the restrict qualifier added
-    eEncodingIsVolatileUID, ///< This type is the type whose UID is
-                            /// m_encoding_uid with the volatile qualifier added
-    eEncodingIsTypedefUID,  ///< This type is pointer to a type whose UID is
-                            /// m_encoding_uid
-    eEncodingIsPointerUID,  ///< This type is pointer to a type whose UID is
-                            /// m_encoding_uid
-    eEncodingIsLValueReferenceUID, ///< This type is L value reference to a type
-                                   /// whose UID is m_encoding_uid
-    eEncodingIsRValueReferenceUID, ///< This type is R value reference to a type
-                                   /// whose UID is m_encoding_uid,
-    eEncodingIsAtomicUID,          ///< This type is the type whose UID is
-                                   /// m_encoding_uid as an atomic type.
+    /// This type is the type whose UID is m_encoding_uid.
+    eEncodingIsUID,
+    /// This type is the type whose UID is m_encoding_uid with the const
+    /// qualifier added.
+    eEncodingIsConstUID,
+    /// This type is the type whose UID is m_encoding_uid with the restrict
+    /// qualifier added.
+    eEncodingIsRestrictUID,
+    /// This type is the type whose UID is m_encoding_uid with the volatile
+    /// qualifier added.
+    eEncodingIsVolatileUID,
+    /// This type is pointer to a type whose UID is m_encoding_uid.
+    eEncodingIsTypedefUID,
+    /// This type is pointer to a type whose UID is m_encoding_uid.
+    eEncodingIsPointerUID,
+    /// This type is L value reference to a type whose UID is m_encoding_uid.
+    eEncodingIsLValueReferenceUID,
+    /// This type is R value reference to a type whose UID is m_encoding_uid.
+    eEncodingIsRValueReferenceUID,
+    /// This type is the type whose UID is m_encoding_uid as an atomic type.
+    eEncodingIsAtomicUID,
     eEncodingIsSyntheticUID
   };
 
@@ -197,9 +201,9 @@
 
   // From a fully qualified typename, split the type into the type basename and
   // the remaining type scope (namespaces/classes).
-  static bool GetTypeScopeAndBasename(const llvm::StringRef& name,
-                                      llvm::StringRef &scope,
-                                      llvm::StringRef &basename,
+  static bool GetTypeScopeAndBasename(const llvm::StringRef name,
+                                      llvm::StringRef scope,
+                                      llvm::StringRef basename,
                                       lldb::TypeClass &type_class);
   void SetEncodingType(Type *encoding_type) { m_encoding_type = encoding_type; }
 
@@ -473,8 +477,8 @@
 public:
   TypeEnumMemberImpl() : m_integer_type_sp(), m_name("<invalid>"), m_value() {}
 
-  TypeEnumMemberImpl(const lldb::TypeImplSP &integer_type_sp,
-                     ConstString name, const llvm::APSInt &value);
+  TypeEnumMemberImpl(const lldb::TypeImplSP &integer_type_sp, ConstString name,
+                     const llvm::APSInt &value);
 
   TypeEnumMemberImpl(const TypeEnumMemberImpl &rhs) = default;
 
diff --git a/lldb/source/Symbol/Type.cpp b/lldb/source/Symbol/Type.cpp
--- a/lldb/source/Symbol/Type.cpp
+++ b/lldb/source/Symbol/Type.cpp
@@ -662,9 +662,9 @@
   return GetForwardCompilerType().GetTypeName();
 }
 
-bool Type::GetTypeScopeAndBasename(const llvm::StringRef& name,
-                                   llvm::StringRef &scope,
-                                   llvm::StringRef &basename,
+bool Type::GetTypeScopeAndBasename(const llvm::StringRef name,
+                                   llvm::StringRef scope,
+                                   llvm::StringRef basename,
                                    TypeClass &type_class) {
   type_class = eTypeClassAny;