fixup: Fix target specific diags that were missed

bogner · bogner · commit 1695f8810917 · 2025-04-21T01:12:19.000-06:00
diff --git a/llvm/include/llvm/IR/DiagnosticPrinter.h b/llvm/include/llvm/IR/DiagnosticPrinter.h
@@ -24,7 +24,6 @@ class Module;
 class raw_ostream;
 class SMDiagnostic;
 class StringRef;
-class Twine;
 class Value;
 
 /// Interface for custom diagnostic printing.
@@ -47,7 +46,6 @@ class DiagnosticPrinter {
   virtual DiagnosticPrinter &operator<<(unsigned int N) = 0;
   virtual DiagnosticPrinter &operator<<(int N) = 0;
   virtual DiagnosticPrinter &operator<<(double N) = 0;
-  virtual DiagnosticPrinter &operator<<(const Twine &Str) = 0;
 
   // IR related types.
   virtual DiagnosticPrinter &operator<<(const Value &V) = 0;
@@ -80,7 +78,6 @@ class DiagnosticPrinterRawOStream : public DiagnosticPrinter {
   DiagnosticPrinter &operator<<(unsigned int N) override;
   DiagnosticPrinter &operator<<(int N) override;
   DiagnosticPrinter &operator<<(double N) override;
-  DiagnosticPrinter &operator<<(const Twine &Str) override;
 
   // IR related types.
   DiagnosticPrinter &operator<<(const Value &V) override;
diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -64,6 +64,7 @@
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Format.h"
+#include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/TargetParser/Triple.h"
@@ -706,10 +707,10 @@ getELFSectionNameForGlobal(const GlobalObject *GO, SectionKind Kind,
 
 namespace {
 class LoweringDiagnosticInfo : public DiagnosticInfo {
-  const Twine &Msg;
+  StringRef Msg;
 
 public:
-  LoweringDiagnosticInfo(const Twine &DiagMsg,
+  LoweringDiagnosticInfo(StringRef DiagMsg,
                          DiagnosticSeverity Severity = DS_Error)
       : DiagnosticInfo(DK_Lowering, Severity), Msg(DiagMsg) {}
   void print(DiagnosticPrinter &DP) const override { DP << Msg; }
@@ -869,15 +870,17 @@ static MCSection *selectExplicitSectionGlobal(const GlobalObject *GO,
     // been placed in an incompatible mergeable section. Emit an error if this
     // is the case to avoid creating broken output.
     if ((Section->getFlags() & ELF::SHF_MERGE) &&
-        (Section->getEntrySize() != getEntrySizeForKind(Kind)))
-      GO->getContext().diagnose(LoweringDiagnosticInfo(
-          "Symbol '" + GO->getName() + "' from module '" +
-          (GO->getParent() ? GO->getParent()->getSourceFileName() : "unknown") +
-          "' required a section with entry-size=" +
-          Twine(getEntrySizeForKind(Kind)) + " but was placed in section '" +
-          SectionName + "' with entry-size=" + Twine(Section->getEntrySize()) +
-          ": Explicit assignment by pragma or attribute of an incompatible "
-          "symbol to this section?"));
+        (Section->getEntrySize() != getEntrySizeForKind(Kind))) {
+      SmallString<128> Msg = formatv(
+          "Symbol '{0}' from module '{1}' required a section with "
+          "entry-size={2} but was placed in section '{3}' with entry-size={4}: "
+          "Explicit assignment by pragma or attribute of an incompatible "
+          "symbol to this section?",
+          GO->getName(),
+          GO->getParent() ? GO->getParent()->getSourceFileName() : "unknown",
+          getEntrySizeForKind(Kind), SectionName, Section->getEntrySize());
+      GO->getContext().diagnose(LoweringDiagnosticInfo(Msg));
+    }
   }
 
   return Section;
diff --git a/llvm/lib/IR/DiagnosticPrinter.cpp b/llvm/lib/IR/DiagnosticPrinter.cpp
@@ -90,11 +90,6 @@ DiagnosticPrinter &DiagnosticPrinterRawOStream::operator<<(double N) {
   return *this;
 }
 
-DiagnosticPrinter &DiagnosticPrinterRawOStream::operator<<(const Twine &Str) {
-  Str.print(Stream);
-  return *this;
-}
-
 // IR related types.
 DiagnosticPrinter &DiagnosticPrinterRawOStream::operator<<(const Value &V) {
   // Avoid printing '@' prefix for named functions.
diff --git a/llvm/lib/LTO/LTOCodeGenerator.cpp b/llvm/lib/LTO/LTOCodeGenerator.cpp
@@ -744,9 +744,9 @@ LTOCodeGenerator::setDiagnosticHandler(lto_diagnostic_handler_t DiagHandler,
 
 namespace {
 class LTODiagnosticInfo : public DiagnosticInfo {
-  const Twine &Msg;
+  StringRef Msg;
 public:
-  LTODiagnosticInfo(const Twine &DiagMsg, DiagnosticSeverity Severity=DS_Error)
+  LTODiagnosticInfo(StringRef DiagMsg, DiagnosticSeverity Severity=DS_Error)
       : DiagnosticInfo(DK_Linker, Severity), Msg(DiagMsg) {}
   void print(DiagnosticPrinter &DP) const override { DP << Msg; }
 };
diff --git a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp b/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
@@ -165,9 +165,9 @@ static void promoteModule(Module &TheModule, const ModuleSummaryIndex &Index,
 
 namespace {
 class ThinLTODiagnosticInfo : public DiagnosticInfo {
-  const Twine &Msg;
+  StringRef Msg;
 public:
-  ThinLTODiagnosticInfo(const Twine &DiagMsg,
+  ThinLTODiagnosticInfo(StringRef DiagMsg,
                         DiagnosticSeverity Severity = DS_Error)
       : DiagnosticInfo(DK_Linker, Severity), Msg(DiagMsg) {}
   void print(DiagnosticPrinter &DP) const override { DP << Msg; }
diff --git a/llvm/lib/Linker/IRMover.cpp b/llvm/lib/Linker/IRMover.cpp
@@ -340,7 +340,7 @@ Type *TypeMapTy::get(Type *Ty, SmallPtrSet<StructType *, 8> &Visited) {
 }
 
 LinkDiagnosticInfo::LinkDiagnosticInfo(DiagnosticSeverity Severity,
-                                       const Twine &Msg)
+                                       StringRef Msg)
     : DiagnosticInfo(DK_Linker, Severity), Msg(Msg) {}
 void LinkDiagnosticInfo::print(DiagnosticPrinter &DP) const { DP << Msg; }
 
@@ -438,7 +438,9 @@ class IRLinker {
   GlobalValue *copyGlobalValueProto(const GlobalValue *SGV, bool ForDefinition);
 
   void emitWarning(const Twine &Message) {
-    SrcM->getContext().diagnose(LinkDiagnosticInfo(DS_Warning, Message));
+    SmallString<128> Storage;
+    SrcM->getContext().diagnose(
+        LinkDiagnosticInfo(DS_Warning, Message.toStringRef(Storage)));
   }
 
   /// Given a global in the source module, return the global in the
diff --git a/llvm/lib/Linker/LinkDiagnosticInfo.h b/llvm/lib/Linker/LinkDiagnosticInfo.h
@@ -13,10 +13,10 @@
 
 namespace llvm {
 class LinkDiagnosticInfo : public DiagnosticInfo {
-  const Twine &Msg;
+  StringRef Msg;
 
 public:
-  LinkDiagnosticInfo(DiagnosticSeverity Severity, const Twine &Msg);
+  LinkDiagnosticInfo(DiagnosticSeverity Severity, StringRef Msg);
   void print(DiagnosticPrinter &DP) const override;
 };
 }
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp
@@ -13,6 +13,7 @@
 #include "LinkDiagnosticInfo.h"
 #include "llvm-c/Linker.h"
 #include "llvm/ADT/SetVector.h"
+#include "llvm/ADT/SmallString.h"
 #include "llvm/IR/Comdat.h"
 #include "llvm/IR/GlobalValue.h"
 #include "llvm/IR/LLVMContext.h"
@@ -58,7 +59,9 @@ class ModuleLinker {
 
   /// Should we have mover and linker error diag info?
   bool emitError(const Twine &Message) {
-    SrcM->getContext().diagnose(LinkDiagnosticInfo(DS_Error, Message));
+    SmallString<128> Storage;
+    SrcM->getContext().diagnose(
+        LinkDiagnosticInfo(DS_Error, Message.toStringRef(Storage)));
     return true;
   }
 
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp b/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
@@ -31,6 +31,7 @@
 #include "Utils/AMDGPUBaseInfo.h"
 #include "Utils/AMDKernelCodeTUtils.h"
 #include "Utils/SIDefinesUtils.h"
+#include "llvm/ADT/SmallString.h"
 #include "llvm/Analysis/OptimizationRemarkEmitter.h"
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
@@ -43,6 +44,7 @@
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/AMDHSAKernelDescriptor.h"
+#include "llvm/Support/FormatVariadic.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/TargetParser/TargetParser.h"
@@ -466,12 +468,11 @@ void AMDGPUAsmPrinter::validateMCResourceInfo(Function &F) {
           F, "amdgpu-waves-per-eu", {0, 0}, true);
 
       if (TryGetMCExprValue(OccupancyExpr, Occupancy) && Occupancy < MinWEU) {
-        DiagnosticInfoOptimizationFailure Diag(
-            F, F.getSubprogram(),
+        SmallString<256> Msg = formatv(
             "failed to meet occupancy target given by 'amdgpu-waves-per-eu' in "
-            "'" +
-                F.getName() + "': desired occupancy was " + Twine(MinWEU) +
-                ", final occupancy is " + Twine(Occupancy));
+            "'{0}': desired occupancy was {1}, final occupancy is {2}",
+            F.getName(), MinWEU, Occupancy);
+        DiagnosticInfoOptimizationFailure Diag(F, F.getSubprogram(), Msg);
         F.getContext().diagnose(Diag);
         return;
       }
@@ -1261,13 +1262,12 @@ 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) {
-    DiagnosticInfoOptimizationFailure Diag(
-        F, F.getSubprogram(),
+    SmallString<256> Msg = formatv(
         "failed to meet occupancy target given by 'amdgpu-waves-per-eu' in "
-        "'" +
-            F.getName() + "': desired occupancy was " + Twine(MinWEU) +
-            ", final occupancy is " + Twine(Occupancy));
-    F.getContext().diagnose(Diag);
+        "'{0}'': desired occupancy was {1}, final occupancy is {2}",
+        F.getName(), MinWEU, Occupancy);
+    F.getContext().diagnose(
+        DiagnosticInfoOptimizationFailure(F, F.getSubprogram(), Msg));
   }
 
   if (isGFX11Plus(STM)) {
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp b/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
@@ -1376,15 +1376,15 @@ SDValue AMDGPUTargetLowering::lowerUnhandledCall(CallLoweringInfo &CLI,
 
   const Function &Fn = DAG.getMachineFunction().getFunction();
 
-  StringRef FuncName("<unknown>");
-
+  SmallString<128> Msg = Reason;
   if (const ExternalSymbolSDNode *G = dyn_cast<ExternalSymbolSDNode>(Callee))
-    FuncName = G->getSymbol();
+    Msg.append(G->getSymbol());
   else if (const GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(Callee))
-    FuncName = G->getGlobal()->getName();
+    Msg.append(G->getGlobal()->getName());
+  else
+    Msg.append("<unknown>");
 
-  DiagnosticInfoUnsupported NoCalls(
-    Fn, Reason + FuncName, CLI.DL.getDebugLoc());
+  DiagnosticInfoUnsupported NoCalls(Fn, Msg, CLI.DL.getDebugLoc());
   DAG.getContext()->diagnose(NoCalls);
 
   if (!CLI.IsTailCall) {
diff --git a/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp b/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp
@@ -47,8 +47,9 @@ static const std::array<unsigned, 17> SubRegFromChannelTableWidthMap = {
 
 static void emitUnsupportedError(const Function &Fn, const MachineInstr &MI,
                                  const Twine &ErrMsg) {
-  Fn.getContext().diagnose(
-      DiagnosticInfoUnsupported(Fn, ErrMsg, MI.getDebugLoc()));
+  SmallString<128> Storage;
+  Fn.getContext().diagnose(DiagnosticInfoUnsupported(
+      Fn, ErrMsg.toStringRef(Storage), MI.getDebugLoc()));
 }
 
 namespace llvm {
diff --git a/llvm/lib/Target/BPF/BPFISelLowering.cpp b/llvm/lib/Target/BPF/BPFISelLowering.cpp
@@ -38,15 +38,16 @@ static cl::opt<bool> BPFExpandMemcpyInOrder("bpf-expand-memcpy-in-order",
 
 static void fail(const SDLoc &DL, SelectionDAG &DAG, const Twine &Msg,
                  SDValue Val = {}) {
-  std::string Str;
+  SmallString<128> FullMsg;
   if (Val) {
-    raw_string_ostream OS(Str);
+    raw_svector_ostream OS(FullMsg);
     Val->print(OS);
     OS << ' ';
   }
+  Msg.toVector(FullMsg);
   MachineFunction &MF = DAG.getMachineFunction();
-  DAG.getContext()->diagnose(DiagnosticInfoUnsupported(
-      MF.getFunction(), Twine(Str).concat(Msg), DL.getDebugLoc()));
+  DAG.getContext()->diagnose(
+      DiagnosticInfoUnsupported(MF.getFunction(), FullMsg, DL.getDebugLoc()));
 }
 
 BPFTargetLowering::BPFTargetLowering(const TargetMachine &TM,
diff --git a/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp b/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp
@@ -393,15 +393,14 @@ static bool foldGEPChainAsU8Access(SmallVector<GetElementPtrInst *> &GEPs,
 }
 
 static void reportNonStaticGEPChain(Instruction *Insn) {
-  auto Msg = DiagnosticInfoUnsupported(
-      *Insn->getFunction(),
-      Twine("Non-constant offset in access to a field of a type marked "
-            "with preserve_static_offset might be rejected by BPF verifier")
-          .concat(Insn->getDebugLoc()
-                      ? ""
-                      : " (pass -g option to get exact location)"),
-      Insn->getDebugLoc(), DS_Warning);
-  Insn->getContext().diagnose(Msg);
+  SmallString<256> Msg(
+      "Non-constant offset in access to a field of a type marked with "
+      "preserve_static_offset might be rejected by BPF verifier");
+  if (Insn->getDebugLoc())
+    Msg.append(" (pass -g option to get exact location)");
+
+  Insn->getContext().diagnose(DiagnosticInfoUnsupported(
+      *Insn->getFunction(), Msg, Insn->getDebugLoc(), DS_Warning));
 }
 
 static bool allZeroIndices(SmallVector<GetElementPtrInst *> &GEPs) {
diff --git a/llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp b/llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp
@@ -1,3 +1,5 @@
+
+
 //===- DXILTranslateMetadata.cpp - Pass to emit DXIL metadata -------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -9,6 +11,7 @@
 #include "DXILTranslateMetadata.h"
 #include "DXILShaderFlags.h"
 #include "DirectX.h"
+#include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Analysis/DXILMetadataAnalysis.h"
@@ -26,6 +29,7 @@
 #include "llvm/InitializePasses.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/VersionTuple.h"
 #include "llvm/TargetParser/Triple.h"
 #include <cstdint>
@@ -38,14 +42,14 @@ namespace {
 /// for TranslateMetadata pass
 class DiagnosticInfoTranslateMD : public DiagnosticInfo {
 private:
-  const Twine &Msg;
+  StringRef Msg;
   const Module &Mod;
 
 public:
   /// \p M is the module for which the diagnostic is being emitted. \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.
-  DiagnosticInfoTranslateMD(const Module &M, const Twine &Msg,
+  DiagnosticInfoTranslateMD(const Module &M, StringRef Msg,
                             DiagnosticSeverity Severity = DS_Error)
       : DiagnosticInfo(DK_Unsupported, Severity), Msg(Msg), Mod(M) {}
 
@@ -358,14 +362,13 @@ static void translateMetadata(Module &M, DXILResourceMap &DRM,
     if (MMDI.ShaderProfile != Triple::EnvironmentType::Library) {
       EntryShaderFlags = EntrySFMask;
       if (EntryProp.ShaderStage != MMDI.ShaderProfile) {
-        M.getContext().diagnose(DiagnosticInfoTranslateMD(
-            M,
-            "Shader stage '" +
-                Twine(getShortShaderStage(EntryProp.ShaderStage) +
-                      "' for entry '" + Twine(EntryProp.Entry->getName()) +
-                      "' different from specified target profile '" +
-                      Twine(Triple::getEnvironmentTypeName(MMDI.ShaderProfile) +
-                            "'"))));
+        SmallString<256> Msg =
+            formatv("Shader stage '{0}' for entry '{1}' different from "
+                    "specified target profile '{2}'",
+                    getShortShaderStage(EntryProp.ShaderStage),
+                    EntryProp.Entry->getName(),
+                    Triple::getEnvironmentTypeName(MMDI.ShaderProfile));
+        M.getContext().diagnose(DiagnosticInfoTranslateMD(M, Msg));
       }
     }
     EntryFnMDNodes.emplace_back(emitEntryMD(EntryProp, Signatures, ResourceMD,
diff --git a/llvm/lib/Transforms/Instrumentation/KCFI.cpp b/llvm/lib/Transforms/Instrumentation/KCFI.cpp
@@ -34,10 +34,10 @@ STATISTIC(NumKCFIChecks, "Number of kcfi operands transformed into checks");
 
 namespace {
 class DiagnosticInfoKCFI : public DiagnosticInfo {
-  const Twine &Msg;
+  StringRef Msg;
 
 public:
-  DiagnosticInfoKCFI(const Twine &DiagMsg,
+  DiagnosticInfoKCFI(StringRef DiagMsg,
                      DiagnosticSeverity Severity = DS_Error)
       : DiagnosticInfo(DK_Linker, Severity), Msg(DiagMsg) {}
   void print(DiagnosticPrinter &DP) const override { DP << Msg; }
