fixup: clean up uses where the string *was* copied

These uses were fine, but the comment that claimed the string isn't
copied are just incorrect.

Author: bogner

llvm/include/llvm/IR/DiagnosticInfo.h

@@ -700,13 +700,11 @@ class DiagnosticInfoIROptimization : public DiagnosticInfoOptimizationBase {
   /// \p Fn is the function where the diagnostic is being emitted. \p Loc is
   /// the location information to use in the diagnostic. If line table
   /// information is available, the diagnostic will include the source code
-  /// location. \p Msg is the message to show. Note that this class does not
-  /// copy this message, so this reference must be valid for the whole life time
-  /// of the diagnostic.
+  /// location. \p Msg is the message to show.
   DiagnosticInfoIROptimization(enum DiagnosticKind Kind,
                                enum DiagnosticSeverity Severity,
                                const char *PassName, const Function &Fn,
-                               const DiagnosticLocation &Loc, StringRef Msg)
+                               const DiagnosticLocation &Loc, const Twine &Msg)
       : DiagnosticInfoOptimizationBase(Kind, Severity, PassName, "", Fn, Loc) {
     *this << Msg.str();
   }
@@ -760,10 +758,8 @@ class OptimizationRemark : public DiagnosticInfoIROptimization {
   /// is being emitted. \p Loc is the location information to use in the
   /// diagnostic. If line table information is available, the diagnostic
   /// will include the source code location. \p Msg is the message to show.
-  /// Note that this class does not copy this message, so this reference
-  /// must be valid for the whole life time of the diagnostic.
   OptimizationRemark(const char *PassName, const Function &Fn,
-                     const DiagnosticLocation &Loc, StringRef Msg)
+                     const DiagnosticLocation &Loc, const Twine &Msg)
       : DiagnosticInfoIROptimization(DK_OptimizationRemark, DS_Remark, PassName,
                                      Fn, Loc, Msg) {}
 };
@@ -806,10 +802,8 @@ class OptimizationRemarkMissed : public DiagnosticInfoIROptimization {
   /// is being emitted. \p Loc is the location information to use in the
   /// diagnostic. If line table information is available, the diagnostic
   /// will include the source code location. \p Msg is the message to show.
-  /// Note that this class does not copy this message, so this reference
-  /// must be valid for the whole life time of the diagnostic.
   OptimizationRemarkMissed(const char *PassName, const Function &Fn,
-                           const DiagnosticLocation &Loc, StringRef Msg)
+                           const DiagnosticLocation &Loc, const Twine &Msg)
       : DiagnosticInfoIROptimization(DK_OptimizationRemarkMissed, DS_Remark,
                                      PassName, Fn, Loc, Msg) {}
 };
@@ -862,7 +856,7 @@ class OptimizationRemarkAnalysis : public DiagnosticInfoIROptimization {
 protected:
   OptimizationRemarkAnalysis(enum DiagnosticKind Kind, const char *PassName,
                              const Function &Fn, const DiagnosticLocation &Loc,
-                             StringRef Msg)
+                             const Twine &Msg)
       : DiagnosticInfoIROptimization(Kind, DS_Remark, PassName, Fn, Loc, Msg) {}
 
   OptimizationRemarkAnalysis(enum DiagnosticKind Kind, const char *PassName,
@@ -877,11 +871,9 @@ class OptimizationRemarkAnalysis : public DiagnosticInfoIROptimization {
   /// the diagnostic will be emitted. \p Fn is the function where the diagnostic
   /// is being emitted. \p Loc is the location information to use in the
   /// diagnostic. If line table information is available, the diagnostic will
-  /// include the source code location. \p Msg is the message to show. Note that
-  /// this class does not copy this message, so this reference must be valid for
-  /// the whole life time of the diagnostic.
+  /// include the source code location. \p Msg is the message to show.
   OptimizationRemarkAnalysis(const char *PassName, const Function &Fn,
-                             const DiagnosticLocation &Loc, StringRef Msg)
+                             const DiagnosticLocation &Loc, const Twine &Msg)
       : DiagnosticInfoIROptimization(DK_OptimizationRemarkAnalysis, DS_Remark,
                                      PassName, Fn, Loc, Msg) {}
 };
@@ -918,12 +910,10 @@ class OptimizationRemarkAnalysisFPCommute : public OptimizationRemarkAnalysis {
   /// diagnostic. If line table information is available, the diagnostic will
   /// include the source code location. \p Msg is the message to show. The
   /// front-end will append its own message related to options that address
-  /// floating-point non-commutativity. Note that this class does not copy this
-  /// message, so this reference must be valid for the whole life time of the
-  /// diagnostic.
+  /// floating-point non-commutativity.
   OptimizationRemarkAnalysisFPCommute(const char *PassName, const Function &Fn,
                                       const DiagnosticLocation &Loc,
-                                      StringRef Msg)
+                                      const Twine &Msg)
       : OptimizationRemarkAnalysis(DK_OptimizationRemarkAnalysisFPCommute,
                                    PassName, Fn, Loc, Msg) {}
 };
@@ -959,12 +949,10 @@ class OptimizationRemarkAnalysisAliasing : public OptimizationRemarkAnalysis {
   /// diagnostic. If line table information is available, the diagnostic will
   /// include the source code location. \p Msg is the message to show. The
   /// front-end will append its own message related to options that address
-  /// pointer aliasing legality. Note that this class does not copy this
-  /// message, so this reference must be valid for the whole life time of the
-  /// diagnostic.
+  /// pointer aliasing legality.
   OptimizationRemarkAnalysisAliasing(const char *PassName, const Function &Fn,
                                      const DiagnosticLocation &Loc,
-                                     StringRef Msg)
+                                     const Twine &Msg)
       : OptimizationRemarkAnalysis(DK_OptimizationRemarkAnalysisAliasing,
                                    PassName, Fn, Loc, Msg) {}
 };
@@ -1032,12 +1020,10 @@ class DiagnosticInfoOptimizationFailure : public DiagnosticInfoIROptimization {
   /// \p Fn is the function where the diagnostic is being emitted. \p Loc is
   /// the location information to use in the diagnostic. If line table
   /// information is available, the diagnostic will include the source code
-  /// location. \p Msg is the message to show. Note that this class does not
-  /// copy this message, so this reference must be valid for the whole life time
-  /// of the diagnostic.
+  /// location. \p Msg is the message to show.
   DiagnosticInfoOptimizationFailure(const Function &Fn,
                                     const DiagnosticLocation &Loc,
-                                    StringRef Msg)
+                                    const Twine &Msg = "")
       : DiagnosticInfoIROptimization(DK_OptimizationFailure, DS_Warning,
                                      nullptr, Fn, Loc, Msg) {}
 

llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp

@@ -468,11 +468,12 @@ void AMDGPUAsmPrinter::validateMCResourceInfo(Function &F) {
           F, "amdgpu-waves-per-eu", {0, 0}, true);
 
       if (TryGetMCExprValue(OccupancyExpr, Occupancy) && Occupancy < MinWEU) {
-        SmallString<256> Msg = formatv(
-            "failed to meet occupancy target given by 'amdgpu-waves-per-eu' in "
-            "'{0}': desired occupancy was {1}, final occupancy is {2}",
-            F.getName(), MinWEU, Occupancy);
-        DiagnosticInfoOptimizationFailure Diag(F, F.getSubprogram(), Msg);
+        DiagnosticInfoOptimizationFailure Diag(F, F.getSubprogram());
+        Diag << "failed to meet occupancy target given by "
+                "'amdgpu-waves-per-eu' in '"
+             << F.getName() << "': desired occupancy was "
+             << std::to_string(MinWEU) << ", final occupancy is "
+             << std::to_string(Occupancy);
         F.getContext().diagnose(Diag);
         return;
       }
@@ -1262,12 +1263,13 @@ void AMDGPUAsmPrinter::getSIProgramInfo(SIProgramInfo &ProgInfo,
       AMDGPU::getIntegerPairAttribute(F, "amdgpu-waves-per-eu", {0, 0}, true);
   uint64_t Occupancy;
   if (TryGetMCExprValue(ProgInfo.Occupancy, Occupancy) && Occupancy < MinWEU) {
-    SmallString<256> Msg = formatv(
-        "failed to meet occupancy target given by 'amdgpu-waves-per-eu' in "
-        "'{0}'': desired occupancy was {1}, final occupancy is {2}",
-        F.getName(), MinWEU, Occupancy);
-    F.getContext().diagnose(
-        DiagnosticInfoOptimizationFailure(F, F.getSubprogram(), Msg));
+    DiagnosticInfoOptimizationFailure Diag(F, F.getSubprogram());
+    Diag
+        << "failed to meet occupancy target given by 'amdgpu-waves-per-eu' in '"
+        << F.getName(),
+        << "': desired occupancy was " << std::to_string(MinWEU)
+        << ", final occupancy is " << Occupancy;
+    F.getContext().diagnose(Diag);
   }
 
   if (isGFX11Plus(STM)) {