diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
@@ -497,7 +497,7 @@ class DSAStackTy {
   void addCriticalWithHint(const OMPCriticalDirective *D, llvm::APSInt Hint) {
     Criticals.try_emplace(D->getDirectiveName().getAsString(), D, Hint);
   }
-  const std::pair<const OMPCriticalDirective *, llvm::APSInt>
+  std::pair<const OMPCriticalDirective *, llvm::APSInt>
   getCriticalWithHint(const DeclarationNameInfo &Name) const {
     auto I = Criticals.find(Name.getAsString());
     if (I != Criticals.end())
@@ -519,18 +519,18 @@ class DSAStackTy {
   /// current region.
   /// \return The index of the loop control variable in the list of associated
   /// for-loops (from outer to inner).
-  const LCDeclInfo isLoopControlVariable(const ValueDecl *D) const;
+  LCDeclInfo isLoopControlVariable(const ValueDecl *D) const;
   /// Check if the specified variable is a loop control variable for
   /// parent region.
   /// \return The index of the loop control variable in the list of associated
   /// for-loops (from outer to inner).
-  const LCDeclInfo isParentLoopControlVariable(const ValueDecl *D) const;
+  LCDeclInfo isParentLoopControlVariable(const ValueDecl *D) const;
   /// Check if the specified variable is a loop control variable for
   /// current region.
   /// \return The index of the loop control variable in the list of associated
   /// for-loops (from outer to inner).
-  const LCDeclInfo isLoopControlVariable(const ValueDecl *D,
-                                         unsigned Level) const;
+  LCDeclInfo isLoopControlVariable(const ValueDecl *D,
+                                   unsigned Level) const;
   /// Get the loop control variable for the I-th loop (or nullptr) in
   /// parent directive.
   const ValueDecl *getParentLoopControlVariable(unsigned I) const;
@@ -563,13 +563,13 @@ class DSAStackTy {
                                  const Expr *ReductionRef);
   /// Returns the location and reduction operation from the innermost parent
   /// region for the given \p D.
-  const DSAVarData
+  DSAVarData
   getTopMostTaskgroupReductionData(const ValueDecl *D, SourceRange &SR,
                                    BinaryOperatorKind &BOK,
                                    Expr *&TaskgroupDescriptor) const;
   /// Returns the location and reduction operation from the innermost parent
   /// region for the given \p D.
-  const DSAVarData
+  DSAVarData
   getTopMostTaskgroupReductionData(const ValueDecl *D, SourceRange &SR,
                                    const Expr *&ReductionRef,
                                    Expr *&TaskgroupDescriptor) const;
@@ -594,15 +594,15 @@ class DSAStackTy {
 
   /// Returns data sharing attributes from top of the stack for the
   /// specified declaration.
-  const DSAVarData getTopDSA(ValueDecl *D, bool FromParent);
+  DSAVarData getTopDSA(ValueDecl *D, bool FromParent);
   /// Returns data-sharing attributes for the specified declaration.
-  const DSAVarData getImplicitDSA(ValueDecl *D, bool FromParent) const;
+  DSAVarData getImplicitDSA(ValueDecl *D, bool FromParent) const;
   /// Returns data-sharing attributes for the specified declaration.
-  const DSAVarData getImplicitDSA(ValueDecl *D, unsigned Level) const;
+  DSAVarData getImplicitDSA(ValueDecl *D, unsigned Level) const;
   /// Checks if the specified variables has data-sharing attributes which
   /// match specified \a CPred predicate in any directive which matches \a DPred
   /// predicate.
-  const DSAVarData
+  DSAVarData
   hasDSA(ValueDecl *D,
          const llvm::function_ref<bool(OpenMPClauseKind, bool,
                                        DefaultDataSharingAttributes)>
@@ -612,7 +612,7 @@ class DSAStackTy {
   /// Checks if the specified variables has data-sharing attributes which
   /// match specified \a CPred predicate in any innermost directive which
   /// matches \a DPred predicate.
-  const DSAVarData
+  DSAVarData
   hasInnermostDSA(ValueDecl *D,
                   const llvm::function_ref<bool(OpenMPClauseKind, bool)> CPred,
                   const llvm::function_ref<bool(OpenMPDirectiveKind)> DPred,
@@ -1436,7 +1436,7 @@ void DSAStackTy::addLoopControlVariable(const ValueDecl *D, VarDecl *Capture) {
       D, LCDeclInfo(StackElem.LCVMap.size() + 1, Capture));
 }
 
-const DSAStackTy::LCDeclInfo
+DSAStackTy::LCDeclInfo
 DSAStackTy::isLoopControlVariable(const ValueDecl *D) const {
   assert(!isStackEmpty() && "Data-sharing attributes stack is empty");
   D = getCanonicalDecl(D);
@@ -1447,7 +1447,7 @@ DSAStackTy::isLoopControlVariable(const ValueDecl *D) const {
   return {0, nullptr};
 }
 
-const DSAStackTy::LCDeclInfo
+DSAStackTy::LCDeclInfo
 DSAStackTy::isLoopControlVariable(const ValueDecl *D, unsigned Level) const {
   assert(!isStackEmpty() && "Data-sharing attributes stack is empty");
   D = getCanonicalDecl(D);
@@ -1460,7 +1460,7 @@ DSAStackTy::isLoopControlVariable(const ValueDecl *D, unsigned Level) const {
   return {0, nullptr};
 }
 
-const DSAStackTy::LCDeclInfo
+DSAStackTy::LCDeclInfo
 DSAStackTy::isParentLoopControlVariable(const ValueDecl *D) const {
   const SharingMapTy *Parent = getSecondOnStackOrNull();
   assert(Parent && "Data-sharing attributes stack is empty");
@@ -1602,7 +1602,7 @@ void DSAStackTy::addTaskgroupReductionData(const ValueDecl *D, SourceRange SR,
   }
 }
 
-const DSAStackTy::DSAVarData DSAStackTy::getTopMostTaskgroupReductionData(
+DSAStackTy::DSAVarData DSAStackTy::getTopMostTaskgroupReductionData(
     const ValueDecl *D, SourceRange &SR, BinaryOperatorKind &BOK,
     Expr *&TaskgroupDescriptor) const {
   D = getCanonicalDecl(D);
@@ -1629,7 +1629,7 @@ const DSAStackTy::DSAVarData DSAStackTy::getTopMostTaskgroupReductionData(
   return DSAVarData();
 }
 
-const DSAStackTy::DSAVarData DSAStackTy::getTopMostTaskgroupReductionData(
+DSAStackTy::DSAVarData DSAStackTy::getTopMostTaskgroupReductionData(
     const ValueDecl *D, SourceRange &SR, const Expr *&ReductionRef,
     Expr *&TaskgroupDescriptor) const {
   D = getCanonicalDecl(D);
@@ -1721,8 +1721,8 @@ static bool rejectConstNotMutableType(Sema &SemaRef, const ValueDecl *D,
   return false;
 }
 
-const DSAStackTy::DSAVarData DSAStackTy::getTopDSA(ValueDecl *D,
-                                                   bool FromParent) {
+DSAStackTy::DSAVarData DSAStackTy::getTopDSA(ValueDecl *D,
+                                             bool FromParent) {
   D = getCanonicalDecl(D);
   DSAVarData DVar;
 
@@ -1881,8 +1881,8 @@ const DSAStackTy::DSAVarData DSAStackTy::getTopDSA(ValueDecl *D,
   return DVar;
 }
 
-const DSAStackTy::DSAVarData DSAStackTy::getImplicitDSA(ValueDecl *D,
-                                                        bool FromParent) const {
+DSAStackTy::DSAVarData DSAStackTy::getImplicitDSA(ValueDecl *D,
+                                                  bool FromParent) const {
   if (isStackEmpty()) {
     const_iterator I;
     return getDSA(I, D);
@@ -1895,16 +1895,16 @@ const DSAStackTy::DSAVarData DSAStackTy::getImplicitDSA(ValueDecl *D,
   return getDSA(StartI, D);
 }
 
-const DSAStackTy::DSAVarData DSAStackTy::getImplicitDSA(ValueDecl *D,
-                                                        unsigned Level) const {
+DSAStackTy::DSAVarData DSAStackTy::getImplicitDSA(ValueDecl *D,
+                                                  unsigned Level) const {
   if (getStackSize() <= Level)
     return DSAVarData();
   D = getCanonicalDecl(D);
   const_iterator StartI = std::next(begin(), getStackSize() - 1 - Level);
   return getDSA(StartI, D);
 }
 
-const DSAStackTy::DSAVarData
+DSAStackTy::DSAVarData
 DSAStackTy::hasDSA(ValueDecl *D,
                    const llvm::function_ref<bool(OpenMPClauseKind, bool,
                                                  DefaultDataSharingAttributes)>
@@ -1930,7 +1930,7 @@ DSAStackTy::hasDSA(ValueDecl *D,
   return {};
 }
 
-const DSAStackTy::DSAVarData DSAStackTy::hasInnermostDSA(
+DSAStackTy::DSAVarData DSAStackTy::hasInnermostDSA(
     ValueDecl *D, const llvm::function_ref<bool(OpenMPClauseKind, bool)> CPred,
     const llvm::function_ref<bool(OpenMPDirectiveKind)> DPred,
     bool FromParent) const {
@@ -22487,7 +22487,7 @@ bool SemaOpenMP::ActOnStartOpenMPDeclareTargetContext(
   return true;
 }
 
-const SemaOpenMP::DeclareTargetContextInfo
+SemaOpenMP::DeclareTargetContextInfo
 SemaOpenMP::ActOnOpenMPEndDeclareTargetDirective() {
   assert(!DeclareTargetNesting.empty() &&
          "check isInOpenMPDeclareTargetContext() first!");

diff --git a/clang/lib/StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp
@@ -537,7 +537,7 @@ class StdLibraryFunctionsChecker
     /// a later bug report created by ErrnoChecker.
     /// Empty return value means that 'errno' related bug may not happen from
     /// the current analyzed function.
-    virtual const std::string describe(CheckerContext &C) const { return ""; }
+    virtual std::string describe(CheckerContext &C) const { return ""; }
 
     virtual ~ErrnoConstraintBase() {}
 
@@ -606,7 +606,7 @@ class StdLibraryFunctionsChecker
       return errno_modeling::setErrnoForStdSuccess(State, C);
     }
 
-    const std::string describe(CheckerContext &C) const override {
+    std::string describe(CheckerContext &C) const override {
       return "'errno' becomes undefined after the call";
     }
   };
@@ -624,7 +624,7 @@ class StdLibraryFunctionsChecker
                                                       Call.getOriginExpr());
     }
 
-    const std::string describe(CheckerContext &C) const override {
+    std::string describe(CheckerContext &C) const override {
       return "reading 'errno' is required to find out if the call has failed";
     }
   };

diff --git a/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp b/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
@@ -561,7 +561,7 @@ static bool potentiallyWritesIntoIvar(const Decl *Parent,
 /// Note that \p Vec is passed by value, leading to quadratic copying cost,
 /// but it's OK in practice since its length is limited to DEREFERENCE_LIMIT.
 /// \return A chain fields leading to the region of interest or std::nullopt.
-const std::optional<NoStoreFuncVisitor::RegionVector>
+std::optional<NoStoreFuncVisitor::RegionVector>
 NoStoreFuncVisitor::findRegionOfInterestInRecord(
     const RecordDecl *RD, ProgramStateRef State, const MemRegion *R,
     const NoStoreFuncVisitor::RegionVector &Vec /* = {} */,

diff --git a/clang/lib/StaticAnalyzer/Core/CallEvent.cpp b/clang/lib/StaticAnalyzer/Core/CallEvent.cpp
@@ -518,7 +518,7 @@ const ConstructionContext *CallEvent::getConstructionContext() const {
   return nullptr;
 }
 
-const CallEventRef<> CallEvent::getCaller() const {
+CallEventRef<> CallEvent::getCaller() const {
   const auto *CallLocationContext = this->getLocationContext();
   if (!CallLocationContext || CallLocationContext->inTopFrame())
     return nullptr;

diff --git a/llvm/include/llvm/ADT/APInt.h b/llvm/include/llvm/ADT/APInt.h
@@ -2227,12 +2227,12 @@ inline const APInt &umax(const APInt &A, const APInt &B) {
 }
 
 /// Determine the absolute difference of two APInts considered to be signed.
-inline const APInt abds(const APInt &A, const APInt &B) {
+inline APInt abds(const APInt &A, const APInt &B) {
   return A.sge(B) ? (A - B) : (B - A);
 }
 
 /// Determine the absolute difference of two APInts considered to be unsigned.
-inline const APInt abdu(const APInt &A, const APInt &B) {
+inline APInt abdu(const APInt &A, const APInt &B) {
   return A.uge(B) ? (A - B) : (B - A);
 }
 

diff --git a/llvm/include/llvm/ADT/DenseMap.h b/llvm/include/llvm/ADT/DenseMap.h
@@ -465,13 +465,13 @@ class DenseMapBase : public DebugEpochBase {
     return KeyInfoT::getHashValue(Val);
   }
 
-  static const KeyT getEmptyKey() {
+  static KeyT getEmptyKey() {
     static_assert(std::is_base_of_v<DenseMapBase, DerivedT>,
                   "Must pass the derived type to this template!");
     return KeyInfoT::getEmptyKey();
   }
 
-  static const KeyT getTombstoneKey() { return KeyInfoT::getTombstoneKey(); }
+  static KeyT getTombstoneKey() { return KeyInfoT::getTombstoneKey(); }
 
 private:
   iterator makeIterator(BucketT *P, BucketT *E, DebugEpochBase &Epoch,

diff --git a/llvm/include/llvm/ADT/SmallPtrSet.h b/llvm/include/llvm/ADT/SmallPtrSet.h
@@ -308,7 +308,7 @@ class LLVM_DEBUGEPOCHBASE_HANDLEBASE_EMPTYBASE SmallPtrSetIterator
 
   // Most methods are provided by the base class.
 
-  const PtrTy operator*() const {
+  PtrTy operator*() const {
     assert(isHandleInSync() && "invalid iterator access!");
     if (shouldReverseIterate()) {
       assert(Bucket > End);

diff --git a/llvm/include/llvm/Analysis/CtxProfAnalysis.h b/llvm/include/llvm/Analysis/CtxProfAnalysis.h
@@ -99,7 +99,7 @@ class PGOContextualProfile {
   void update(Visitor, const Function &F);
   void visit(ConstVisitor, const Function *F = nullptr) const;
 
-  const CtxProfFlatProfile flatten() const;
+  CtxProfFlatProfile flatten() const;
 
   bool invalidate(Module &, const PreservedAnalyses &PA,
                   ModuleAnalysisManager::Invalidator &) {

diff --git a/llvm/include/llvm/Analysis/InstructionSimplify.h b/llvm/include/llvm/Analysis/InstructionSimplify.h
@@ -282,12 +282,12 @@ bool replaceAndRecursivelySimplify(
 // These helper functions return a SimplifyQuery structure that contains as
 // many of the optional analysis we use as are currently valid.  This is the
 // strongly preferred way of constructing SimplifyQuery in passes.
-const SimplifyQuery getBestSimplifyQuery(Pass &, Function &);
+SimplifyQuery getBestSimplifyQuery(Pass &, Function &);
 template <class T, class... TArgs>
-const SimplifyQuery getBestSimplifyQuery(AnalysisManager<T, TArgs...> &,
-                                         Function &);
-const SimplifyQuery getBestSimplifyQuery(LoopStandardAnalysisResults &,
-                                         const DataLayout &);
+SimplifyQuery getBestSimplifyQuery(AnalysisManager<T, TArgs...> &,
+                                   Function &);
+SimplifyQuery getBestSimplifyQuery(LoopStandardAnalysisResults &,
+                                   const DataLayout &);
 } // end namespace llvm
 
 #endif
diff --git a/llvm/include/llvm/CodeGen/AccelTable.h b/llvm/include/llvm/CodeGen/AccelTable.h
@@ -207,7 +207,7 @@ template <typename DataT> class AccelTable : public AccelTableBase {
   void addName(DwarfStringPoolEntryRef Name, Types &&... Args);
   void clear() { Entries.clear(); }
   void addEntries(AccelTable<DataT> &Table);
-  const StringEntries getEntries() const { return Entries; }
+  StringEntries getEntries() const { return Entries; }
 };
 
 template <typename AccelTableDataT>

diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h
@@ -92,7 +92,7 @@ class DWARFDebugLine {
     std::vector<DWARFFormValue> IncludeDirectories;
     std::vector<FileNameEntry> FileNames;
 
-    const dwarf::FormParams getFormParams() const { return FormParams; }
+    dwarf::FormParams getFormParams() const { return FormParams; }
     uint16_t getVersion() const { return FormParams.Version; }
     uint8_t getAddressSize() const { return FormParams.AddrSize; }
     bool isDWARF64() const { return FormParams.Format == dwarf::DWARF64; }

diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h b/llvm/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h
@@ -46,7 +46,7 @@ class ModuleDebugStreamRef {
   symbols(bool *HadError) const;
 
   const codeview::CVSymbolArray &getSymbolArray() const { return SymbolArray; }
-  const codeview::CVSymbolArray
+  codeview::CVSymbolArray
   getSymbolArrayForScope(uint32_t ScopeBegin) const;
 
   BinarySubstreamRef getSymbolsSubstream() const;

diff --git a/llvm/include/llvm/MC/MCParser/MCAsmLexer.h b/llvm/include/llvm/MC/MCParser/MCAsmLexer.h
@@ -108,7 +108,7 @@ class MCAsmLexer {
   }
 
   /// Look ahead at the next token to be lexed.
-  const AsmToken peekTok(bool ShouldSkipSpace = true) {
+  AsmToken peekTok(bool ShouldSkipSpace = true) {
     AsmToken Tok;
 
     MutableArrayRef<AsmToken> Buf(Tok);

diff --git a/llvm/include/llvm/MC/MCPseudoProbe.h b/llvm/include/llvm/MC/MCPseudoProbe.h
@@ -507,7 +507,7 @@ class MCPseudoProbeDecoder {
     return iterator_range(It->second);
   }
 
-  const ArrayRef<MCDecodedPseudoProbeInlineTree> getInlineTreeVec() const {
+  ArrayRef<MCDecodedPseudoProbeInlineTree> getInlineTreeVec() const {
     return InlineTreeVec;
   }
 

diff --git a/llvm/include/llvm/Option/OptTable.h b/llvm/include/llvm/Option/OptTable.h
@@ -137,7 +137,7 @@ class OptTable {
   /// if necessary.
   ///
   /// \return The option, or null for the INVALID option id.
-  const Option getOption(OptSpecifier Opt) const;
+  Option getOption(OptSpecifier Opt) const;
 
   /// Lookup the name of the given option.
   StringRef getOptionName(OptSpecifier id) const {

diff --git a/llvm/include/llvm/Option/Option.h b/llvm/include/llvm/Option/Option.h
@@ -103,13 +103,13 @@ class Option {
     return Info->getName();
   }
 
-  const Option getGroup() const {
+  Option getGroup() const {
     assert(Info && "Must have a valid info!");
     assert(Owner && "Must have a valid owner!");
     return Owner->getOption(Info->GroupID);
   }
 
-  const Option getAlias() const {
+  Option getAlias() const {
     assert(Info && "Must have a valid info!");
     assert(Owner && "Must have a valid owner!");
     return Owner->getOption(Info->AliasID);
@@ -193,7 +193,7 @@ class Option {
 
   /// getUnaliasedOption - Return the final option this option
   /// aliases (itself, if the option has no alias).
-  const Option getUnaliasedOption() const {
+  Option getUnaliasedOption() const {
     const Option Alias = getAlias();
     if (Alias.isValid()) return Alias.getUnaliasedOption();
     return *this;

diff --git a/llvm/include/llvm/ProfileData/MemProf.h b/llvm/include/llvm/ProfileData/MemProf.h
@@ -380,7 +380,7 @@ struct AllocationInfo {
   AllocationInfo() = default;
   AllocationInfo(
       const IndexedAllocationInfo &IndexedAI,
-      llvm::function_ref<const Frame(const FrameId)> IdToFrameCallback) {
+      llvm::function_ref<Frame(FrameId)> IdToFrameCallback) {
     for (const FrameId &Id : IndexedAI.CallStack) {
       CallStack.push_back(IdToFrameCallback(Id));
     }
@@ -475,7 +475,7 @@ struct MemProfRecord {
   MemProfRecord() = default;
   MemProfRecord(
       const IndexedMemProfRecord &Record,
-      llvm::function_ref<const Frame(const FrameId Id)> IdToFrameCallback) {
+      llvm::function_ref<Frame(FrameId)> IdToFrameCallback) {
     for (const IndexedAllocationInfo &IndexedAI : Record.AllocSites) {
       AllocSites.emplace_back(IndexedAI, IdToFrameCallback);
     }

diff --git a/llvm/include/llvm/ProfileData/MemProfReader.h b/llvm/include/llvm/ProfileData/MemProfReader.h
@@ -65,7 +65,7 @@ class MemProfReader {
 
   virtual Error
   readNextRecord(GuidMemProfRecordPair &GuidRecord,
-                 std::function<const Frame(const FrameId)> Callback = nullptr) {
+                 std::function<Frame(FrameId)> Callback = nullptr) {
     if (FunctionProfileData.empty())
       return make_error<InstrProfError>(instrprof_error::empty_raw_profile);
 
@@ -163,7 +163,7 @@ class RawMemProfReader final : public MemProfReader {
 
   Error
   readNextRecord(GuidMemProfRecordPair &GuidRecord,
-                 std::function<const Frame(const FrameId)> Callback) override;
+                 std::function<Frame(FrameId)> Callback) override;
 
   // Constructor for unittests only.
   RawMemProfReader(std::unique_ptr<llvm::symbolize::SymbolizableModule> Sym,

diff --git a/llvm/include/llvm/ProfileData/SampleProf.h b/llvm/include/llvm/ProfileData/SampleProf.h
@@ -391,7 +391,7 @@ class SampleRecord {
 
   uint64_t getSamples() const { return NumSamples; }
   const CallTargetMap &getCallTargets() const { return CallTargets; }
-  const SortedCallTargetSet getSortedCallTargets() const {
+  SortedCallTargetSet getSortedCallTargets() const {
     return sortCallTargets(CallTargets);
   }
 
@@ -403,7 +403,7 @@ class SampleRecord {
   }
 
   /// Sort call targets in descending order of call frequency.
-  static const SortedCallTargetSet
+  static SortedCallTargetSet
   sortCallTargets(const CallTargetMap &Targets) {
     SortedCallTargetSet SortedTargets;
     for (const auto &[Target, Frequency] : Targets) {
@@ -413,8 +413,8 @@ class SampleRecord {
   }
 
   /// Prorate call targets by a distribution factor.
-  static const CallTargetMap adjustCallTargets(const CallTargetMap &Targets,
-                                               float DistributionFactor) {
+  static CallTargetMap adjustCallTargets(const CallTargetMap &Targets,
+                                         float DistributionFactor) {
     CallTargetMap AdjustedTargets;
     for (const auto &[Target, Frequency] : Targets) {
       AdjustedTargets[Target] = Frequency * DistributionFactor;

diff --git a/llvm/include/llvm/Support/PointerLikeTypeTraits.h b/llvm/include/llvm/Support/PointerLikeTypeTraits.h
@@ -79,10 +79,10 @@ template <> struct PointerLikeTypeTraits<void *> {
 template <typename T> struct PointerLikeTypeTraits<const T> {
   typedef PointerLikeTypeTraits<T> NonConst;
 
-  static inline const void *getAsVoidPointer(const T P) {
+  static inline const void *getAsVoidPointer(T P) {
     return NonConst::getAsVoidPointer(P);
   }
-  static inline const T getFromVoidPointer(const void *P) {
+  static inline T getFromVoidPointer(const void *P) {
     return NonConst::getFromVoidPointer(const_cast<void *>(P));
   }
   static constexpr int NumLowBitsAvailable = NonConst::NumLowBitsAvailable;

diff --git a/llvm/include/llvm/TableGen/Record.h b/llvm/include/llvm/TableGen/Record.h
@@ -1978,7 +1978,7 @@ class RecordKeeper {
   detail::RecordKeeperImpl &getImpl() { return *Impl; }
 
   /// Get the main TableGen input file's name.
-  const std::string getInputFilename() const { return InputFilename; }
+  std::string getInputFilename() const { return InputFilename; }
 
   /// Get the map of classes.
   const RecordMap &getClasses() const { return Classes; }

diff --git a/llvm/include/llvm/Target/TargetMachine.h b/llvm/include/llvm/Target/TargetMachine.h
@@ -173,7 +173,7 @@ class TargetMachine {
   }
 
   /// Create a DataLayout.
-  const DataLayout createDataLayout() const { return DL; }
+  DataLayout createDataLayout() const { return DL; }
 
   /// Test if a DataLayout if compatible with the CodeGen for this target.
   ///

diff --git a/llvm/include/llvm/TargetParser/Host.h b/llvm/include/llvm/TargetParser/Host.h
@@ -52,7 +52,7 @@ namespace sys {
   /// which features may appear in this map, except that they are all valid LLVM
   /// feature names. The map can be empty, for example if feature detection
   /// fails.
-  const StringMap<bool, MallocAllocator> getHostCPUFeatures();
+  StringMap<bool, MallocAllocator> getHostCPUFeatures();
 
   /// This is a function compatible with cl::AddExtraVersionPrinter, which adds
   /// info about the current target triple and detected CPU.

diff --git a/llvm/include/llvm/Transforms/IPO/Attributor.h b/llvm/include/llvm/Transforms/IPO/Attributor.h
diff --git a/llvm/include/llvm/Transforms/Utils/SCCPSolver.h b/llvm/include/llvm/Transforms/Utils/SCCPSolver.h
@@ -147,7 +147,7 @@ class SCCPSolver {
 
   /// getMRVFunctionsTracked - Get the set of functions which return multiple
   /// values tracked by the pass.
-  const SmallPtrSet<Function *, 16> getMRVFunctionsTracked();
+  SmallPtrSet<Function *, 16> getMRVFunctionsTracked();
 
   /// markOverdefined - Mark the specified value overdefined.  This
   /// works with both scalars and structs.

diff --git a/llvm/lib/Analysis/CtxProfAnalysis.cpp b/llvm/lib/Analysis/CtxProfAnalysis.cpp
@@ -317,7 +317,7 @@ void PGOContextualProfile::visit(ConstVisitor V, const Function *F) const {
     V(*reinterpret_cast<const PGOCtxProfContext *>(Node));
 }
 
-const CtxProfFlatProfile PGOContextualProfile::flatten() const {
+CtxProfFlatProfile PGOContextualProfile::flatten() const {
   assert(Profiles.has_value());
   CtxProfFlatProfile Flat;
   preorderVisit<const PGOCtxProfContext::CallTargetMapTy,

diff --git a/llvm/lib/Analysis/InstructionSimplify.cpp b/llvm/lib/Analysis/InstructionSimplify.cpp
@@ -7302,7 +7302,7 @@ bool llvm::replaceAndRecursivelySimplify(
 }
 
 namespace llvm {
-const SimplifyQuery getBestSimplifyQuery(Pass &P, Function &F) {
+SimplifyQuery getBestSimplifyQuery(Pass &P, Function &F) {
   auto *DTWP = P.getAnalysisIfAvailable<DominatorTreeWrapperPass>();
   auto *DT = DTWP ? &DTWP->getDomTree() : nullptr;
   auto *TLIWP = P.getAnalysisIfAvailable<TargetLibraryInfoWrapperPass>();
@@ -7312,21 +7312,21 @@ const SimplifyQuery getBestSimplifyQuery(Pass &P, Function &F) {
   return {F.getDataLayout(), TLI, DT, AC};
 }
 
-const SimplifyQuery getBestSimplifyQuery(LoopStandardAnalysisResults &AR,
-                                         const DataLayout &DL) {
+SimplifyQuery getBestSimplifyQuery(LoopStandardAnalysisResults &AR,
+                                   const DataLayout &DL) {
   return {DL, &AR.TLI, &AR.DT, &AR.AC};
 }
 
 template <class T, class... TArgs>
-const SimplifyQuery getBestSimplifyQuery(AnalysisManager<T, TArgs...> &AM,
-                                         Function &F) {
+SimplifyQuery getBestSimplifyQuery(AnalysisManager<T, TArgs...> &AM,
+                                   Function &F) {
   auto *DT = AM.template getCachedResult<DominatorTreeAnalysis>(F);
   auto *TLI = AM.template getCachedResult<TargetLibraryAnalysis>(F);
   auto *AC = AM.template getCachedResult<AssumptionAnalysis>(F);
   return {F.getDataLayout(), TLI, DT, AC};
 }
-template const SimplifyQuery getBestSimplifyQuery(AnalysisManager<Function> &,
-                                                  Function &);
+template SimplifyQuery getBestSimplifyQuery(AnalysisManager<Function> &,
+                                            Function &);
 
 bool SimplifyQuery::isUndefValue(Value *V) const {
   if (!CanUseUndef)

diff --git a/llvm/lib/DebugInfo/PDB/Native/ModuleDebugStream.cpp b/llvm/lib/DebugInfo/PDB/Native/ModuleDebugStream.cpp
@@ -87,7 +87,7 @@ Error ModuleDebugStreamRef::reloadSerialize(BinaryStreamReader &Reader) {
   return Error::success();
 }
 
-const codeview::CVSymbolArray
+codeview::CVSymbolArray
 ModuleDebugStreamRef::getSymbolArrayForScope(uint32_t ScopeBegin) const {
   return limitSymbolArrayToScope(SymbolArray, ScopeBegin);
 }

diff --git a/llvm/lib/MC/MCParser/MasmParser.cpp b/llvm/lib/MC/MCParser/MasmParser.cpp
@@ -570,7 +570,7 @@ class MasmParser : public MCAsmParser {
 
 private:
   bool expandMacros();
-  const AsmToken peekTok(bool ShouldSkipSpace = true);
+  AsmToken peekTok(bool ShouldSkipSpace = true);
 
   bool parseStatement(ParseStatementInfo &Info,
                       MCAsmParserSemaCallback *SI);
@@ -1287,7 +1287,7 @@ const AsmToken &MasmParser::Lex(ExpandKind ExpandNextToken) {
   return *tok;
 }
 
-const AsmToken MasmParser::peekTok(bool ShouldSkipSpace) {
+AsmToken MasmParser::peekTok(bool ShouldSkipSpace) {
   AsmToken Tok;
 
   MutableArrayRef<AsmToken> Buf(Tok);

diff --git a/llvm/lib/Option/OptTable.cpp b/llvm/lib/Option/OptTable.cpp
@@ -124,7 +124,7 @@ void OptTable::buildPrefixChars() {
 
 OptTable::~OptTable() = default;
 
-const Option OptTable::getOption(OptSpecifier Opt) const {
+Option OptTable::getOption(OptSpecifier Opt) const {
   unsigned id = Opt.getID();
   if (id == 0)
     return Option(nullptr, nullptr);

diff --git a/llvm/lib/ProfileData/MemProfReader.cpp b/llvm/lib/ProfileData/MemProfReader.cpp
@@ -766,7 +766,7 @@ RawMemProfReader::getModuleOffset(const uint64_t VirtualAddress) {
 
 Error RawMemProfReader::readNextRecord(
     GuidMemProfRecordPair &GuidRecord,
-    std::function<const Frame(const FrameId)> Callback) {
+    std::function<Frame(FrameId)> Callback) {
   // Create a new callback for the RawMemProfRecord iterator so that we can
   // provide the symbol name if the reader was initialized with KeepSymbolName =
   // true. This is useful for debugging and testing.

diff --git a/llvm/lib/TargetParser/Host.cpp b/llvm/lib/TargetParser/Host.cpp
@@ -1676,7 +1676,7 @@ VendorSignatures getVendorSignature(unsigned *MaxLeaf) {
 
 #if defined(__i386__) || defined(_M_IX86) || \
     defined(__x86_64__) || defined(_M_X64)
-const StringMap<bool> sys::getHostCPUFeatures() {
+StringMap<bool> sys::getHostCPUFeatures() {
   unsigned EAX = 0, EBX = 0, ECX = 0, EDX = 0;
   unsigned MaxLevel;
   StringMap<bool> Features;
@@ -1880,7 +1880,7 @@ const StringMap<bool> sys::getHostCPUFeatures() {
   return Features;
 }
 #elif defined(__linux__) && (defined(__arm__) || defined(__aarch64__))
-const StringMap<bool> sys::getHostCPUFeatures() {
+StringMap<bool> sys::getHostCPUFeatures() {
   StringMap<bool> Features;
   std::unique_ptr<llvm::MemoryBuffer> P = getProcCpuinfoContent();
   if (!P)
@@ -1955,7 +1955,7 @@ const StringMap<bool> sys::getHostCPUFeatures() {
   return Features;
 }
 #elif defined(_WIN32) && (defined(__aarch64__) || defined(_M_ARM64))
-const StringMap<bool> sys::getHostCPUFeatures() {
+StringMap<bool> sys::getHostCPUFeatures() {
   StringMap<bool> Features;
 
   // If we're asking the OS at runtime, believe what the OS says
@@ -1974,7 +1974,7 @@ const StringMap<bool> sys::getHostCPUFeatures() {
 }
 #elif defined(__linux__) && defined(__loongarch__)
 #include <sys/auxv.h>
-const StringMap<bool> sys::getHostCPUFeatures() {
+StringMap<bool> sys::getHostCPUFeatures() {
   unsigned long hwcap = getauxval(AT_HWCAP);
   bool HasFPU = hwcap & (1UL << 3); // HWCAP_LOONGARCH_FPU
   uint32_t cpucfg2 = 0x2;
@@ -1997,7 +1997,7 @@ struct RISCVHwProbe {
   int64_t Key;
   uint64_t Value;
 };
-const StringMap<bool> sys::getHostCPUFeatures() {
+StringMap<bool> sys::getHostCPUFeatures() {
   RISCVHwProbe Query[]{{/*RISCV_HWPROBE_KEY_BASE_BEHAVIOR=*/3, 0},
                        {/*RISCV_HWPROBE_KEY_IMA_EXT_0=*/4, 0},
                        {/*RISCV_HWPROBE_KEY_MISALIGNED_SCALAR_PERF=*/9, 0}};
@@ -2080,7 +2080,7 @@ const StringMap<bool> sys::getHostCPUFeatures() {
   return Features;
 }
 #else
-const StringMap<bool> sys::getHostCPUFeatures() { return {}; }
+StringMap<bool> sys::getHostCPUFeatures() { return {}; }
 #endif
 
 #if __APPLE__

diff --git a/llvm/lib/Transforms/IPO/Attributor.cpp b/llvm/lib/Transforms/IPO/Attributor.cpp
@@ -3288,7 +3288,7 @@ InformationCache::FunctionInfo::~FunctionInfo() {
     It.getSecond()->~InstructionVectorTy();
 }
 
-const ArrayRef<Function *>
+ArrayRef<Function *>
 InformationCache::getIndirectlyCallableFunctions(Attributor &A) const {
   assert(A.isClosedWorldModule() && "Cannot see all indirect callees!");
   return IndirectlyCallableFunctions;

diff --git a/llvm/lib/Transforms/IPO/AttributorAttributes.cpp b/llvm/lib/Transforms/IPO/AttributorAttributes.cpp
@@ -1029,7 +1029,7 @@ struct AAPointerInfoImpl
   AAPointerInfoImpl(const IRPosition &IRP, Attributor &A) : BaseTy(IRP) {}
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return std::string("PointerInfo ") +
            (isValidState() ? (std::string("#") +
                               std::to_string(OffsetBins.size()) + " bins")
@@ -2099,7 +2099,7 @@ struct AANoUnwindImpl : AANoUnwind {
     (void)IsKnown;
   }
 
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "nounwind" : "may-unwind";
   }
 
@@ -2224,7 +2224,7 @@ struct AANoSyncImpl : AANoSync {
     (void)IsKnown;
   }
 
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "nosync" : "may-sync";
   }
 
@@ -2314,7 +2314,7 @@ struct AANoFreeImpl : public AANoFree {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "nofree" : "may-free";
   }
 };
@@ -2620,7 +2620,7 @@ struct AANonNullImpl : AANonNull {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "nonnull" : "may-null";
   }
 };
@@ -2698,7 +2698,7 @@ struct AANonNullReturned final
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "nonnull" : "may-null";
   }
 
@@ -2750,7 +2750,7 @@ struct AAMustProgressImpl : public AAMustProgress {
   }
 
   /// See AbstractAttribute::getAsStr()
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "mustprogress" : "may-not-progress";
   }
 };
@@ -2833,7 +2833,7 @@ struct AANoRecurseImpl : public AANoRecurse {
   }
 
   /// See AbstractAttribute::getAsStr()
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "norecurse" : "may-recurse";
   }
 };
@@ -2898,7 +2898,7 @@ struct AANonConvergentImpl : public AANonConvergent {
       : AANonConvergent(IRP, A) {}
 
   /// See AbstractAttribute::getAsStr()
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "non-convergent" : "may-be-convergent";
   }
 };
@@ -3198,7 +3198,7 @@ struct AAUndefinedBehaviorImpl : public AAUndefinedBehavior {
   }
 
   /// See AbstractAttribute::getAsStr()
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "undefined-behavior" : "no-ub";
   }
 
@@ -3367,7 +3367,7 @@ struct AAWillReturnImpl : public AAWillReturn {
   }
 
   /// See AbstractAttribute::getAsStr()
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "willreturn" : "may-noreturn";
   }
 };
@@ -3569,7 +3569,7 @@ struct CachedReachabilityAA : public BaseTy {
     return Result == RQITy::Reachable::Yes;
   }
 
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     // TODO: Return the number of reachable queries.
     return "#queries(" + std::to_string(QueryVector.size()) + ")";
   }
@@ -3800,7 +3800,7 @@ struct AANoAliasImpl : AANoAlias {
            "Noalias is a pointer attribute");
   }
 
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "noalias" : "may-alias";
   }
 };
@@ -4132,7 +4132,7 @@ struct AAIsDeadValueImpl : public AAIsDead {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return isAssumedDead() ? "assumed-dead" : "assumed-live";
   }
 
@@ -4264,7 +4264,7 @@ struct AAIsDeadFloating : public AAIsDeadValueImpl {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     Instruction *I = dyn_cast<Instruction>(&getAssociatedValue());
     if (isa_and_nonnull<StoreInst>(I))
       if (isValidState())
@@ -4448,7 +4448,7 @@ struct AAIsDeadCallSiteReturned : public AAIsDeadFloating {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return isAssumedDead()
                ? "assumed-dead"
                : (getAssumed() ? "assumed-dead-users" : "assumed-live");
@@ -4525,7 +4525,7 @@ struct AAIsDeadFunction : public AAIsDead {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return "Live[#BB " + std::to_string(AssumedLiveBlocks.size()) + "/" +
            std::to_string(getAnchorScope()->size()) + "][#TBEP " +
            std::to_string(ToBeExploredFrom.size()) + "][#KDE " +
@@ -5038,7 +5038,7 @@ struct AADereferenceableImpl : AADereferenceable {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     if (!getAssumedDereferenceableBytes())
       return "unknown-dereferenceable";
     bool IsKnownNonNull;
@@ -5343,7 +5343,7 @@ struct AAAlignImpl : AAAlign {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return "align<" + std::to_string(getKnownAlign().value()) + "-" +
            std::to_string(getAssumedAlign().value()) + ">";
   }
@@ -5511,7 +5511,7 @@ struct AANoReturnImpl : public AANoReturn {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "noreturn" : "may-return";
   }
 
@@ -5658,7 +5658,7 @@ struct AAInstanceInfoImpl : public AAInstanceInfo {
   }
 
   /// See AbstractState::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return isAssumedUniqueForAnalysis() ? "<unique [fAa]>" : "<unknown>";
   }
 
@@ -5851,7 +5851,7 @@ struct AANoCaptureImpl : public AANoCapture {
   }
 
   /// See AbstractState::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     if (isKnownNoCapture())
       return "known not-captured";
     if (isAssumedNoCapture())
@@ -6159,7 +6159,7 @@ struct AAValueSimplifyImpl : AAValueSimplify {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     LLVM_DEBUG({
       dbgs() << "SAV: " << (bool)SimplifiedAssociatedValue << " ";
       if (SimplifiedAssociatedValue && *SimplifiedAssociatedValue)
@@ -6696,7 +6696,7 @@ struct AAHeapToStackFunction final : public AAHeapToStack {
                                        SCB);
   }
 
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     unsigned NumH2SMallocs = 0, NumInvalidMallocs = 0;
     for (const auto &It : AllocationInfos) {
       if (It.second->Status == AllocationInfo::INVALID)
@@ -7225,7 +7225,7 @@ struct AAPrivatizablePtrImpl : public AAPrivatizablePtr {
     return PrivatizableType;
   }
 
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return isAssumedPrivatizablePtr() ? "[priv]" : "[no-priv]";
   }
 
@@ -7876,7 +7876,7 @@ struct AAMemoryBehaviorImpl : public AAMemoryBehavior {
   }
 
   /// See AbstractState::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     if (isAssumedReadNone())
       return "readnone";
     if (isAssumedReadOnly())
@@ -8897,7 +8897,7 @@ struct AADenormalFPMathImpl : public AADenormalFPMath {
   AADenormalFPMathImpl(const IRPosition &IRP, Attributor &A)
       : AADenormalFPMath(IRP, A) {}
 
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     std::string Str("AADenormalFPMath[");
     raw_string_ostream OS(Str);
 
@@ -9015,7 +9015,7 @@ struct AAValueConstantRangeImpl : AAValueConstantRange {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     std::string Str;
     llvm::raw_string_ostream OS(Str);
     OS << "range(" << getBitWidth() << ")<";
@@ -9696,7 +9696,7 @@ struct AAPotentialConstantValuesImpl : AAPotentialConstantValues {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     std::string Str;
     llvm::raw_string_ostream OS(Str);
     OS << getState();
@@ -10239,7 +10239,7 @@ struct AANoUndefImpl : AANoUndef {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return getAssumed() ? "noundef" : "may-undef-or-poison";
   }
 
@@ -10399,7 +10399,7 @@ struct AANoFPClassImpl : AANoFPClass {
     return false;
   }
 
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     std::string Result = "nofpclass";
     raw_string_ostream OS(Result);
     OS << getKnownNoFPClass() << '/' << getAssumedNoFPClass();
@@ -10510,7 +10510,7 @@ struct AACallEdgesImpl : public AACallEdges {
     return HasUnknownCalleeNonAsm;
   }
 
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return "CallEdges[" + std::to_string(HasUnknownCallee) + "," +
            std::to_string(CalledFunctions.size()) + "]";
   }
@@ -10818,7 +10818,7 @@ struct AAPotentialValuesImpl : AAPotentialValues {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     std::string Str;
     llvm::raw_string_ostream OS(Str);
     OS << getState();
@@ -11775,7 +11775,7 @@ struct AAAssumptionInfoImpl : public AAAssumptionInfo {
   }
 
   /// See AbstractAttribute::getAsStr()
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     const SetContents &Known = getKnown();
     const SetContents &Assumed = getAssumed();
 
@@ -11895,7 +11895,7 @@ struct AAUnderlyingObjectsImpl
   AAUnderlyingObjectsImpl(const IRPosition &IRP, Attributor &A) : BaseTy(IRP) {}
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     if (!isValidState())
       return "<invalid>";
     std::string Str;
@@ -12186,7 +12186,7 @@ struct AAGlobalValueInfoFloating : public AAGlobalValueInfo {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return "[" + std::to_string(Uses.size()) + " uses]";
   }
 
@@ -12486,7 +12486,7 @@ struct AAIndirectCallInfoCallSite : public AAIndirectCallInfo {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     return std::string(AllCalleesKnown ? "eliminate" : "specialize") +
            " indirect call site with " + std::to_string(AssumedCallees.size()) +
            " functions";
@@ -12650,7 +12650,7 @@ struct AAAddressSpaceImpl : public AAAddressSpace {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     if (!isValidState())
       return "addrspace(<invalid>)";
     return "addrspace(" +
@@ -12875,7 +12875,7 @@ struct AAAllocationInfoImpl : public AAAllocationInfo {
   }
 
   /// See AbstractAttribute::getAsStr().
-  const std::string getAsStr(Attributor *A) const override {
+  std::string getAsStr(Attributor *A) const override {
     if (!isValidState())
       return "allocationinfo(<invalid>)";
     return "allocationinfo(" +

diff --git a/llvm/lib/Transforms/IPO/OpenMPOpt.cpp b/llvm/lib/Transforms/IPO/OpenMPOpt.cpp
@@ -2286,7 +2286,7 @@ struct AAICVTracker : public StateWrapper<BooleanState, AbstractAttribute> {
   InternalControlVar TrackableICVs[1] = {ICV_nthreads};
 
   /// See AbstractAttribute::getName()
-  const std::string getName() const override { return "AAICVTracker"; }
+  std::string getName() const override { return "AAICVTracker"; }
 
   /// See AbstractAttribute::getIdAddr()
   const char *getIdAddr() const override { return &ID; }
@@ -2304,7 +2304,7 @@ struct AAICVTrackerFunction : public AAICVTracker {
       : AAICVTracker(IRP, A) {}
 
   // FIXME: come up with better string.
-  const std::string getAsStr(Attributor *) const override {
+  std::string getAsStr(Attributor *) const override {
     return "ICVTrackerFunction";
   }
 
@@ -2498,7 +2498,7 @@ struct AAICVTrackerFunctionReturned : AAICVTracker {
       : AAICVTracker(IRP, A) {}
 
   // FIXME: come up with better string.
-  const std::string getAsStr(Attributor *) const override {
+  std::string getAsStr(Attributor *) const override {
     return "ICVTrackerFunctionReturned";
   }
 
@@ -2597,7 +2597,7 @@ struct AAICVTrackerCallSite : AAICVTracker {
   }
 
   // FIXME: come up with better string.
-  const std::string getAsStr(Attributor *) const override {
+  std::string getAsStr(Attributor *) const override {
     return "ICVTrackerCallSite";
   }
 
@@ -2638,7 +2638,7 @@ struct AAICVTrackerCallSiteReturned : AAICVTracker {
       : AAICVTracker(IRP, A) {}
 
   // FIXME: come up with better string.
-  const std::string getAsStr(Attributor *) const override {
+  std::string getAsStr(Attributor *) const override {
     return "ICVTrackerCallSiteReturned";
   }
 
@@ -2710,7 +2710,7 @@ struct AAExecutionDomainFunction : public AAExecutionDomain {
     RPOT = new ReversePostOrderTraversal<Function *>(F);
   }
 
-  const std::string getAsStr(Attributor *) const override {
+  std::string getAsStr(Attributor *) const override {
     unsigned TotalBlocks = 0, InitialThreadBlocks = 0, AlignedBlocks = 0;
     for (auto &It : BEDMap) {
       if (!It.getFirst())
@@ -3399,7 +3399,7 @@ struct AAHeapToShared : public StateWrapper<BooleanState, AbstractAttribute> {
   virtual bool isAssumedHeapToSharedRemovedFree(CallBase &CB) const = 0;
 
   /// See AbstractAttribute::getName().
-  const std::string getName() const override { return "AAHeapToShared"; }
+  std::string getName() const override { return "AAHeapToShared"; }
 
   /// See AbstractAttribute::getIdAddr().
   const char *getIdAddr() const override { return &ID; }
@@ -3418,7 +3418,7 @@ struct AAHeapToSharedFunction : public AAHeapToShared {
   AAHeapToSharedFunction(const IRPosition &IRP, Attributor &A)
       : AAHeapToShared(IRP, A) {}
 
-  const std::string getAsStr(Attributor *) const override {
+  std::string getAsStr(Attributor *) const override {
     return "[AAHeapToShared] " + std::to_string(MallocCalls.size()) +
            " malloc calls eligible.";
   }
@@ -3622,7 +3622,7 @@ struct AAKernelInfo : public StateWrapper<KernelInfoState, AbstractAttribute> {
   void trackStatistics() const override {}
 
   /// See AbstractAttribute::getAsStr()
-  const std::string getAsStr(Attributor *) const override {
+  std::string getAsStr(Attributor *) const override {
     if (!isValidState())
       return "<invalid>";
     return std::string(SPMDCompatibilityTracker.isAssumed() ? "SPMD"
@@ -3652,7 +3652,7 @@ struct AAKernelInfo : public StateWrapper<KernelInfoState, AbstractAttribute> {
   static AAKernelInfo &createForPosition(const IRPosition &IRP, Attributor &A);
 
   /// See AbstractAttribute::getName()
-  const std::string getName() const override { return "AAKernelInfo"; }
+  std::string getName() const override { return "AAKernelInfo"; }
 
   /// See AbstractAttribute::getIdAddr()
   const char *getIdAddr() const override { return &ID; }
@@ -5186,7 +5186,7 @@ struct AAFoldRuntimeCall
                                               Attributor &A);
 
   /// See AbstractAttribute::getName()
-  const std::string getName() const override { return "AAFoldRuntimeCall"; }
+  std::string getName() const override { return "AAFoldRuntimeCall"; }
 
   /// See AbstractAttribute::getIdAddr()
   const char *getIdAddr() const override { return &ID; }
@@ -5205,7 +5205,7 @@ struct AAFoldRuntimeCallCallSiteReturned : AAFoldRuntimeCall {
       : AAFoldRuntimeCall(IRP, A) {}
 
   /// See AbstractAttribute::getAsStr()
-  const std::string getAsStr(Attributor *) const override {
+  std::string getAsStr(Attributor *) const override {
     if (!isValidState())
       return "<invalid>";
 

diff --git a/llvm/lib/Transforms/Scalar/DFAJumpThreading.cpp b/llvm/lib/Transforms/Scalar/DFAJumpThreading.cpp
@@ -438,7 +438,7 @@ struct MainSwitch {
   virtual ~MainSwitch() = default;
 
   SwitchInst *getInstr() const { return Instr; }
-  const SmallVector<SelectInstToUnfold, 4> getSelectInsts() {
+  SmallVector<SelectInstToUnfold, 4> getSelectInsts() {
     return SelectInsts;
   }
 

diff --git a/llvm/lib/Transforms/Utils/CodeMoverUtils.cpp b/llvm/lib/Transforms/Utils/CodeMoverUtils.cpp
@@ -59,7 +59,7 @@ class ControlConditions {
   /// \p BB from \p Dominator. If \p MaxLookup is non-zero, it limits the
   /// number of conditions to collect. Return std::nullopt if not all conditions
   /// are collected successfully, or we hit the limit.
-  static const std::optional<ControlConditions>
+  static std::optional<ControlConditions>
   collectControlConditions(const BasicBlock &BB, const BasicBlock &Dominator,
                            const DominatorTree &DT,
                            const PostDominatorTree &PDT,
@@ -104,7 +104,7 @@ static bool domTreeLevelBefore(DominatorTree *DT, const Instruction *InstA,
   return DA->getLevel() < DB->getLevel();
 }
 
-const std::optional<ControlConditions>
+std::optional<ControlConditions>
 ControlConditions::collectControlConditions(const BasicBlock &BB,
                                             const BasicBlock &Dominator,
                                             const DominatorTree &DT,

diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp b/llvm/lib/Transforms/Utils/InlineFunction.cpp
@@ -2152,7 +2152,7 @@ inlineRetainOrClaimRVCalls(CallBase &CB, objcarc::ARCInstKind RVCallKind,
 // profile. Note: we only update the "name" and "index" operands in the
 // instrumentation intrinsics, we leave the hash and total nr of indices as-is,
 // it's not worth updating those.
-static const std::pair<std::vector<int64_t>, std::vector<int64_t>>
+static std::pair<std::vector<int64_t>, std::vector<int64_t>>
 remapIndices(Function &Caller, BasicBlock *StartBB,
              PGOContextualProfile &CtxProf, uint32_t CalleeCounters,
              uint32_t CalleeCallsites) {

diff --git a/llvm/lib/Transforms/Utils/SCCPSolver.cpp b/llvm/lib/Transforms/Utils/SCCPSolver.cpp
@@ -841,7 +841,7 @@ class SCCPInstVisitor : public InstVisitor<SCCPInstVisitor> {
     return TrackedGlobals;
   }
 
-  const SmallPtrSet<Function *, 16> getMRVFunctionsTracked() {
+  SmallPtrSet<Function *, 16> getMRVFunctionsTracked() {
     return MRVFunctionsTracked;
   }
 
@@ -2217,7 +2217,7 @@ SCCPSolver::getTrackedGlobals() {
   return Visitor->getTrackedGlobals();
 }
 
-const SmallPtrSet<Function *, 16> SCCPSolver::getMRVFunctionsTracked() {
+SmallPtrSet<Function *, 16> SCCPSolver::getMRVFunctionsTracked() {
   return Visitor->getMRVFunctionsTracked();
 }
 

diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -6093,7 +6093,7 @@ void BoUpSLP::reorderBottomToTop(bool IgnoreReorder) {
           continue;
         if (!OpTE->ReuseShuffleIndices.empty() && !GathersToOrders.count(OpTE))
           continue;
-        const auto Order = [&]() -> const OrdersType {
+        const auto Order = [&]() -> OrdersType {
           if (OpTE->isGather() || !OpTE->ReuseShuffleIndices.empty())
             return getReorderingData(*OpTE, /*TopToBottom=*/false)
                 .value_or(OrdersType(1));

diff --git a/llvm/utils/TableGen/Common/CodeGenTarget.h b/llvm/utils/TableGen/Common/CodeGenTarget.h
@@ -251,7 +251,7 @@ class ComplexPattern {
   const Record *getValueType() const { return Ty; }
   unsigned getNumOperands() const { return NumOperands; }
   const std::string &getSelectFunc() const { return SelectFunc; }
-  const ArrayRef<const Record *> getRootNodes() const { return RootNodes; }
+  ArrayRef<const Record *> getRootNodes() const { return RootNodes; }
   bool hasProperty(enum SDNP Prop) const { return Properties & (1 << Prop); }
   unsigned getComplexity() const { return Complexity; }
 };